Merge pull request #4724 from antograssiot/3.0-update-test

3.0 minor test updates
cakephp · Sep 25, 2014 · 0bde6a4 · 0bde6a4
2 parents 209bf7a + b0c43ce
commit 0bde6a4
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/tests/TestCase/Shell/Task/TemplateTaskTest.php b/tests/TestCase/Shell/Task/TemplateTaskTest.php
@@ -121,15 +121,14 @@ public function testGenerateWithTemplateFallbacks() {
 		$this->Task->initialize();
 		$this->Task->params['template'] = 'test';
 		$this->Task->set(array(
-			'name' => 'Article',
-			'model' => 'Article',
+			'name' => 'Articles',
 			'table' => 'articles',
 			'import' => false,
 			'records' => false,
 			'schema' => '',
 			'namespace' => ''
 		));
 		$result = $this->Task->generate('classes', 'fixture');
-		$this->assertRegExp('/ArticleFixture extends .*TestFixture/', $result);
+		$this->assertRegExp('/ArticlesFixture extends .*TestFixture/', $result);
 	}
 }
diff --git a/tests/TestCase/TestSuite/TestFixtureTest.php b/tests/TestCase/TestSuite/TestFixtureTest.php
@@ -16,16 +16,17 @@
 
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
+use Cake\Log\Log;
 use Cake\Model\Model;
 use Cake\TestSuite\Fixture\TestFixture;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\ClassRegistry;
 
 /**
- * ArticleFixture class
+ * ArticlesFixture class
  *
  */
-class ArticleFixture extends TestFixture {
+class ArticlesFixture extends TestFixture {
 
 /**
  * Table property
@@ -61,10 +62,10 @@ class ArticleFixture extends TestFixture {
 }
 
 /**
- * StringFieldsTestFixture class
+ * StringsTestsFixture class
  *
  */
-class StringsTestFixture extends TestFixture {
+class StringsTestsFixture extends TestFixture {
 
 /**
  * Table property
@@ -99,10 +100,10 @@ class StringsTestFixture extends TestFixture {
 
 
 /**
- * ImportFixture class
+ * ImportsFixture class
  *
  */
-class ImportFixture extends TestFixture {
+class ImportsFixture extends TestFixture {
 
 /**
  * Import property
@@ -134,16 +135,36 @@ class TestFixtureTest extends TestCase {
  */
 	public $fixtures = ['core.posts'];
 
+/**
+ * Set up
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+		Log::reset();
+	}
+
+/**
+ * Tear down
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		Log::reset();
+	}
+
 /**
  * test initializing a static fixture
  *
  * @return void
  */
 	public function testInitStaticFixture() {
-		$Fixture = new ArticleFixture();
+		$Fixture = new ArticlesFixture();
 		$this->assertEquals('articles', $Fixture->table);
 
-		$Fixture = new ArticleFixture();
+		$Fixture = new ArticlesFixture();
 		$Fixture->table = null;
 		$Fixture->init();
 		$this->assertEquals('articles', $Fixture->table);
@@ -168,7 +189,7 @@ public function testInitStaticFixture() {
  * @return void
  */
 	public function testInitImport() {
-		$fixture = new ImportFixture();
+		$fixture = new ImportsFixture();
 		$fixture->fields = $fixture->records = null;
 		$fixture->import = [
 			'table' => 'posts',
@@ -192,7 +213,7 @@ public function testInitImport() {
  * @return void
  */
 	public function testCreate() {
-		$fixture = new ArticleFixture();
+		$fixture = new ArticlesFixture();
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$table = $this->getMock('Cake\Database\Schema\Table', [], ['articles']);
 		$table->expects($this->once())
@@ -215,7 +236,7 @@ public function testCreate() {
  * @return void
  */
 	public function testCreateError() {
-		$fixture = new ArticleFixture();
+		$fixture = new ArticlesFixture();
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$table = $this->getMock('Cake\Database\Schema\Table', [], ['articles']);
 		$table->expects($this->once())
@@ -233,7 +254,7 @@ public function testCreateError() {
  * @return void
  */
 	public function testInsert() {
-		$fixture = new ArticleFixture();
+		$fixture = new ArticlesFixture();
 
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$query = $this->getMock('Cake\Database\Query', [], [$db]);
@@ -284,7 +305,7 @@ public function testInsert() {
  * @return void
  */
 	public function testInsertImport() {
-		$fixture = new ImportFixture();
+		$fixture = new ImportsFixture();
 
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$query = $this->getMock('Cake\Database\Query', [], [$db]);
@@ -325,7 +346,7 @@ public function testInsertImport() {
  * @return void
  */
 	public function testInsertStrings() {
-		$fixture = new StringsTestFixture();
+		$fixture = new StringsTestsFixture();
 
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$query = $this->getMock('Cake\Database\Query', [], [$db]);
@@ -376,7 +397,7 @@ public function testInsertStrings() {
  * @return void
  */
 	public function testDrop() {
-		$fixture = new ArticleFixture();
+		$fixture = new ArticlesFixture();
 
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$statement = $this->getMock('\PDOStatement', ['closeCursor']);
@@ -401,7 +422,7 @@ public function testDrop() {
  * @return void
  */
 	public function testTruncate() {
-		$fixture = new ArticleFixture();
+		$fixture = new ArticlesFixture();
 
 		$db = $this->getMock('Cake\Database\Connection', [], [], '', false);
 		$statement = $this->getMock('\PDOStatement', ['closeCursor']);

diff --git a/tests/TestCase/Utility/StringTest.php b/tests/TestCase/Utility/StringTest.php
@@ -1425,7 +1425,7 @@ public function testparseFileSize($params, $expected) {
 	}
 
 /**
- * testFromReadableSize
+ * testparseFileSizeException
  *
  * @expectedException InvalidArgumentException
  * @return void