From a5bd7789297378be3fb8dc3814c6649ea82a88d8 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 28 Mar 2011 08:34:12 +0200
Subject: introduce assertResponseJson200 for API/ajax tests and use it

---
 tests/ajax/GetContactTagsTest.php | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'tests/ajax/GetContactTagsTest.php')

diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php
index 682173b..559040f 100644
--- a/tests/ajax/GetContactTagsTest.php
+++ b/tests/ajax/GetContactTagsTest.php
@@ -36,11 +36,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
     public function testNoUserLoggedIn()
     {
         $res = $this->getRequest()->send();
-        $this->assertEquals(200, $res->getStatus());
-        $this->assertEquals(
-            'application/json; charset=utf-8',
-            $res->getHeader('content-type')
-        );
+        $this->assertResponseJson200($res);
         $data = json_decode($res->getBody());
         $this->assertInternalType('array', $data);
         $this->assertEquals(0, count($data));
@@ -59,11 +55,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
         $this->addBookmark($user2, null, 0, array('user2tag'));
 
         $res = $req->send();
-        $this->assertEquals(200, $res->getStatus());
-        $this->assertEquals(
-            'application/json; charset=utf-8',
-            $res->getHeader('content-type')
-        );
+        $this->assertResponseJson200($res);
         $data = json_decode($res->getBody());
         $this->assertInternalType('array', $data);
         $this->assertEquals(3, count($data));
@@ -78,11 +70,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
         $this->addBookmark($uId, null, 0, array('foobar', 'barmann'));
 
         $res = $req->send();
-        $this->assertEquals(200, $res->getStatus());
-        $this->assertEquals(
-            'application/json; charset=utf-8',
-            $res->getHeader('content-type')
-        );
+        $this->assertResponseJson200($res);
         $data = json_decode($res->getBody());
         $this->assertInternalType('array', $data);
         $this->assertEquals(1, count($data));
@@ -95,11 +83,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
         $this->addBookmark($uId, null, 0, array('foo', 'bar', 'baz', 'omg'));
 
         $res = $req->send();
-        $this->assertEquals(200, $res->getStatus());
-        $this->assertEquals(
-            'application/json; charset=utf-8',
-            $res->getHeader('content-type')
-        );
+        $this->assertResponseJson200($res);
         $data = json_decode($res->getBody());
         $this->assertInternalType('array', $data);
         $this->assertEquals(2, count($data));
@@ -107,7 +91,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
         $req2 = $this->getRequest('?limit=3');
         $req2->setCookieJar($req->getCookieJar());
         $res = $req2->send();
-        $this->assertEquals(200, $res->getStatus());
+        $this->assertResponseJson200($res);
         $data = json_decode($res->getBody());
         $this->assertInternalType('array', $data);
         $this->assertEquals(3, count($data));
-- 
cgit v1.2.3-54-g00ecf