diff --git a/tests/library/Class/CatalogueTest.php b/tests/library/Class/CatalogueTest.php index 9efb3141a0a5542640b5153f728912b0f582d447..3582edffc7c2442e657352578106e44a5ab575da 100644 --- a/tests/library/Class/CatalogueTest.php +++ b/tests/library/Class/CatalogueTest.php @@ -815,6 +815,7 @@ class CatalogueBuildCriteresRechercheTest extends Storm_Test_ModelTestCase { class CatalogueThesaurusCRUDTest extends CatalogueParentTest { protected $_old_sql; + protected $_thesaurus; public function setUp() { parent::setUp(); @@ -822,6 +823,12 @@ class CatalogueThesaurusCRUDTest extends CatalogueParentTest { $this->mock_sql = Storm_Test_ObjectWrapper::mock(); Zend_Registry::set('sql', $this->mock_sql); + + $this->_thesaurus = $this->fixture('Class_CodifThesaurus', + ['id' => 200, + 'id_thesaurus' => 'YYYYHIST0001', + 'libelle' => 'foo']); + Storm_Test_ObjectWrapper::onLoaderOfModel('Class_CodifThesaurus') ->whenCalled('save') ->answers(true) @@ -937,7 +944,7 @@ class CatalogueThesaurusCRUDTest extends CatalogueParentTest { ->whenCalled('findThesaurusForCatalogue') ->with(200) - ->answers(Class_CodifThesaurus::newInstanceWithId(200)->setIdThesaurus('YYYYHIST0002')); + ->answers($this->_thesaurus); $this->_politique->setParentId($this->_moyenage->getId()); $this->assertEquals('YYYYHIST00030001', @@ -962,11 +969,11 @@ class CatalogueThesaurusCRUDTest extends CatalogueParentTest { ->whenCalled('findThesaurusForCatalogue') ->with(100) - ->answers(Class_CodifThesaurus::newInstanceWithId(100)->setIdThesaurus('YYYYHIST0002')) + ->answers($this->_thesaurus->setIdThesaurus('YYYYHIST0002')) ->whenCalled('findThesaurusForCatalogue') ->with(200) - ->answers(Class_CodifThesaurus::newInstanceWithId(200)->setIdThesaurus('YYYYPOLI001')); + ->answers($this->_thesaurus->setIdThesaurus('YYYYPOLI001')); $this->_politique->setParentId($this->_jeux->getId()); $this->assertEquals('YYYY00010005', Class_Catalogue::saveThesaurus($this->_politique) @@ -990,11 +997,11 @@ class CatalogueThesaurusCRUDTest extends CatalogueParentTest { ->whenCalled('findThesaurusForCatalogue') ->with(100) - ->answers(Class_CodifThesaurus::newInstanceWithId(100)->setIdThesaurus('YYYYHIST0002')) + ->answers($this->_thesaurus->setIdThesaurus('YYYYHIST0002')) ->whenCalled('findThesaurusForCatalogue') ->with(200) - ->answers(Class_CodifThesaurus::newInstanceWithId(200)->setIdThesaurus('YYYYPOLI0005')); + ->answers($this->_thesaurus->setIdThesaurus('YYYYPOLI0005')); $this->_politique->setParentId(0); $this->assertEquals('YYYY0001', Class_Catalogue::saveThesaurus($this->_politique)