Merge remote-tracking branch 'upstream/master'

14 files changed, 1015 insertions, 53 deletions

diff --git a/tests/AllTests.php b/tests/AllTests.php
index 9e825e8..92f8960 100644
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -46,6 +46,7 @@ class AllTests extends PHPUnit_Framework_TestSuite
         $suite->addTestFile($tdir . '/VoteTest.php');
         $suite->addTestFile($tdir . '/UserTest.php');
         $suite->addTestFile($tdir . '/Api/ExportCsvTest.php');
+        $suite->addTestFile($tdir . '/Api/OpenSearchTest.php');
         $suite->addTestFile($tdir . '/Api/PostsAddTest.php');
         $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php');
         $suite->addTestFile($tdir . '/Api/PostsUpdateTest.php');
@@ -58,4 +59,4 @@ class AllTests extends PHPUnit_Framework_TestSuite
     {
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 02e2b38..e6d0531 100644
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -108,7 +108,7 @@ TXT;
 
         $this->assertEquals($bmUrl, $bm['bAddress']);
         $this->assertEquals($bmTitle, $bm['bTitle']);
-        $this->assertEquals($bmDescription, $bm['bDescription']);
+        $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
             gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),
@@ -170,7 +170,7 @@ TXT;
 
         $this->assertEquals($bmUrl, $bm['bAddress']);
         $this->assertEquals($bmTitle, $bm['bTitle']);
-        $this->assertEquals($bmDescription, $bm['bDescription']);
+        $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
             gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),
diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php
index 789540f..0236a5f 100644
--- a/tests/Bookmark2TagTest.php
+++ b/tests/Bookmark2TagTest.php
@@ -282,10 +282,10 @@ class Bookmark2TagTest extends TestBase
     public function testGetPopularTagsDays()
     {
         $user = $this->addUser();
-        $this->addTagBookmark($user, array('one', 'two'), 'today');
-        $this->addTagBookmark($user, array('one', 'thr'), 'today');
-        $this->addTagBookmark($user, array('one', 'two'), '-1 day 1 hour');
-        $this->addTagBookmark($user, array('one', 'thr'), '-3 days 1 hour');
+        $this->addTagBookmark($user, array('one', 'two'), 'now');
+        $this->addTagBookmark($user, array('one', 'thr'), 'now');
+        $this->addTagBookmark($user, array('one', 'two'), '-1 day -1 hour');
+        $this->addTagBookmark($user, array('one', 'thr'), '-3 days -1 hour');
 
         $arTags = $this->b2ts->getPopularTags(null, 10, null, 1);
         $this->assertInternalType('array', $arTags);
@@ -608,4 +608,4 @@ class Bookmark2TagTest extends TestBase
         $this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php
index b50dab2..44a82d9 100644
--- a/tests/BookmarkTest.php
+++ b/tests/BookmarkTest.php
@@ -1330,5 +1330,51 @@ class BookmarkTest extends TestBase
 
 
 
+    /**
+     * Test private bookmarks
+     *
+     * @return void
+     */
+    public function testPrivateBookmarks()
+    {
+        $uid = $this->addUser();
+        /* create private bookmark */
+        $this->bs->addBookmark(
+            'http://test', 'test', 'desc', 'note',
+            2,//private
+            array(), null, null, false, false, $uid
+        );
+        /* create public bookmark */
+        $this->bs->addBookmark(
+            'http://example.org', 'title', 'desc', 'priv',
+            0,//public
+            array(), null, null, false, false, $uid
+        );
+
+        $this->assertEquals(1, $this->bs->countBookmarks($uid, 'public'));
+        $this->assertEquals(1, $this->bs->countBookmarks($uid, 'private'));
+        $this->assertEquals(0, $this->bs->countBookmarks($uid, 'shared'));
+        $this->assertEquals(2, $this->bs->countBookmarks($uid, 'all'));
+
+        $this->us->setCurrentUserId($uid);
+        $bookmarks = $this->bs->getBookmarks();
+        // first record should be private bookmark
+        $b0 = $bookmarks['bookmarks'][0];
+        $this->assertEquals('test', $b0['bTitle']);
+        // second record should be public bookmark
+        $b0 = $bookmarks['bookmarks'][1];
+        $this->assertEquals('title', $b0['bTitle']);
+
+        // test non authenticated query
+        $this->us->setCurrentUserId(null);
+        $bookmarks = $this->bs->getBookmarks();
+        // should only result in one link - public
+        $b2 = $bookmarks['bookmarks'][0];
+        $this->assertEquals('title', $b2['bTitle']);
+        // there should be no second record
+        $this->assertEquals(1,count($bookmarks['bookmarks']));
+
+    }
+
 }
 ?>
diff --git a/tests/SemanticScuttle/ConfigTest.php b/tests/SemanticScuttle/ConfigTest.php
new file mode 100644
index 0000000..670f82a
--- /dev/null
+++ b/tests/SemanticScuttle/ConfigTest.php
@@ -0,0 +1,206 @@
+<?php
+//that's PEAR's Stream_Var package
+require_once 'Stream/Var.php';
+
+class SemanticScuttle_ConfigTest_StreamVar extends Stream_Var {
+    public function url_stat($path, $flags)
+    {
+        $url = parse_url($path);
+
+        $scope   = $url['host'];
+        if (isset($url['path'])) {
+            $varpath = substr($url['path'], 1);
+        } else {
+            $varpath = '';
+        }
+
+        if (!$this->_setPointer($scope, $varpath)) {
+            return false;
+        }
+
+        return parent::url_stat($path, $flags);
+    }
+}
+
+class SemanticScuttle_ConfigTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Configuration object to test
+     */
+    protected $cfg;
+
+
+    public function setUpWrapper()
+    {
+        if (!in_array('unittest', stream_get_wrappers())) {
+            stream_wrapper_register(
+                'unittest', 'SemanticScuttle_ConfigTest_StreamVar'
+            );
+        }
+
+        $this->cfg = $this->getMock(
+            'SemanticScuttle_Config',
+            array('getDataDir')
+        );
+        $this->cfg->expects($this->once())
+            ->method('getDataDir')
+            ->will($this->returnValue('/data-dir/'));
+
+        $this->cfg->filePrefix = 'unittest://GLOBALS/unittest-dir';
+    }
+
+
+
+    public function testFindLocalData()
+    {
+        $this->setUpWrapper();
+        $GLOBALS['unittest-dir']['data-dir'] = array(
+            'config.php' => 'content',
+            'config.default.php' => 'content'
+        );
+        $this->assertEquals(
+            array(
+                '/data-dir/config.php',
+                '/data-dir/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindHostPreferredOverNonHostConfig()
+    {
+        $this->setUpWrapper();
+        $_SERVER['HTTP_HOST'] = 'foo.example.org';
+
+        $GLOBALS['unittest-dir']['data-dir'] = array(
+            'config.php' => 'content',
+            'config.foo.example.org.php' => 'content',
+            'config.default.php' => 'content'
+        );
+        $this->assertEquals(
+            array(
+                '/data-dir/config.foo.example.org.php',
+                '/data-dir/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindEtcHostPreferredOverLocalConfigPhp()
+    {
+        $this->setUpWrapper();
+        $_SERVER['HTTP_HOST'] = 'foo.example.org';
+
+        $GLOBALS['unittest-dir'] = array(
+            'etc' => array(
+                'semanticscuttle' => array(
+                    'config.foo.example.org.php' => 'content',
+                )
+            ),
+            'data-dir' => array(
+                'config.php' => 'content',
+                'config.default.php' => 'content'
+            )
+        );
+
+        $this->assertEquals(
+            array(
+                '/etc/semanticscuttle/config.foo.example.org.php',
+                '/data-dir/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindEtcConfig()
+    {
+        $this->setUpWrapper();
+        $GLOBALS['unittest-dir'] = array(
+            'etc' => array(
+                'semanticscuttle' => array(
+                    'config.php' => 'content'
+                )
+            ),
+            'data-dir' => array(
+                'config.default.php' => 'content'
+            )
+        );
+        $this->assertEquals(
+            array(
+                '/etc/semanticscuttle/config.php',
+                '/data-dir/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindEtcDefaultConfig()
+    {
+        $this->setUpWrapper();
+        $GLOBALS['unittest-dir'] = array(
+            'etc' => array(
+                'semanticscuttle' => array(
+                    'config.php' => 'content',
+                    'config.default.php' => 'content'
+                )
+            ),
+        );
+        $this->assertEquals(
+            array(
+                '/etc/semanticscuttle/config.php',
+                '/etc/semanticscuttle/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindLocalDefaultPreferredOverEtcDefault()
+    {
+        $this->setUpWrapper();
+        $GLOBALS['unittest-dir'] = array(
+            'etc' => array(
+                'semanticscuttle' => array(
+                    'config.php' => 'content',
+                    'config.default.php' => 'content'
+                )
+            ),
+            'data-dir' => array(
+                'config.php' => 'content',
+                'config.default.php' => 'content'
+            )
+        );
+        $this->assertEquals(
+            array(
+                '/data-dir/config.php',
+                '/data-dir/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+    public function testFindSameDirDefaultPreferred()
+    {
+        $this->setUpWrapper();
+        $GLOBALS['unittest-dir'] = array(
+            'etc' => array(
+                'semanticscuttle' => array(
+                    'config.php' => 'content',
+                    'config.default.php' => 'content'
+                )
+            ),
+            'data-dir' => array(
+                'config.default.php' => 'content'
+            )
+        );
+        $this->assertEquals(
+            array(
+                '/etc/semanticscuttle/config.php',
+                '/etc/semanticscuttle/config.default.php'
+            ),
+            $this->cfg->findFiles()
+        );
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/SemanticScuttle/EnvironmentTest.php b/tests/SemanticScuttle/EnvironmentTest.php
new file mode 100644
index 0000000..a41efa1
--- /dev/null
+++ b/tests/SemanticScuttle/EnvironmentTest.php
@@ -0,0 +1,95 @@
+<?php
+
+class SemanticScuttle_EnvironmentTest extends PHPUnit_Framework_TestCase
+{
+    public function testServerPathInfoModPhp()
+    {
+        $_SERVER = array(
+            'HTTP_USER_AGENT' => 'Opera/9.80 (X11; Linux x86_64; U; de) Presto/2.9.168 Version/11.50',
+            'HTTP_HOST' => 'bm-cgi.bogo',
+            'HTTP_ACCEPT' => 'text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/webp, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1',
+            'HTTP_ACCEPT_LANGUAGE' => 'de-DE,de;q=0.9,en;q=0.8',
+            'HTTP_ACCEPT_ENCODING' => 'gzip, deflate',
+            'HTTP_COOKIE' => 'PHPSESSID=ga446jhs0e09hkt60u9bsmp0n0',
+            'HTTP_CACHE_CONTROL' => 'no-cache',
+            'HTTP_CONNECTION' => 'Keep-Alive',
+            'PATH' => '/usr/local/bin:/usr/bin:/bin',
+  'SERVER_SIGNATURE' => '<address>Apache/2.2.17 (Ubuntu) Server at bm-cgi.bogo Port 80</address>',
+            'SERVER_SOFTWARE' => 'Apache/2.2.17 (Ubuntu)',
+            'SERVER_NAME' => 'bm-cgi.bogo',
+            'SERVER_ADDR' => '127.0.0.1',
+            'SERVER_PORT' => '80',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'DOCUMENT_ROOT' => '/etc/apache2/htdocs',
+            'SERVER_ADMIN' => '[no address given]',
+            'SCRIPT_FILENAME' => '/home/cweiske/Dev/html/hosts/bm-cgi.bogo/profile.php',
+            'REMOTE_PORT' => '45349',
+            'GATEWAY_INTERFACE' => 'CGI/1.1',
+            'SERVER_PROTOCOL' => 'HTTP/1.1',
+            'REQUEST_METHOD' => 'GET',
+            'QUERY_STRING' => '',
+            'REQUEST_URI' => '/profile.php/dummy',
+            'SCRIPT_NAME' => '/profile.php',
+            'PATH_INFO' => '/dummy',
+            'PATH_TRANSLATED' => '/home/cweiske/Dev/html/hosts/bm-cgi.bogo/dummy',
+            'PHP_SELF' => '/profile.php/dummy',
+            'REQUEST_TIME' => 1311422546,
+        );
+        $this->assertEquals(
+            '/dummy', SemanticScuttle_Environment::getServerPathInfo()
+        );
+    }
+
+
+    public function testServerPathInfoFastCgi()
+    {
+        $_SERVER = array(
+            'PHP_FCGI_MAX_REQUESTS' => '5000',
+            'PHPRC' => '/etc/php5/cgi/5.3.6/',
+            'PHP_FCGI_CHILDREN' => '3',
+            'PWD' => '/var/www/cgi-bin',
+            'FCGI_ROLE' => 'RESPONDER',
+            'REDIRECT_HANDLER' => 'php-cgi',
+            'REDIRECT_STATUS' => '200',
+            'HTTP_USER_AGENT' => 'Opera/9.80 (X11; Linux x86_64; U; de) Presto/2.9.168 Version/11.50',
+            'HTTP_HOST' => 'bm-cgi.bogo',
+            'HTTP_ACCEPT' => 'text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/webp, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1',
+            'HTTP_ACCEPT_LANGUAGE' => 'de-DE,de;q=0.9,en;q=0.8',
+            'HTTP_ACCEPT_ENCODING' => 'gzip, deflate',
+            'HTTP_COOKIE' => 'PHPSESSID=ga446jhs0e09hkt60u9bsmp0n0',
+            'HTTP_CONNECTION' => 'Keep-Alive',
+            'PATH' => '/usr/local/bin:/usr/bin:/bin',
+  'SERVER_SIGNATURE' => '<address>Apache/2.2.17 (Ubuntu) Server at bm-cgi.bogo Port 80</address>',
+            'SERVER_SOFTWARE' => 'Apache/2.2.17 (Ubuntu)',
+            'SERVER_NAME' => 'bm-cgi.bogo',
+            'SERVER_ADDR' => '127.0.0.1',
+            'SERVER_PORT' => '80',
+            'REMOTE_ADDR' => '127.0.0.1',
+            'DOCUMENT_ROOT' => '/etc/apache2/htdocs',
+            'SERVER_ADMIN' => '[no address given]',
+            'SCRIPT_FILENAME' => '/home/cweiske/Dev/html/hosts/bm-cgi.bogo/profile.php',
+            'REMOTE_PORT' => '45342',
+            'REDIRECT_URL' => '/profile.php/dummy',
+            'GATEWAY_INTERFACE' => 'CGI/1.1',
+            'SERVER_PROTOCOL' => 'HTTP/1.1',
+            'REQUEST_METHOD' => 'GET',
+            'QUERY_STRING' => '',
+            'REQUEST_URI' => '/profile.php/dummy',
+            'SCRIPT_NAME' => '/profile.php',
+            'PATH_INFO' => '/dummy',
+            'PATH_TRANSLATED' => '/etc/apache2/htdocs/dummy',
+            'ORIG_PATH_INFO' => '/profile.php/dummy',
+            'ORIG_SCRIPT_NAME' => '/cgi-bin-php/php-cgi-5.3.6',
+            'ORIG_SCRIPT_FILENAME' => '/var/www/cgi-bin/php-cgi-5.3.6',
+            'ORIG_PATH_TRANSLATED' => '/home/cweiske/Dev/html/hosts/bm-cgi.bogo/profile.php/dummy',
+            'PHP_SELF' => '/profile.php/dummy',
+            'REQUEST_TIME' => 1311422521,
+        );
+        $this->assertEquals(
+            '/dummy', SemanticScuttle_Environment::getServerPathInfo()
+        );
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/tests/Tag2TagTest.php b/tests/Tag2TagTest.php
index 0b73864..58556f1 100644
--- a/tests/Tag2TagTest.php
+++ b/tests/Tag2TagTest.php
@@ -332,6 +332,7 @@ class Tag2TagTest extends TestBase
         $this->assertSame('B3', $results['bookmarks'][0]['bTitle']);
 
         $results = $bs->getBookmarks(0, NULL, 1, 'aa+ee');
+
         $this->assertSame(1, intval($results['total']));
         $this->assertSame('B2', $results['bookmarks'][0]['bTitle']);
 
diff --git a/tests/TestBase.php b/tests/TestBase.php
index 095f32d..2914749 100644
--- a/tests/TestBase.php
+++ b/tests/TestBase.php
@@ -76,16 +76,18 @@ class TestBase extends PHPUnit_Framework_TestCase
     /**
      * Creates a new user in the database.
      *
-     * @param string $username Username
-     * @param string $password Password
+     * @param string $username   Username, may be null
+     * @param string $password   Password, may be null
+     * @param mixed  $privateKey String private key or boolean true to generate one
      *
      * @return integer ID of user
      *
      * @uses addUserData()
      */
-    protected function addUser($username = null, $password = null)
-    {
-        return reset($this->addUserData($username, $password));
+    protected function addUser(
+        $username = null, $password = null, $privateKey = null
+    ) {
+        return reset($this->addUserData($username, $password, $privateKey));
     }
 
 
@@ -93,13 +95,15 @@ class TestBase extends PHPUnit_Framework_TestCase
     /**
      * Creates a new user in the database and returns id, username and password.
      *
-     * @param string $username Username
-     * @param string $password Password
+     * @param string $username   Username, may be null
+     * @param string $password   Password, may be null
+     * @param mixed  $privateKey String private key or boolean true to generate one
      *
-     * @return array ID of user, Name of user, password of user
+     * @return array ID of user, Name of user, password of user, privateKey
      */
-    protected function addUserData($username = null, $password = null)
-    {
+    protected function addUserData(
+        $username = null, $password = null, $privateKey = null
+    ) {
         $us   = SemanticScuttle_Service_Factory::get('User');
         $rand = rand();
 
@@ -109,13 +113,17 @@ class TestBase extends PHPUnit_Framework_TestCase
         if ($password === null) {
             $password = $rand;
         }
+        if ($privateKey === true) {
+            $privateKey = $this->us->getNewPrivateKey();
+        }
 
         $uid  = $us->addUser(
             $username,
             $password,
-            'unittest-' . $rand . '@example.org'
+            'unittest-' . $rand . '@example.org',
+            $privateKey
         );
-        return array($uid, $username, $password);
+        return array($uid, $username, $password, $privateKey);
     }
 
 
@@ -148,4 +156,4 @@ class TestBase extends PHPUnit_Framework_TestCase
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php
index 20574f3..1052ae7 100644
--- a/tests/TestBaseApi.php
+++ b/tests/TestBaseApi.php
@@ -24,7 +24,20 @@ require_once 'HTTP/Request2.php';
  */
 class TestBaseApi extends TestBase
 {
+    /**
+     * Created from the configured host and the $urlPart.
+     * Should be used as base for all generated URLs
+     *
+     * @var string
+     */
     protected $url;
+
+    /**
+     * Part of the URL behind the configured host.
+     * Needs to be overwritten in each derived test case class.
+     *
+     * @var string
+     */
     protected $urlPart = null;
 
     /**
@@ -164,23 +177,25 @@ class TestBaseApi extends TestBase
      *
      * Useful for testing HTML pages or ajax URLs.
      *
-     * @param string $urlSuffix Suffix for the URL
-     * @param mixed  $auth      If user authentication is needed (true/false)
-     *                          or array with username and password
+     * @param string  $urlSuffix  Suffix for the URL
+     * @param mixed   $auth       If user authentication is needed (true/false)
+     *                            or array with username and password
+     * @param boolean $privateKey True if to add user with private key
      *
      * @return array(HTTP_Request2, integer) HTTP request object and user id
      *
      * @uses getRequest()
      */
-    protected function getLoggedInRequest($urlSuffix = null, $auth = true)
-    {
+    protected function getLoggedInRequest(
+        $urlSuffix = null, $auth = true, $privateKey = null
+    ) {
         if (is_array($auth)) {
             list($username, $password) = $auth;
         } else {
             $username = 'testuser';
             $password = 'testpassword';
         }
-        $uid = $this->addUser($username, $password);
+        $uid = $this->addUser($username, $password, $privateKey);
 
         $req = new HTTP_Request2(
             $GLOBALS['unittestUrl'] . '/login.php?unittestMode=1',
@@ -234,7 +249,7 @@ class TestBaseApi extends TestBase
      */
     protected function setUnittestConfig($arConfig)
     {
-        $str = '<' . "?php\r\n";
+        $str = '<' . "?php\n";
         foreach ($arConfig as $name => $value) {
             $str .= '$' . $name . ' = '
                 . var_export($value, true) . ";\n";
@@ -253,4 +268,4 @@ class TestBaseApi extends TestBase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/UserTest.php b/tests/UserTest.php
index 2f57112..6cd6786 100644
--- a/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -35,6 +35,157 @@ class UserTest extends TestBase
 
 
     /**
+     * @covers SemanticScuttle_Service_User::addUser
+     */
+    public function testAddUserPrivateKey()
+    {
+        $name = substr(md5(uniqid()), 0, 6);
+        $pkey = 'my-privateKey';
+        $id   = $this->us->addUser(
+            $name, uniqid(), 'foo@example.org', $pkey
+        );
+        $this->assertNotEquals(false, $id);
+        $this->assertInternalType('integer', $id);
+
+        $arUser = $this->us->getUserByPrivateKey($pkey);
+        $this->assertNotEquals(false, $arUser, 'user not found by private key');
+        $this->assertEquals($id, $arUser['uId'], 'wrong user loaded');
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserFalseWhenIdNotNumeric()
+    {
+        $this->assertFalse(
+            $this->us->updateUser('foo', null, null, null, null, null)
+        );
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserPrivateKeyNewKeyEnabled()
+    {
+        $pkey = 'testUpdateUserPrivateKeyNewKey12';
+        $uid  = $this->addUser();
+
+        $this->assertTrue(
+            $this->us->updateUser(
+                $uid, 'password', 'name', 'test@example.org', '', '',
+                $pkey, true
+            )
+        );
+        $arUser = $this->us->getUser($uid);
+        $this->assertInternalType('array', $arUser);
+        $this->assertEquals($pkey, $arUser['privateKey']);
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserPrivateKeyNewKeyDisabled()
+    {
+        $pkey = 'testUpdateUserPrivateKeyNewKeyDi';
+        $uid  = $this->addUser();
+
+        $this->assertTrue(
+            $this->us->updateUser(
+                $uid, 'password', 'name', 'test@example.org', '', '',
+                $pkey, false
+            )
+        );
+        $arUser = $this->us->getUser($uid);
+        $this->assertInternalType('array', $arUser);
+        $this->assertEquals(
+            '-' . $pkey, $arUser['privateKey'],
+            'private key did not get disabled'
+        );
+    }
+
+
+    /**
+     * Passing an empty string / NULL as key but enabling it
+     * should automatically create a new key.
+     *
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserPrivateKeyNoKeyEnabled()
+    {
+        $pkey = 'testUpdateUserPrivateKeyNoKeyEna';
+        $uid  = $this->addUser();
+
+        $this->assertTrue(
+            $this->us->updateUser(
+                $uid, 'password', 'name', 'test@example.org', '', '',
+                null, true
+            )
+        );
+        $arUser = $this->us->getUser($uid);
+        $this->assertInternalType('array', $arUser);
+        $this->assertNotEquals(
+            '', $arUser['privateKey'], 'private key was not created'
+        );
+    }
+
+
+    /**
+     * Passing an empty string / NULL as key and disabling it
+     * should keep no key
+     *
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserPrivateKeyNoKeyDisabled()
+    {
+        $pkey = 'testUpdateUserPrivateKeyNoKeyDis';
+        $uid  = $this->addUser();
+
+        $this->assertTrue(
+            $this->us->updateUser(
+                $uid, 'password', 'name', 'test@example.org', '', '',
+                null, false
+            )
+        );
+        $arUser = $this->us->getUser($uid);
+        $this->assertInternalType('array', $arUser);
+        $this->assertEquals(
+            '', $arUser['privateKey'], 'private key was set'
+        );
+    }
+
+
+    /**
+     * Passing an empty string / NULL as key and disabling it
+     * should keep no key
+     *
+     * @covers SemanticScuttle_Service_User::updateUser
+     */
+    public function testUpdateUserPrivateKeyExistingKeyEnabled()
+    {
+        $pkey = '12345678901234567890123456789012';
+        $uid  = $this->addUser();
+
+        $this->assertTrue(
+            $this->us->updateUser(
+                $uid, 'password', 'name', 'test@example.org', '', '',
+                '-' . $pkey, true
+            )
+        );
+        $arUser = $this->us->getUser($uid);
+        $this->assertInternalType('array', $arUser);
+        $this->assertEquals(
+            $pkey, $arUser['privateKey'], 'private key was not enabled'
+        );
+    }
+
+    //FIXME: verify I cannot re-use private key of different user
+
+
+
+    /**
      * Test that setting the current user ID is permanent.
      * and that the current user array is the same ID
      *
@@ -176,5 +327,185 @@ class UserTest extends TestBase
         );
     }
 
+
+    public function testGetUserByPrivateKeyEmptyKey()
+    {
+        $arUser = $this->us->getUserByPrivateKey(null);
+        $this->assertFalse($arUser);
+    }
+
+
+    public function testGetUserByPrivateKeyInvalid()
+    {
+        $arUser = $this->us->getUserByPrivateKey('foobar');
+        $this->assertFalse($arUser);
+
+        $arUser = $this->us->getUserByPrivateKey('%');
+        $this->assertFalse($arUser);
+    }
+
+
+    public function testGetUserByPrivateKeyValidKey()
+    {
+        $pkey = $this->us->getNewPrivateKey();
+        $uId = $this->addUser(null, null, $pkey);
+
+        $arUser = $this->us->getUserByPrivateKey($pkey);
+        $this->assertInternalType('array', $arUser);
+        $this->assertArrayHasKey('uId', $arUser);
+        $this->assertArrayHasKey('username', $arUser);
+
+        $this->assertEquals($uId, $arUser['uId']);
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::privateKeyExists
+     */
+    public function testPrivateKeyExistsEmpty()
+    {
+        $this->assertFalse($this->us->privateKeyExists(null));
+        $this->assertFalse($this->us->privateKeyExists(''));
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::privateKeyExists
+     */
+    public function testPrivateKeyExistsInvalid()
+    {
+        $this->assertFalse($this->us->privateKeyExists('-1'));
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::privateKeyExists
+     */
+    public function testPrivateKeyExists()
+    {
+        $randKey = $this->us->getNewPrivateKey();
+        $this->assertFalse($this->us->privateKeyExists($randKey));
+        $uid = $this->addUser(null, null, $randKey);
+
+        $this->us->setCurrentUserId($uid);
+        $this->assertEquals($uid, $this->us->getCurrentUserId());
+
+        $this->assertTrue($this->us->privateKeyExists($randKey));
+    }
+
+
+    /**
+     * @covers SemanticScuttle_Service_User::isPrivateKeyValid
+     */
+    public function testIsPrivateKeyValid()
+    {
+        $this->assertFalse(
+            $this->us->isPrivateKeyValid(null),
+            'NULL is an invalid private key'
+        );
+
+        $randKey = $this->us->getNewPrivateKey();
+        $this->assertTrue(
+            $this->us->isPrivateKeyValid($randKey),
+            'generated key should be valid'
+        );
+
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $this->assertFalse(
+            $this->us->isPrivateKeyValid($randKey2),
+            'disabled privateKey should return false'
+        );
+    }
+
+
+    public function testLoginPrivateKeyInvalid()
+    {
+        /* normal user with enabled privateKey */
+        $randKey = $this->us->getNewPrivateKey();
+        $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
+        /* user that has disabled privateKey */
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
+
+        /* test invalid private key */
+        $this->assertFalse(
+            $this->us->loginPrivateKey('02848248084082408240824802408248')
+        );
+    }
+
+
+    public function testLoginPrivateKeyValidEnabledKey()
+    {
+        /* normal user with enabled privateKey */
+        $randKey = $this->us->getNewPrivateKey();
+        $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
+        /* user that has disabled privateKey */
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
+
+
+        /* test valid credentials with private key enabled */
+        $this->assertTrue(
+            $this->us->loginPrivateKey($randKey)
+        );
+    }
+
+
+    public function testLoginPrivateKeyInvalidEnabledKey()
+    {
+        /* normal user with enabled privateKey */
+        $randKey = $this->us->getNewPrivateKey();
+        $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
+        /* user that has disabled privateKey */
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
+
+
+        /* test valid credentials with private key enabled but invalid key */
+        $this->assertFalse(
+            $this->us->loginPrivateKey('123')
+        );
+    }
+
+
+    public function testLoginPrivateKeyValidDisabledKey()
+    {
+        /* normal user with enabled privateKey */
+        $randKey = $this->us->getNewPrivateKey();
+        $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
+        /* user that has disabled privateKey */
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
+
+        /* confirm user exists so future fails should be due to randkey */
+        $this->assertTrue(
+            $this->us->login('seconduser', 'passw0RD', false)
+        );
+
+        /* test valid credentials with private key disabled */
+        $this->assertFalse(
+            $this->us->loginPrivateKey($randKey2)
+        );
+    }
+
+
+    public function testLoginPrivateKeyInvalidDisabled()
+    {
+        /* normal user with enabled privateKey */
+        $randKey = $this->us->getNewPrivateKey();
+        $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
+        /* user that has disabled privateKey */
+        $randKey2 = '-'.$this->us->getNewPrivateKey();
+        $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
+
+        /* test valid credentials with private key disabled and invalid key */
+        $this->assertFalse(
+            $this->us->loginPrivateKey('-1')
+        );
+        $this->assertFalse(
+            $this->us->loginPrivateKey(null)
+        );
+    }
+
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index df360cc..ae82118 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -4,7 +4,7 @@ require_once 'HTTP/Request2.php';
 
 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
@@ -16,23 +16,11 @@ class www_bookmarksTest extends TestBaseApi
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 2))
         );
-        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']));
+        list($req, $uId) = $this->getLoggedInRequest();
         $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->setUrl($reqUrl);
-        $req->setCookieJar($cookies);
+        $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=get'));
         $req->addPostParameter('submitted', '1');
         $response = $req->send();
         $response_body = $response->getBody();
@@ -41,12 +29,15 @@ class www_bookmarksTest extends TestBaseApi
         $ns = $x->getDocNamespaces();
         $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(2, (string)$elements[0]['value']);
     }//end testDefaultPrivacyBookmarksAddMissingTitleMissingPrivacy
 
 
+
     /**
      * Test that the default privacy setting is selected in the Privacy
      * drop-down list when a new bookmark is being created.
@@ -56,13 +47,10 @@ class www_bookmarksTest extends TestBaseApi
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 1))
         );
-        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1');
+        list($req, $uId) = $this->getLoggedInRequest();
 
         $user = $this->us->getUser($uId);
-        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
-            . $user['username'] . '?action=add' . '&unittestMode=1';
-        $req->setUrl($reqUrl);
-        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=add'));
         $response = $req->send();
         $response_body = $response->getBody();
         $this->assertNotEquals('', $response_body, 'Response is empty');
@@ -71,10 +59,70 @@ class www_bookmarksTest extends TestBaseApi
         $ns = $x->getDocNamespaces();
         $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, (string)$elements[0]['value']);
     }//end testDefaultPrivacyBookmarksAdd
 
+
+
+    /**
+     * Test that the private RSS link exists when a user
+     * has a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $req->setUrl($this->getTestUrl('/' . $user['username']));
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath(
+            '//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']);
+    }//end testVerifyPrivateRSSLinkExists
+
+
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * does not have a private key or is not enabled
+     */
+    public function testVerifyPrivateRSSLinkDoesNotExist()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
+
+        $user = $this->us->getUser($uId);
+        $req->setUrl($this->getTestUrl('/' . $user['username']));
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath(
+            '//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']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
 }//end class www_bookmarksTest
 ?>
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
new file mode 100644
index 0000000..503fd1f
--- /dev/null
+++ b/tests/www/indexTest.php
@@ -0,0 +1,58 @@
+<?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
+
+class www_indexTest extends TestBaseApi
+{
+    protected $urlPart = '';
+
+    /**
+     * Test that the private rss feed exists when user is setup
+     * with a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $response = $req->send();
+        $response_body = $response->getBody();
+
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//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']);
+    }//end testVerifyPrivateRSSLinkExists
+
+
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * 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);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//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']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
+
+}//end class www_bookmarksTest
+?>
diff --git a/tests/www/rssTest.php b/tests/www/rssTest.php
new file mode 100644
index 0000000..71d0198
--- /dev/null
+++ b/tests/www/rssTest.php
@@ -0,0 +1,151 @@
+<?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
+
+class www_rssTest extends TestBaseApi
+{
+    protected $urlPart = 'rss.php';
+
+
+    /**
+     * Verifies that the given number of feed items exist in the feed
+     * XML tree.
+     *
+     * @var SimpleXMLElement $simpleXml RSS feed root element
+     * @var integer          $nCount    Number of expected feed items
+     * @var string           $msg       Error message
+     */
+    protected function assertItemCount(
+        SimpleXMLElement $simpleXml, $nCount, $msg = null
+    ) {
+        $this->assertEquals($nCount, count($simpleXml->channel->item), $msg);
+    }
+
+
+
+
+    /**
+     * A private bookmark should not show up in the global rss feed if the
+     * user is not logged in nor passes the private key
+     */
+    public function testAllPrivateBookmarkNotLoggedIn()
+    {
+        list($uId, $username) = $this->addUserData();
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE
+        );
+
+        $req = $this->getRequest();
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I see a private bookmark');
+    }
+
+
+
+    /**
+     * A private bookmark should not show up in the user's rss feed if the
+     * user is not logged in nor passes the private key
+     */
+    public function testUserPrivateBookmarkNotLoggedIn()
+    {
+        list($uId, $username) = $this->addUserData();
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE
+        );
+
+        $req = $this->getRequest('/' . $username);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I see a private bookmark');
+    }
+
+
+
+
+    /**
+     * Test the global feed by passing the private key
+     */
+    public function testAllPrivateBookmarkWithPrivateKey()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('?privateKey=' . $privateKey);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 1, 'I miss the private bookmark');
+        $this->assertEquals(
+            'private bookmark', (string)$rss->channel->item[0]->title
+        );
+    }
+
+
+
+    /**
+     * Test the user feed by passing the private key
+     */
+    public function testUserPrivateBookmarkWithPrivateKey()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 1, 'I miss the private bookmark');
+        $this->assertEquals(
+            'private bookmark', (string)$rss->channel->item[0]->title
+        );
+    }
+
+
+
+    /**
+     * Verify that fetching the feed with a private key
+     * does not keep you logged in
+     */
+    public function testUserPrivateKeyDoesNotKeepLoggedYouIn()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
+        $cookies = $req->setCookieJar()->getCookieJar();
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $items = $rss->channel->item;
+
+        $this->assertEquals(1, count($items), 'I miss the private bookmark');
+        $this->assertEquals('private bookmark', (string)$items[0]->title);
+
+        //request the feed again, with the same cookies
+        $req = $this->getRequest('/' . $username);
+        $req->setCookieJar($cookies);
+        $response_body = $req->send()->getBody();
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I still see the private bookmark');
+    }
+
+}//end class www_rssTest
+?>
diff --git a/tests/www/searchTest.php b/tests/www/searchTest.php
index 5dce69d..89af32d 100644
--- a/tests/www/searchTest.php
+++ b/tests/www/searchTest.php
@@ -1,4 +1,6 @@
 <?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
 
 class www_SearchTest extends TestBaseApi
 {
@@ -65,4 +67,4 @@ class www_SearchTest extends TestBaseApi
 
 }
 
-?>
\ No newline at end of file
+?>