diff options
Diffstat (limited to 'tests/modules/UsersManager.test.php')
| -rw-r--r-- | tests/modules/UsersManager.test.php | 152 |
1 files changed, 76 insertions, 76 deletions
diff --git a/tests/modules/UsersManager.test.php b/tests/modules/UsersManager.test.php index 148617feee..a635ee5d54 100644 --- a/tests/modules/UsersManager.test.php +++ b/tests/modules/UsersManager.test.php @@ -1,11 +1,11 @@ <?php -if(!defined("PATH_TEST_TO_ROOT")) {
- define('PATH_TEST_TO_ROOT', getcwd().'/../../');
-}
-if(!defined('CONFIG_TEST_INCLUDED'))
-{
- require_once PATH_TEST_TO_ROOT."tests/config_test.php";
-}
+if(!defined("PATH_TEST_TO_ROOT")) { + define('PATH_TEST_TO_ROOT', getcwd().'/../../'); +} +if(!defined('CONFIG_TEST_INCLUDED')) +{ + require_once PATH_TEST_TO_ROOT."tests/config_test.php"; +} require_once "Database.test.php"; @@ -31,58 +31,58 @@ class Test_Piwik_UsersManager extends Test_Database FakeAccess::$superUser = true; Zend_Registry::set('access', $pseudoMockAccess); - }
-
- private function _checkUserHasNotChanged($user, $newPassword, $newEmail = null, $newAlias= null)
- {
- if(is_null($newEmail))
- {
- $newEmail = $user['email'];
- }
- if(is_null($newAlias))
- {
- $newAlias = $user['alias'];
- }
- $userAfter = Piwik_UsersManager_API::getUser($user["login"]);
- unset($userAfter['date_registered']);
-
- // we now compute what the token auth should be, it should always be a hash of the login and the current password
- // if the password has changed then the token_auth has changed!
- $user['token_auth']= Piwik_UsersManager_API::getTokenAuth($user["login"], md5($newPassword) );
-
- $user['password']=md5($newPassword);
- $user['email']=$newEmail;
- $user['alias']=$newAlias;
- $this->assertEqual($user,$userAfter);
- }
-
- /**
- * bad password => exception
- */
- function test_updateUser_badpasswd()
- {
- $login="login";
- $user = array('login'=>$login,
- 'password'=>"geqgeagae",
- 'email'=>"test@test.com",
- 'alias'=>"alias");
-
- Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
-
-
- try {
- Piwik_UsersManager_API::updateUser( $login, "pas");
- }
- catch (Exception $expected) {
- $this->assertPattern("(password)", $expected->getMessage());
-
- $this->_checkUserHasNotChanged($user,$user['password']);
- return;
- }
- $this->fail("Exception not raised.");
-
- }
-//} class test{
+ } + + private function _checkUserHasNotChanged($user, $newPassword, $newEmail = null, $newAlias= null) + { + if(is_null($newEmail)) + { + $newEmail = $user['email']; + } + if(is_null($newAlias)) + { + $newAlias = $user['alias']; + } + $userAfter = Piwik_UsersManager_API::getUser($user["login"]); + unset($userAfter['date_registered']); + + // we now compute what the token auth should be, it should always be a hash of the login and the current password + // if the password has changed then the token_auth has changed! + $user['token_auth']= Piwik_UsersManager_API::getTokenAuth($user["login"], md5($newPassword) ); + + $user['password']=md5($newPassword); + $user['email']=$newEmail; + $user['alias']=$newAlias; + $this->assertEqual($user,$userAfter); + } + + /** + * bad password => exception + */ + function test_updateUser_badpasswd() + { + $login="login"; + $user = array('login'=>$login, + 'password'=>"geqgeagae", + 'email'=>"test@test.com", + 'alias'=>"alias"); + + Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] ); + + + try { + Piwik_UsersManager_API::updateUser( $login, "pas"); + } + catch (Exception $expected) { + $this->assertPattern("(password)", $expected->getMessage()); + + $this->_checkUserHasNotChanged($user,$user['password']); + return; + } + $this->fail("Exception not raised."); + + } +//} class test{ /** * wrong login / integer => exception @@ -499,23 +499,23 @@ class Test_Piwik_UsersManager extends Test_Database ); } -
- /**
- * normal case
- */
- function test_getUsersLogin()
- {
-
- Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
- Piwik_UsersManager_API::addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias");
- Piwik_UsersManager_API::addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com");
-
- $logins = Piwik_UsersManager_API::getUsersLogin();
-
- $this->assertEqual($logins,
- array( "gegg4564eqgeqag", "geggeqge632ge56a4qag", "geggeqgeqagqegg")
- );
- }
+ + /** + * normal case + */ + function test_getUsersLogin() + { + + Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias"); + Piwik_UsersManager_API::addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias"); + Piwik_UsersManager_API::addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com"); + + $logins = Piwik_UsersManager_API::getUsersLogin(); + + $this->assertEqual($logins, + array( "gegg4564eqgeqag", "geggeqge632ge56a4qag", "geggeqgeqagqegg") + ); + } /** |