privatekey -> privateKey everywhere

5 files changed, 20 insertions, 20 deletions

diff --git a/tests/TestBase.php b/tests/TestBase.php
index 2180d2d..2914749 100644
--- a/tests/TestBase.php
+++ b/tests/TestBase.php
@@ -99,7 +99,7 @@ class TestBase extends PHPUnit_Framework_TestCase
      * @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, privatekey
+     * @return array ID of user, Name of user, password of user, privateKey
      */
     protected function addUserData(
         $username = null, $password = null, $privateKey = null
diff --git a/tests/UserTest.php b/tests/UserTest.php
index 230167d..6cd6786 100644
--- a/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -40,7 +40,7 @@ class UserTest extends TestBase
     public function testAddUserPrivateKey()
     {
         $name = substr(md5(uniqid()), 0, 6);
-        $pkey = 'my-privatekey';
+        $pkey = 'my-privateKey';
         $id   = $this->us->addUser(
             $name, uniqid(), 'foo@example.org', $pkey
         );
@@ -413,17 +413,17 @@ class UserTest extends TestBase
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $this->assertFalse(
             $this->us->isPrivateKeyValid($randKey2),
-            'disabled privatekey should return false'
+            'disabled privateKey should return false'
         );
     }
 
 
     public function testLoginPrivateKeyInvalid()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -436,10 +436,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyValidEnabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -453,10 +453,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyInvalidEnabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -470,10 +470,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyValidDisabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -491,10 +491,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyInvalidDisabled()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index 1e1f4eb..ae82118 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -92,7 +92,7 @@ class www_bookmarksTest extends TestBaseApi
         $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
 
 
@@ -121,7 +121,7 @@ class www_bookmarksTest extends TestBaseApi
         $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 class www_bookmarksTest
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
index 18cb75a..503fd1f 100644
--- a/tests/www/indexTest.php
+++ b/tests/www/indexTest.php
@@ -26,7 +26,7 @@ class www_indexTest extends TestBaseApi
 
         $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']);
+        $this->assertContains('privateKey=', (string)$elements[1]['href']);
     }//end testVerifyPrivateRSSLinkExists
 
 
@@ -50,7 +50,7 @@ class www_indexTest extends TestBaseApi
 
         $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']);
+        $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
     }//end testVerifyPrivateRSSLinkDoesNotExist
 
 
diff --git a/tests/www/rssTest.php b/tests/www/rssTest.php
index 75e4363..71d0198 100644
--- a/tests/www/rssTest.php
+++ b/tests/www/rssTest.php
@@ -78,7 +78,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('?privatekey=' . $privateKey);
+        $req = $this->getRequest('?privateKey=' . $privateKey);
         $response_body = $req->send()->getBody();
 
         $rss = simplexml_load_string($response_body);
@@ -103,7 +103,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('/' . $username . '?privatekey=' . $privateKey);
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
         $response_body = $req->send()->getBody();
 
         $rss = simplexml_load_string($response_body);
@@ -129,7 +129,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('/' . $username . '?privatekey=' . $privateKey);
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
         $cookies = $req->setCookieJar()->getCookieJar();
         $response_body = $req->send()->getBody();