aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

introduce assertResponseJson200 for API/ajax tests and use it

Browse source
This commit is contained in:
Christian Weiske 2011-03-28 08:34:12 +02:00
parent 1dfff5d3d8
commit a5bd778929
4 changed files with 32 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/TestBaseApi.php
View file

@ -172,6 +172,25 @@ class TestBaseApi extends TestBase
/**
* Verifies that the HTTP response has status code 200 and
* content-type application/json; charset=utf-8
*
* @param HTTP_Request2_Response $res HTTP Response object
*
* @return void
*/
protected function assertResponseJson200(HTTP_Request2_Response $res)
{
$this->assertEquals(200, $res->getStatus());
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
}
/** /**
* Writes a special unittest configuration file. * Writes a special unittest configuration file.
* The unittest config file is read when a GET request with unittestMode=1 * The unittest config file is read when a GET request with unittestMode=1

20
tests/ajax/GetAdminLinkedTagsTest.php
View file

@ -58,13 +58,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi
{ {
$req = $this->getRequest(); $req = $this->getRequest();
$res = $req->send(); $res = $req->send();
$this->assertResponseJson200($res);
$this->assertEquals(200, $res->getStatus());
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
@ -99,11 +93,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi
); );
$res = $this->getRequest('?tag=' . $menu2Tag)->send(); $res = $this->getRequest('?tag=' . $menu2Tag)->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
@ -139,11 +129,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi
); );
$res = $this->getRequest('?tag=' . $menu2Tag)->send(); $res = $this->getRequest('?tag=' . $menu2Tag)->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);

30
tests/ajax/GetAdminTagsTest.php
View file

@ -45,11 +45,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi
$req = $this->getRequest('?unittestMode=1'); $req = $this->getRequest('?unittestMode=1');
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(2, count($data)); $this->assertEquals(2, count($data));
@ -70,12 +66,8 @@ class ajax_GetAdminTagsTest extends TestBaseApi
$req = $this->getRequest('?unittestMode=1&beginsWith=foo'); $req = $this->getRequest('?unittestMode=1&beginsWith=foo');
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus());
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertResponseJson200($res);
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(2, count($data)); $this->assertEquals(2, count($data));
$this->assertContains('foo', $data); $this->assertContains('foo', $data);
@ -99,11 +91,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi
$req = $this->getRequest('?unittestMode=1&limit=1'); $req = $this->getRequest('?unittestMode=1&limit=1');
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(1, count($data)); $this->assertEquals(1, count($data));
@ -111,11 +99,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi
$req = $this->getRequest('?unittestMode=1&limit=2'); $req = $this->getRequest('?unittestMode=1&limit=2');
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(2, count($data)); $this->assertEquals(2, count($data));
@ -123,11 +107,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi
$req = $this->getRequest('?unittestMode=1&limit=3'); $req = $this->getRequest('?unittestMode=1&limit=3');
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(3, count($data)); $this->assertEquals(3, count($data));

26
tests/ajax/GetContactTagsTest.php
View file

@ -36,11 +36,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
public function testNoUserLoggedIn() public function testNoUserLoggedIn()
{ {
$res = $this->getRequest()->send(); $res = $this->getRequest()->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(0, count($data)); $this->assertEquals(0, count($data));
@ -59,11 +55,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
$this->addBookmark($user2, null, 0, array('user2tag')); $this->addBookmark($user2, null, 0, array('user2tag'));
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(3, count($data)); $this->assertEquals(3, count($data));
@ -78,11 +70,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
$this->addBookmark($uId, null, 0, array('foobar', 'barmann')); $this->addBookmark($uId, null, 0, array('foobar', 'barmann'));
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(1, count($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')); $this->addBookmark($uId, null, 0, array('foo', 'bar', 'baz', 'omg'));
$res = $req->send(); $res = $req->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$this->assertEquals(
'application/json; charset=utf-8',
$res->getHeader('content-type')
);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(2, count($data)); $this->assertEquals(2, count($data));
@ -107,7 +91,7 @@ class ajax_GetContactTagsTest extends TestBaseApi
$req2 = $this->getRequest('?limit=3'); $req2 = $this->getRequest('?limit=3');
$req2->setCookieJar($req->getCookieJar()); $req2->setCookieJar($req->getCookieJar());
$res = $req2->send(); $res = $req2->send();
$this->assertEquals(200, $res->getStatus()); $this->assertResponseJson200($res);
$data = json_decode($res->getBody()); $data = json_decode($res->getBody());
$this->assertInternalType('array', $data); $this->assertInternalType('array', $data);
$this->assertEquals(3, count($data)); $this->assertEquals(3, count($data));