yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move private key generation to adduser

Browse Source
This commit is contained in:
Christian Weiske 2011-06-27 19:16:33 +02:00
parent 9eab02af5f
commit d2aecd8a76
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/TestBase.php
View File

@ -76,17 +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 $pkey Private Key
* @param string $username Username
* @param string $password Password
* @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, $pkey = null)
{
return reset($this->addUserData($username, $password, $pkey));
protected function addUser(
$username = null, $password = null, $privateKey = null
) {
return reset($this->addUserData($username, $password, $privateKey));
}
@ -94,14 +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 $pkey Private Key
* @param string $username Username
* @param string $password Password
* @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, $pkey = null)
{
protected function addUserData(
$username = null, $password = null, $privateKey = null
) {
$us = SemanticScuttle_Service_Factory::get('User');
$rand = rand();
@ -111,14 +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',
$pkey
$privateKey
);
return array($uid, $username, $password);
return array($uid, $username, $password, $privateKey);
}