diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2010-09-30 07:46:51 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2010-09-30 07:46:51 +0200 |
| commit | 2d31b55b24e79a2014171c89d96c7242e4c590ac (patch) | |
| tree | ab838abfb208ba0fa7cb50b062f6d3cd7f16ae67 /tests/TestBaseApi.php | |
| parent | 5565b0695f72fc28f625c2671648f4cd0a798238 (diff) | |
| parent | e1f9d9e3a07652d4ec668a2337d8b788e031ab9f (diff) | |
| download | semanticscuttle-2d31b55b24e79a2014171c89d96c7242e4c590ac.tar.gz semanticscuttle-2d31b55b24e79a2014171c89d96c7242e4c590ac.tar.bz2 | |
merge master
Diffstat (limited to 'tests/TestBaseApi.php')
| -rw-r--r-- | tests/TestBaseApi.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index 645ead9..eb1457f 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -29,6 +29,16 @@ class TestBaseApi extends TestBase protected $url; protected $urlPart = null; + /** + * @var SemanticScuttle_Service_User + */ + protected $us; + + /** + * @var SemanticScuttle_Service_Bookmark + */ + protected $bs; + protected function setUp() @@ -52,11 +62,14 @@ class TestBaseApi extends TestBase /** - * Gets a HTTP request object + * Gets a HTTP request object. + * Uses $this->url plus $urlSuffix as request URL. * * @param string $urlSuffix Suffix for the URL * * @return HTTP_Request2 HTTP request object + * + * @uses $url */ protected function getRequest($urlSuffix = null) { @@ -71,13 +84,17 @@ class TestBaseApi extends TestBase /** - * Gets a HTTP request object + * Creates a user and a HTTP request object and prepares + * the request object with authentication details, so that + * the user is logged in. * * @param string $urlSuffix Suffix for the URL * @param mixed $auth If user authentication is needed (true/false) * or array with username and password * * @return array(HTTP_Request2, integer) HTTP request object and user id + * + * @uses getRequest() */ protected function getAuthRequest($urlSuffix = null, $auth = true) { |