From 44a65eddaca98c2313ce128f9994e7484f9099b1 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 8 Jun 2011 07:00:17 +0200
Subject: [PATCH] fix tests for people that use a separate test database

---
 tests/www/bookmarksTest.php |  4 ++--
 tests/www/indexTest.php     | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index 1f6d1a5..a4de5f8 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -87,7 +87,7 @@ class www_bookmarksTest extends TestBaseApi
 
         $user = $this->us->getUser($uId);
         $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
-            . $user['username'];
+            . $user['username'] . '?unittestMode=1';
         $req->setUrl($reqUrl);
         $req->setMethod(HTTP_Request2::METHOD_GET);
         $response = $req->send();
@@ -114,7 +114,7 @@ class www_bookmarksTest extends TestBaseApi
 
         $user = $this->us->getUser($uId);
         $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
-            . $user['username'];
+            . $user['username'] . '?unittestMode=1';
         $req->setUrl($reqUrl);
         $req->setMethod(HTTP_Request2::METHOD_GET);
         $response = $req->send();
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
index d95a328..18cb75a 100644
--- a/tests/www/indexTest.php
+++ b/tests/www/indexTest.php
@@ -4,7 +4,7 @@ require_once 'HTTP/Request2.php';
 
 class www_indexTest extends TestBaseApi
 {
-    protected $urlPart = 'api/posts/add';
+    protected $urlPart = '';
 
     /**
      * Test that the private rss feed exists when user is setup
@@ -15,11 +15,9 @@ class www_indexTest extends TestBaseApi
         list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
 
         $user = $this->us->getUser($uId);
-        $reqUrl = $GLOBALS['unittestUrl'] . 'index.php/';
-        $req->setUrl($reqUrl);
-        $req->setMethod(HTTP_Request2::METHOD_GET);
         $response = $req->send();
         $response_body = $response->getBody();
+
         $this->assertNotEquals('', $response_body, 'Response is empty');
 
         $x = simplexml_load_string($response_body);
@@ -32,19 +30,16 @@ class www_indexTest extends TestBaseApi
     }//end testVerifyPrivateRSSLinkExists
 
 
+
     /**
      * 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 the private key is not enabled
      */
     public function testVerifyPrivateRSSLinkDoesNotExist()
     {
         list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
 
         $user = $this->us->getUser($uId);
-        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
-            . $user['username'];
-        $req->setUrl($reqUrl);
-        $req->setMethod(HTTP_Request2::METHOD_GET);
         $response = $req->send();
         $response_body = $response->getBody();
         $this->assertNotEquals('', $response_body, 'Response is empty');