rel #13964 : added $this->fixture in tests

tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php

@@ -325,28 +325,32 @@ class AdminAvisModerationControllerCmsWithNoAvisTest extends Admin_AbstractContr
 abstract class AdminAvisModerationControllerCmsWithAvisTestCase extends Admin_AbstractControllerTestCase {
 	public function setUp() { 
 		parent::setUp();
+		$this->fixture('Class_Avis', 
+									 ['id' => 12, 
+										'date_avis' => '2012-12-03',
+										'note' => 4,
+										'entete' => 'Mon avis',
+										'avis' => 'Cet article est inspirant',
+										'abon_ou_bib' => 0,
+										'statut' => 0,
+
+										'article' => $this->fixture('Class_Article',
+																								['id' => 9,
+																								 'titre' => 'Tintin à Annecy',
+																								 'contenu' => 'un contenu']),
+
+										'user' => $this->fixture('Class_Users',
+																						 ['id' => 34,
+																							'pseudo' => 'Pat',
+																							'mail' => 'pat@afi.fr',
+																							'password' => 'pass',
+																							'login' => 'login'])]);
 
-		$avis = Class_Avis::newInstanceWithId(12, ['date_avis' => '2012-12-03',
-																							 'note' => 4,
-																							 'entete' => 'Mon avis',
-																							 'avis' => 'Cet article est inspirant',
-																							 'abon_ou_bib' => 0])
-			->setArticle(Class_Article::newInstanceWithId(9, ['titre' => 'Tintin à Annecy']))
-			->setUser(Class_Users::newInstanceWithId(34, ['pseudo' => 'Pat',
-																										'mail' => 'pat@afi.fr']));
-
-		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Avis')
-			->whenCalled('findAllBy')
-			->with(['statut' => 0,
-							'order' => 'date_avis desc'])
-			->answers([$avis]);
 	}
 }
 
 
 
-
-
 class AdminAvisModerationControllerCmsWithAvisTest extends AdminAvisModerationControllerCmsWithAvisTestCase {
 	public function setUp() { 
 		parent::setUp();
@@ -388,11 +392,9 @@ class AdminAvisModerationControllerCmsWithAvisTest extends AdminAvisModerationCo
 
 
 
-
 class AdminAvisModerationControllerCmsDeleteAvisTest extends AdminAvisModerationControllerCmsWithAvisTestCase {
 	public function setUp() { 
 		parent::setUp();
-		Class_Avis::whenCalled('delete')->answers(true);
 		$this->dispatch('/admin/modo/del-aviscms/id/12', true);
 	}
 
@@ -404,7 +406,7 @@ class AdminAvisModerationControllerCmsDeleteAvisTest extends AdminAvisModeration
 
 	/** @test */
 	public function avisShouldHaveBeenDeleted() {
-		$this->assertTrue(Class_Avis::methodHasBeenCalled('delete'));
+		$this->assertNull(Class_Avis::find(12));
 	}
 }
 
@@ -413,7 +415,6 @@ class AdminAvisModerationControllerCmsDeleteAvisTest extends AdminAvisModeration
 class AdminAvisModerationControllerCmsValidateAvisTest extends AdminAvisModerationControllerCmsWithAvisTestCase {
 	public function setUp() { 
 		parent::setUp();
-		Class_Avis::whenCalled('save')->answers(true);
 		$this->dispatch('/admin/modo/validate-aviscms/id/12', true);
 	}
 
@@ -424,17 +425,10 @@ class AdminAvisModerationControllerCmsValidateAvisTest extends AdminAvisModerati
 	}
 
 
-	/** @test */
-	public function avisShouldHaveBeenSaved() {
-		$this->assertTrue(Class_Avis::methodHasBeenCalled('save'));
-	}
-
-
 	/** @test */
 	public function avisShouldBeValid() {
 		$this->assertEquals(1, Class_Avis::find(12)->getStatut());
 	}
 }
 
-
 ?>
\ No newline at end of file