diff --git a/tests/library/Class/UsersTest.php b/tests/library/Class/UsersTest.php index 86b7575d9785a5cea0de2abb82ff15d92e29f9f5..3ae833b62398cfdaf44aa091d84f0e05c111b0a6 100644 --- a/tests/library/Class/UsersTest.php +++ b/tests/library/Class/UsersTest.php @@ -48,27 +48,24 @@ class UserFixtures { return array(self::miles(), self::truffaz()); } - } class UsersTestLoader extends PHPUnit_Framework_TestCase { - public function testIdFieldIsID_USER() { $loader = Class_Users::getLoader(); $this->assertEquals('id_user', $loader->getIdField()); } - } class UsersMilesDavisAttributesTest extends PHPUnit_Framework_TestCase { - public function setUp() { + parent::setUp(); $this->miles = Class_Users::getLoader()->newFromRow(UserFixtures::miles()); } @@ -130,6 +127,7 @@ class UsersMilesDavisAttributesTest extends PHPUnit_Framework_TestCase { class UsersErikTruffazAttributesTest extends PHPUnit_Framework_TestCase { public function setUp() { + parent::setUp(); $this->truffaz = Class_Users::getLoader()->newFromRow(UserFixtures::truffaz()); } @@ -190,6 +188,7 @@ class UsersTestFindById extends ModelTestCase { class UsersTestSave extends ModelTestCase { public function setUp() { + parent::setUp(); $formatDate = new Class_Multimedia_Utils_DateTimeFormat(); $formatDate->setCurrentDate('2013-10-23 11:47:38'); @@ -324,8 +323,11 @@ class UsersTestDelete extends ModelTestCase { class UsersTestAssociations extends ModelTestCase { + protected $_storm_default_to_volatile = true; + public function setUp() { - Storm_Model_Loader::defaultToVolatile(); + parent::setUp(); + $this->setupPermissions(); $this->haute_savoie = $this->fixture('Class_Zone', @@ -414,11 +416,6 @@ class UsersTestAssociations extends ModelTestCase { } - public function tearDown() { - Storm_Model_Loader::defaultToDb(); - parent::tearDown(); - } - /** @test */ function userBibShouldBeAnnecy() { $this->assertEquals('Annecy', $this->fanfoue->getBib()->getLibelle()); @@ -461,11 +458,12 @@ class UsersTestAssociations extends ModelTestCase { class UsersTestAge extends ModelTestCase { public function setUp() { + parent::setUp(); $this->user = new Class_Users(); $this->user->setNaissance('1980-03-19'); - } + /** @test */ public function AgeShouldBeFiveOnYear1985() { $this->user->setToday('1985/10/19');