yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make bookmarks.php tests easier to read and use the TestBaseApi to get the urls

Browse Source
This commit is contained in:
Christian Weiske 2011-06-08 07:22:13 +02:00
parent 5009535d34
commit 5deeecc408
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tests/www/bookmarksTest.php
View File

@ -4,7 +4,7 @@ require_once 'HTTP/Request2.php';
class www_bookmarksTest extends TestBaseApi class www_bookmarksTest extends TestBaseApi
{ {
protected $urlPart = 'api/posts/add'; protected $urlPart = 'bookmarks.php';
/** /**
* Test that the default privacy setting is selected in the Privacy * Test that the default privacy setting is selected in the Privacy
@ -16,23 +16,11 @@ class www_bookmarksTest extends TestBaseApi
$this->setUnittestConfig( $this->setUnittestConfig(
array('defaults' => array('privacy' => 2)) array('defaults' => array('privacy' => 2))
); );
list($req, $uId) = $this->getLoggedInRequest(); list($req, $uId) = $this->getLoggedInRequest();
$cookies = $req->getCookieJar();
$req->setMethod(HTTP_Request2::METHOD_POST);
$req->addPostParameter('url', 'http://www.example.org/testdefaultprivacyposts_bookmarksget');
$req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
$req->addPostParameter('status', '0');
$req->send();
$bms = $this->bs->getBookmarks(0, null, $uId);
$this->assertEquals(1, count($bms['bookmarks']));
$user = $this->us->getUser($uId); $user = $this->us->getUser($uId);
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' . $user['username'] . '?action=get' . '&unittestMode=1';
list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
$req->setMethod(HTTP_Request2::METHOD_POST); $req->setMethod(HTTP_Request2::METHOD_POST);
$req->setUrl($reqUrl); $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=get'));
$req->setCookieJar($cookies);
$req->addPostParameter('submitted', '1'); $req->addPostParameter('submitted', '1');
$response = $req->send(); $response = $req->send();
$response_body = $response->getBody(); $response_body = $response->getBody();
@ -41,12 +29,15 @@ class www_bookmarksTest extends TestBaseApi
$ns = $x->getDocNamespaces(); $ns = $x->getDocNamespaces();
$x->registerXPathNamespace('ns', reset($ns)); $x->registerXPathNamespace('ns', reset($ns));
$elements = $x->xpath('//ns:select[@name="status"]/ns:option[@selected="selected"]'); $elements = $x->xpath(
'//ns:select[@name="status"]/ns:option[@selected="selected"]'
);
$this->assertEquals(1, count($elements), 'No selected status option found'); $this->assertEquals(1, count($elements), 'No selected status option found');
$this->assertEquals(2, (string)$elements[0]['value']); $this->assertEquals(2, (string)$elements[0]['value']);
}//end testDefaultPrivacyBookmarksAddMissingTitleMissingPrivacy }//end testDefaultPrivacyBookmarksAddMissingTitleMissingPrivacy
/** /**
* Test that the default privacy setting is selected in the Privacy * Test that the default privacy setting is selected in the Privacy
* drop-down list when a new bookmark is being created. * drop-down list when a new bookmark is being created.
@ -56,13 +47,10 @@ class www_bookmarksTest extends TestBaseApi
$this->setUnittestConfig( $this->setUnittestConfig(
array('defaults' => array('privacy' => 1)) array('defaults' => array('privacy' => 1))
); );
list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1'); list($req, $uId) = $this->getLoggedInRequest();
$user = $this->us->getUser($uId); $user = $this->us->getUser($uId);
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=add'));
. $user['username'] . '?action=add' . '&unittestMode=1';
$req->setUrl($reqUrl);
$req->setMethod(HTTP_Request2::METHOD_GET);
$response = $req->send(); $response = $req->send();
$response_body = $response->getBody(); $response_body = $response->getBody();
$this->assertNotEquals('', $response_body, 'Response is empty'); $this->assertNotEquals('', $response_body, 'Response is empty');
@ -71,12 +59,15 @@ class www_bookmarksTest extends TestBaseApi
$ns = $x->getDocNamespaces(); $ns = $x->getDocNamespaces();
$x->registerXPathNamespace('ns', reset($ns)); $x->registerXPathNamespace('ns', reset($ns));
$elements = $x->xpath('//ns:select[@name="status"]/ns:option[@selected="selected"]'); $elements = $x->xpath(
'//ns:select[@name="status"]/ns:option[@selected="selected"]'
);
$this->assertEquals(1, count($elements), 'No selected status option found'); $this->assertEquals(1, count($elements), 'No selected status option found');
$this->assertEquals(1, (string)$elements[0]['value']); $this->assertEquals(1, (string)$elements[0]['value']);
}//end testDefaultPrivacyBookmarksAdd }//end testDefaultPrivacyBookmarksAdd
/** /**
* Test that the private RSS link exists when a user * Test that the private RSS link exists when a user
* has a private key and is enabled * has a private key and is enabled
@ -86,10 +77,7 @@ class www_bookmarksTest extends TestBaseApi
list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true); list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
$user = $this->us->getUser($uId); $user = $this->us->getUser($uId);
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' $req->setUrl($this->getTestUrl('/' . $user['username']));
. $user['username'] . '?unittestMode=1';
$req->setUrl($reqUrl);
$req->setMethod(HTTP_Request2::METHOD_GET);
$response = $req->send(); $response = $req->send();
$response_body = $response->getBody(); $response_body = $response->getBody();
$this->assertNotEquals('', $response_body, 'Response is empty'); $this->assertNotEquals('', $response_body, 'Response is empty');
@ -98,12 +86,17 @@ class www_bookmarksTest extends TestBaseApi
$ns = $x->getDocNamespaces(); $ns = $x->getDocNamespaces();
$x->registerXPathNamespace('ns', reset($ns)); $x->registerXPathNamespace('ns', reset($ns));
$elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]'); $elements = $x->xpath(
$this->assertEquals(2, count($elements), 'Number of Links in Head not correct'); '//ns:link[@rel="alternate" and @type="application/rss+xml"]'
);
$this->assertEquals(
2, count($elements), 'Number of Links in Head not correct'
);
$this->assertContains('privatekey=', (string)$elements[1]['href']); $this->assertContains('privatekey=', (string)$elements[1]['href']);
}//end testVerifyPrivateRSSLinkExists }//end testVerifyPrivateRSSLinkExists
/** /**
* Test that the private RSS link doesn't exists when a user * Test that the private RSS link doesn't exists when a user
* does not have a private key or is not enabled * does not have a private key or is not enabled
@ -113,10 +106,7 @@ class www_bookmarksTest extends TestBaseApi
list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true); list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
$user = $this->us->getUser($uId); $user = $this->us->getUser($uId);
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' $req->setUrl($this->getTestUrl('/' . $user['username']));
. $user['username'] . '?unittestMode=1';
$req->setUrl($reqUrl);
$req->setMethod(HTTP_Request2::METHOD_GET);
$response = $req->send(); $response = $req->send();
$response_body = $response->getBody(); $response_body = $response->getBody();
$this->assertNotEquals('', $response_body, 'Response is empty'); $this->assertNotEquals('', $response_body, 'Response is empty');
@ -125,8 +115,12 @@ class www_bookmarksTest extends TestBaseApi
$ns = $x->getDocNamespaces(); $ns = $x->getDocNamespaces();
$x->registerXPathNamespace('ns', reset($ns)); $x->registerXPathNamespace('ns', reset($ns));
$elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]'); $elements = $x->xpath(
$this->assertEquals(1, count($elements), 'Number of Links in Head not correct'); '//ns:link[@rel="alternate" and @type="application/rss+xml"]'
);
$this->assertEquals(
1, count($elements), 'Number of Links in Head not correct'
);
$this->assertNotContains('privatekey=', (string)$elements[0]['href']); $this->assertNotContains('privatekey=', (string)$elements[0]['href']);
}//end testVerifyPrivateRSSLinkDoesNotExist }//end testVerifyPrivateRSSLinkDoesNotExist