clean up

zendframework · Nov 29, 2013 · 9764cd3 · 9764cd3
1 parent 7170aa8
commit 9764cd3
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/test/File/Crc32Test.php b/test/File/Crc32Test.php
@@ -186,9 +186,9 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggeringError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
-        $validator = new File\Crc32('12345');
+        $validator = new File\Crc32();
 
         $this->assertFalse($validator->isValid(''));
         $this->assertArrayHasKey(File\Crc32::NOT_FOUND, $validator->getMessages());

diff --git a/test/File/ExcludeExtensionTest.php b/test/File/ExcludeExtensionTest.php
@@ -162,7 +162,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalse()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\ExcludeExtension('12345');
 

diff --git a/test/File/ExcludeMimeTypeTest.php b/test/File/ExcludeMimeTypeTest.php
@@ -131,9 +131,9 @@ public function testAddMimeType()
         $this->assertEquals(array('image/gif', 'text', 'jpg', 'to', 'zip', 'ti'), $validator->getMimeType(true));
     }
 
-    public function testEmptyFileArrayShouldReturnFalse()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
-        $validator = new ExcludeMimeType('image/gif');
+        $validator = new ExcludeMimeType();
 
         $this->assertFalse($validator->isValid(''));
         $this->assertArrayHasKey(ExcludeMimeType::NOT_READABLE, $validator->getMessages());

diff --git a/test/File/ExtensionTest.php b/test/File/ExtensionTest.php
@@ -165,7 +165,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalse()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\Extension('foo');
 

diff --git a/test/File/FilesSizeTest.php b/test/File/FilesSizeTest.php
@@ -184,7 +184,7 @@ public function errorHandler($errno, $errstr)
         }
     }
 
-    public function testEmptyFileArrayShouldReturnFalse()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\FilesSize(0);
 

diff --git a/test/File/HashTest.php b/test/File/HashTest.php
@@ -160,7 +160,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\Hash();
 

diff --git a/test/File/ImageSizeTest.php b/test/File/ImageSizeTest.php
@@ -264,7 +264,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\ImageSize();
 

diff --git a/test/File/Md5Test.php b/test/File/Md5Test.php
@@ -200,7 +200,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\Md5();
 

diff --git a/test/File/MimeTypeTest.php b/test/File/MimeTypeTest.php
@@ -222,7 +222,7 @@ public function testDisablingMagicFileByConstructor()
         $this->assertFalse($validator->getMagicFile());
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggeringFinfoWarning()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         if (! extension_loaded('fileinfo')) {
             $this->markTestSkipped('This PHP Version has no finfo installed');

diff --git a/test/File/Sha1Test.php b/test/File/Sha1Test.php
@@ -187,9 +187,9 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggeringError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
-        $validator = new File\Sha1('foo');
+        $validator = new File\Sha1();
 
         $this->assertFalse($validator->isValid(''));
         $this->assertArrayHasKey(File\Sha1::NOT_FOUND, $validator->getMessages());

diff --git a/test/File/SizeTest.php b/test/File/SizeTest.php
@@ -204,7 +204,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\Size();
 

diff --git a/test/File/UploadFileTest.php b/test/File/UploadFileTest.php
@@ -84,7 +84,7 @@ public function testZF11258()
         $this->assertContains("not found", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\UploadFile();
 

diff --git a/test/File/WordCountTest.php b/test/File/WordCountTest.php
@@ -137,7 +137,7 @@ public function testZF11258()
         $this->assertContains("does not exist", current($validator->getMessages()));
     }
 
-    public function testEmptyFileArrayShouldReturnFalseRatherThanTriggerError()
+    public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
     {
         $validator = new File\WordCount();
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,7 +184,7 @@ public function errorHandler($errno, $errstr) @@
             }
         }
-        public function testEmptyFileArrayShouldReturnFalse()
+        public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
         {
             $validator = new File\FilesSize(0);
@@ Expand Down @@