use xpath instead of manual string-search to verify test results
This commit is contained in:
parent
8e7138bf1f
commit
43b6021be7
1 changed files with 11 additions and 10 deletions
|
@ -563,12 +563,13 @@ TXT;
|
||||||
$this->setUnittestConfig(
|
$this->setUnittestConfig(
|
||||||
array('defaults' => array('privacy' => 2))
|
array('defaults' => array('privacy' => 2))
|
||||||
);
|
);
|
||||||
list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
|
list($req, $uId) = $this->getLoggedInRequest();
|
||||||
$req->setMethod(HTTP_Request2::METHOD_POST);
|
$req->setMethod(HTTP_Request2::METHOD_POST);
|
||||||
$req->addPostParameter('url', 'http://www.example.org/testdefaultprivacyposts_bookmarksget');
|
$req->addPostParameter('url', 'http://www.example.org/testdefaultprivacyposts_bookmarksget');
|
||||||
$req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
|
$req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
|
||||||
$req->addPostParameter('status', '0');
|
$req->addPostParameter('status', '0');
|
||||||
$req->send();
|
$req->send();
|
||||||
|
|
||||||
$bms = $this->bs->getBookmarks(0, null, $uId);
|
$bms = $this->bs->getBookmarks(0, null, $uId);
|
||||||
$this->assertEquals(1, count($bms['bookmarks']));
|
$this->assertEquals(1, count($bms['bookmarks']));
|
||||||
$bm = reset($bms['bookmarks']);
|
$bm = reset($bms['bookmarks']);
|
||||||
|
@ -577,6 +578,7 @@ TXT;
|
||||||
$user = $this->us->getUser($uId);
|
$user = $this->us->getUser($uId);
|
||||||
$userId = $user['username'];
|
$userId = $user['username'];
|
||||||
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' . $userId . '?action=get' . '&unittestMode=1';
|
$reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' . $userId . '?action=get' . '&unittestMode=1';
|
||||||
|
|
||||||
list($req, $uId) = $this->getAuthRequest('?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($reqUrl);
|
||||||
|
@ -590,15 +592,14 @@ TXT;
|
||||||
$req->addPostParameter('submitted', '1');
|
$req->addPostParameter('submitted', '1');
|
||||||
$response = $req->send();
|
$response = $req->send();
|
||||||
$response_body = $response->getBody();
|
$response_body = $response->getBody();
|
||||||
$start = strpos($response_body, 'Privacy');
|
|
||||||
$end = strpos($response_body, 'referrer');
|
$x = simplexml_load_string($response_body);
|
||||||
$length = $end - $start;
|
$ns = $x->getDocNamespaces();
|
||||||
$response_body = substr($response_body, $start, $length);
|
$x->registerXPathNamespace('ns', reset($ns));
|
||||||
$start = strpos($response_body, 'selected');
|
|
||||||
$start = $start - 3;
|
$elements = $x->xpath('//ns:select[@name="status"]/ns:option[@selected="selected"]');
|
||||||
$length = 1;
|
$this->assertEquals(1, count($elements), 'No selected status option found');
|
||||||
$selected_privacy = substr($response_body, $start, $length);
|
$this->assertEquals(2, (string)$elements[0]['value']);
|
||||||
$this->assertEquals('2', $selected_privacy);
|
|
||||||
}//end testDefaultPrivacyBookmarksGet
|
}//end testDefaultPrivacyBookmarksGet
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue