Simplifying assertions in FixtureTask test

kunit · Sep 29, 2011 · 27ab12d · 27ab12d
1 parent 6196e74
commit 27ab12d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -208,7 +208,7 @@ public function testExecuteWithNamedModel() {
 		$filename = '/my/path/ArticleFixture.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
+			->with($filename, $this->stringContains('class ArticleFixture'));
 
 		$this->Task->execute();
 	}
@@ -224,7 +224,7 @@ public function testExecuteIntoAll() {
 		$this->Task->args = array('all');
 		$this->Task->Model->expects($this->any())
 			->method('listAll')
-			->will($this->returnValue(array('Article', 'comments')));
+			->will($this->returnValue(array('articles', 'comments')));
 
 		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->at(0))
@@ -251,15 +251,15 @@ public function testAllWithCountAndRecordsFlags() {
 		$this->Task->params = array('count' => 10, 'records' => true);
 
 		$this->Task->Model->expects($this->any())->method('listAll')
-			->will($this->returnValue(array('articles', 'comments')));
+			->will($this->returnValue(array('Articles', 'comments')));
 
 		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->at(0))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/title\' => \'Third Article\'/'));
+			->with($filename, $this->stringContains("'title' => 'Third Article'"));
 
 		$filename = '/my/path/CommentFixture.php';
 		$this->Task->expects($this->at(1))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/comment\' => \'First Comment for First Article/'));
+			->with($filename, $this->stringContains("'comment' => 'First Comment for First Article'"));
 		$this->Task->expects($this->exactly(2))->method('createFile');
 
 		$this->Task->all();
@@ -282,7 +282,7 @@ public function testExecuteInteractive() {
 
 		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->once())->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
+			->with($filename, $this->stringContains('class ArticleFixture'));
 
 		$this->Task->execute();
 	}
@@ -349,10 +349,10 @@ public function testGenerateFixtureFile() {
 		$filename = '/my/path/ArticleFixture.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/ArticleFixture/'));
+			->with($filename, $this->stringContains('ArticleFixture'));
 
 		$this->Task->expects($this->at(1))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/\<\?php/ms'));
+			->with($filename, $this->stringContains('<?php'));
 
 		$result = $this->Task->generateFixtureFile('Article', array());
 
@@ -373,7 +373,7 @@ public function testGeneratePluginFixtureFile() {
 		//fake plugin path
 		CakePlugin::load('TestFixture', array('path' =>  APP . 'Plugin' . DS . 'TestFixture' . DS));
 		$this->Task->expects($this->at(0))->method('createFile')
-			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/Article/'));
+			->with($filename, $this->stringContains('class Article'));
 
 		$result = $this->Task->generateFixtureFile('Article', array());
 		CakePlugin::unload();