hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-06 16:22:15 +01:00
parent 01a9bc5e0c
commit bc22fa35d2
4 changed files with 741 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1293
lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
View File

File diff suppressed because it is too large Load Diff

14
lib/unitTest/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
View File

@@ -41,18 +41,4 @@ abstract class PhraseanetPHPUnitAuthenticatedAbstract extends PhraseanetPHPUnitA
parent::tearDown();
}
// public static function setUpBeforeClass()
// {
// parent::setUpBeforeClass();
// $session = Session_Handler::getInstance();
// $session->authenticate(self::$user->get_id());
// }
//
// public static function tearDownAfterClass()
// {
// $session = Session_Handler::getInstance();
// $session->logout();
// parent::tearDownAfterClass();
// }
}

11
lib/unitTest/PhraseanetWebTestCaseAbstract.class.inc
View File

@@ -24,15 +24,4 @@ use Symfony\Component\HttpFoundation\Response;
abstract class PhraseanetWebTestCaseAbstract extends PhraseanetPHPUnitAbstract
{
public function createClient(array $options = array(), array $server = array())
{
return new Client($this->app);
}
public function setUp()
{
parent::setUp();
$this->app = $this->createApplication();
}
}

18
lib/unitTest/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc
View File

@@ -15,7 +15,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
require_once dirname(__FILE__) . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
use Silex\WebTestCase;
use Symfony\Component\HttpKernel\Client;
@@ -24,15 +24,21 @@ use Symfony\Component\HttpFoundation\Response;
abstract class PhraseanetWebTestCaseAuthenticatedAbstract extends PhraseanetPHPUnitAuthenticatedAbstract
{
public function createClient(array $options = array(), array $server = array())
public static function setUpBeforeClass()
{
return new Client($this->app);
parent::setUpBeforeClass();
$appbox = appbox::get_instance();
$session = $appbox->get_session();
$auth = new Session_Authentication_None(self::$user);
$session->authenticate($auth);
}
public function setUp()
public static function tearDownAfterClass()
{
parent::setUp();
$this->app = $this->createApplication();
parent::tearDownAfterClass();
$appbox = appbox::get_instance();
$session = $appbox->get_session();
$session->logout();
}
}