Merge pull request zendframework/zendframework#7476 from Maks3w/hotix/remove-evil-assertBoolean-not-boolean-values

[test] Remove evil assert boolean for not boolean values

Author: weierophinney

test/ClassFileLocatorTest.php

@@ -83,7 +83,7 @@ public function testIterationShouldInjectNamespacesInFileInfo()
         $locator = new ClassFileLocator(__DIR__);
         foreach ($locator as $file) {
             $namespaces = $file->getNamespaces();
-            $this->assertTrue(count($namespaces) > 0);
+            $this->assertNotEmpty($namespaces);
         }
     }
 

test/Transfer/Adapter/AbstractTest.php

@@ -68,7 +68,7 @@ public function testAdapterShouldAllowAddingValidatorViaPluginManager()
     {
         $this->adapter->addValidator('Count', false, array('min' => 1, 'max' => 1));
         $test = $this->adapter->getValidator('Count');
-        $this->assertTrue($test instanceof FileValidator\Count);
+        $this->assertInstanceOf('Zend\Validator\File\Count', $test);
     }
 
     public function testAdapterhShouldRaiseExceptionWhenAddingInvalidValidatorType()
@@ -90,16 +90,16 @@ public function testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothIns
         );
         $this->adapter->addValidators($validators);
         $test = $this->adapter->getValidators();
-        $this->assertTrue(is_array($test));
+        $this->assertInternalType('array', $test);
         $this->assertEquals(4, count($test), var_export($test, 1));
         $count = array_shift($test);
-        $this->assertTrue($count instanceof FileValidator\Count);
+        $this->assertInstanceOf('Zend\Validator\File\Count', $count);
         $exists = array_shift($test);
-        $this->assertTrue($exists instanceof FileValidator\Exists);
+        $this->assertInstanceOf('Zend\Validator\File\Exists', $exists);
         $size = array_shift($test);
-        $this->assertTrue($size instanceof FileValidator\Upload);
+        $this->assertInstanceOf('Zend\Validator\File\Upload', $size);
         $ext = array_shift($test);
-        $this->assertTrue($ext instanceof FileValidator\Extension);
+        $this->assertInstanceOf('Zend\Validator\File\Extension', $ext);
         $orig = array_pop($validators);
         $this->assertSame($orig, $ext);
     }
@@ -115,7 +115,7 @@ public function testAdapterShouldAllowPullingValidatorsByFile()
         $validators = $this->adapter->getValidators('foo');
         $this->assertEquals(1, count($validators));
         $validator = array_shift($validators);
-        $this->assertTrue($validator instanceof Validator\Between);
+        $this->assertInstanceOf('Zend\Validator\Between', $validator);
     }
 
     public function testCallingSetValidatorsOnAdapterShouldOverwriteExistingValidators()
@@ -134,24 +134,24 @@ public function testAdapterShouldAllowRetrievingValidatorInstancesByClassName()
     {
         $this->testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothInstancesAndPluginLoader();
         $ext = $this->adapter->getValidator('Zend\Validator\File\Extension');
-        $this->assertTrue($ext instanceof FileValidator\Extension);
+        $this->assertInstanceOf('Zend\Validator\File\Extension', $ext);
     }
 
     public function testAdapterShouldAllowRetrievingValidatorInstancesByPluginName()
     {
         $this->testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothInstancesAndPluginLoader();
         $count = $this->adapter->getValidator('Count');
-        $this->assertTrue($count instanceof FileValidator\Count);
+        $this->assertInstanceOf('Zend\Validator\File\Count', $count);
     }
 
     public function testAdapterShouldAllowRetrievingAllValidatorsAtOnce()
     {
         $this->testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothInstancesAndPluginLoader();
         $validators = $this->adapter->getValidators();
-        $this->assertTrue(is_array($validators));
+        $this->assertInternalType('array', $validators);
         $this->assertEquals(4, count($validators));
         foreach ($validators as $validator) {
-            $this->assertTrue($validator instanceof Validator\ValidatorInterface);
+            $this->assertInstanceOf('Zend\Validator\ValidatorInterface', $validator);
         }
     }
 
@@ -187,7 +187,7 @@ public function testAdapterShouldAllowRemovingAllValidatorsAtOnce()
         $this->testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothInstancesAndPluginLoader();
         $this->adapter->clearValidators();
         $validators = $this->adapter->getValidators();
-        $this->assertTrue(is_array($validators));
+        $this->assertInternalType('array', $validators);
         $this->assertEquals(0, count($validators));
     }
 
@@ -216,31 +216,31 @@ public function testValidationShouldThrowExceptionForNonexistentFile()
     public function testErrorMessagesShouldBeEmptyByDefault()
     {
         $messages = $this->adapter->getMessages();
-        $this->assertTrue(is_array($messages));
+        $this->assertInternalType('array', $messages);
         $this->assertEquals(0, count($messages));
     }
 
     public function testErrorMessagesShouldBePopulatedAfterInvalidTransfer()
     {
         $this->testValidationShouldReturnFalseForInvalidTransfer();
         $messages = $this->adapter->getMessages();
-        $this->assertTrue(is_array($messages));
-        $this->assertFalse(empty($messages));
+        $this->assertInternalType('array', $messages);
+        $this->assertNotEmpty($messages);
     }
 
     public function testErrorCodesShouldBeNullByDefault()
     {
         $errors = $this->adapter->getErrors();
-        $this->assertTrue(is_array($errors));
+        $this->assertInternalType('array', $errors);
         $this->assertEquals(0, count($errors));
     }
 
     public function testErrorCodesShouldBePopulatedAfterInvalidTransfer()
     {
         $this->testValidationShouldReturnFalseForInvalidTransfer();
         $errors = $this->adapter->getErrors();
-        $this->assertTrue(is_array($errors));
-        $this->assertFalse(empty($errors));
+        $this->assertInternalType('array', $errors);
+        $this->assertNotEmpty($errors);
     }
 
     public function testAdapterShouldLazyLoadFilterPluginManager()
@@ -261,7 +261,7 @@ public function testAdapterShouldAllowAddingFilterViaPluginManager()
     {
         $this->adapter->addFilter('StringTrim');
         $test = $this->adapter->getFilter('StringTrim');
-        $this->assertTrue($test instanceof Filter\StringTrim);
+        $this->assertInstanceOf('Zend\Filter\StringTrim', $test);
     }
 
 
@@ -283,12 +283,12 @@ public function testAdapterShouldAllowAddingMultipleFiltersAtOnceUsingBothInstan
         );
         $this->adapter->addFilters($filters);
         $test = $this->adapter->getFilters();
-        $this->assertTrue(is_array($test));
+        $this->assertInternalType('array', $test);
         $this->assertEquals(3, count($test), var_export($test, 1));
         $count = array_shift($test);
-        $this->assertTrue($count instanceof Word\SeparatorToCamelCase);
+        $this->assertInstanceOf('Zend\Filter\Word\SeparatorToCamelCase', $count);
         $size = array_shift($test);
-        $this->assertTrue($size instanceof Filter\Boolean);
+        $this->assertInstanceOf('Zend\Filter\Boolean', $size);
         $ext  = array_shift($test);
         $orig = array_pop($filters);
         $this->assertSame($orig, $ext);
@@ -305,7 +305,7 @@ public function testAdapterShouldAllowPullingFiltersByFile()
         $filters = $this->adapter->getFilters('foo');
         $this->assertEquals(1, count($filters));
         $filter = array_shift($filters);
-        $this->assertTrue($filter instanceof Filter\Boolean);
+        $this->assertInstanceOf('Zend\Filter\Boolean', $filter);
     }
 
     public function testCallingSetFiltersOnAdapterShouldOverwriteExistingFilters()
@@ -324,24 +324,24 @@ public function testAdapterShouldAllowRetrievingFilterInstancesByClassName()
     {
         $this->testAdapterShouldAllowAddingMultipleFiltersAtOnceUsingBothInstancesAndPluginLoader();
         $ext = $this->adapter->getFilter('Zend\Filter\BaseName');
-        $this->assertTrue($ext instanceof Filter\BaseName);
+        $this->assertInstanceOf('Zend\Filter\BaseName', $ext);
     }
 
     public function testAdapterShouldAllowRetrievingFilterInstancesByPluginName()
     {
         $this->testAdapterShouldAllowAddingMultipleFiltersAtOnceUsingBothInstancesAndPluginLoader();
         $count = $this->adapter->getFilter('Boolean');
-        $this->assertTrue($count instanceof Filter\Boolean);
+        $this->assertInstanceOf('Zend\Filter\Boolean', $count);
     }
 
     public function testAdapterShouldAllowRetrievingAllFiltersAtOnce()
     {
         $this->testAdapterShouldAllowAddingMultipleFiltersAtOnceUsingBothInstancesAndPluginLoader();
         $filters = $this->adapter->getFilters();
-        $this->assertTrue(is_array($filters));
+        $this->assertInternalType('array', $filters);
         $this->assertEquals(3, count($filters));
         foreach ($filters as $filter) {
-            $this->assertTrue($filter instanceof Filter\FilterInterface);
+            $this->assertInstanceOf('Zend\Filter\FilterInterface', $filter);
         }
     }
 
@@ -377,7 +377,7 @@ public function testAdapterShouldAllowRemovingAllFiltersAtOnce()
         $this->testAdapterShouldAllowAddingMultipleFiltersAtOnceUsingBothInstancesAndPluginLoader();
         $this->adapter->clearFilters();
         $filters = $this->adapter->getFilters();
-        $this->assertTrue(is_array($filters));
+        $this->assertInternalType('array', $filters);
         $this->assertEquals(0, count($filters));
     }
 
@@ -386,7 +386,7 @@ public function testTransferDestinationShouldBeMutable()
         $directory = __DIR__;
         $this->adapter->setDestination($directory);
         $destinations = $this->adapter->getDestination();
-        $this->assertTrue(is_array($destinations));
+        $this->assertInternalType('array', $destinations);
         foreach ($destinations as $file => $destination) {
             $this->assertEquals($directory, $destination);
         }
@@ -402,10 +402,10 @@ public function testAdapterShouldAllowRetrievingDestinationsForAnArrayOfSpecifie
     {
         $this->adapter->setDestination(__DIR__);
         $destinations = $this->adapter->getDestination(array('bar', 'baz'));
-        $this->assertTrue(is_array($destinations));
+        $this->assertInternalType('array', $destinations);
         $directory = __DIR__;
         foreach ($destinations as $file => $destination) {
-            $this->assertTrue(in_array($file, array('bar', 'baz')));
+            $this->assertContains($file, array('bar', 'baz'));
             $this->assertEquals($directory, $destination);
         }
     }
@@ -484,7 +484,7 @@ public function testAdapterShouldAllowRetrievingAllFileNames()
               . DIRECTORY_SEPARATOR . '_files';
         $this->adapter->setDestination($path);
         $files = $this->adapter->getFileName();
-        $this->assertTrue(is_array($files));
+        $this->assertInternalType('array', $files);
         $this->assertEquals($path . DIRECTORY_SEPARATOR . 'bar.png', $files['bar']);
     }
 
@@ -494,7 +494,7 @@ public function testAdapterShouldAllowRetrievingAllFileNamesWithoutPath()
               . DIRECTORY_SEPARATOR . '_files';
         $this->adapter->setDestination($path);
         $files = $this->adapter->getFileName(null, false);
-        $this->assertTrue(is_array($files));
+        $this->assertInternalType('array', $files);
         $this->assertEquals('bar.png', $files['bar']);
     }
 
@@ -514,13 +514,13 @@ public function testIgnoreHashValue()
     public function testEmptyTempDirectoryDetection()
     {
         $this->adapter->tmpDir = "";
-        $this->assertTrue(empty($this->adapter->tmpDir), "Empty temporary directory");
+        $this->assertEmpty($this->adapter->tmpDir, "Empty temporary directory");
     }
 
     public function testTempDirectoryDetection()
     {
         $this->adapter->getTmpDir();
-        $this->assertTrue(!empty($this->adapter->tmpDir), "Temporary directory filled");
+        $this->assertNotEmpty($this->adapter->tmpDir, "Temporary directory filled");
     }
 
     public function testTemporaryDirectoryAccessDetection()
@@ -592,7 +592,7 @@ public function testTransferDestinationAtNonExistingElement()
         $this->assertEquals($directory, $this->adapter->getDestination('nonexisting'));
 
         $this->setExpectedException('Zend\File\Transfer\Exception\InvalidArgumentException', 'not find');
-        $this->assertTrue(is_string($this->adapter->getDestination('reallynonexisting')));
+        $this->assertInternalType('string', $this->adapter->getDestination('reallynonexisting'));
     }
 
     /**
@@ -628,16 +628,16 @@ public function testAdapterShouldAllowAddingMultipleValidatorsAtOnceUsingBothIns
         $test = $this->adapter->getValidators('foo');
         $this->assertEquals(2, count($test));
         $mimeType = array_shift($test);
-        $this->assertTrue($mimeType instanceof FileValidator\MimeType);
+        $this->assertInstanceOf('Zend\Validator\File\MimeType', $mimeType);
         $filesSize = array_shift($test);
-        $this->assertTrue($filesSize instanceof FileValidator\FilesSize);
+        $this->assertInstanceOf('Zend\Validator\File\FilesSize', $filesSize);
 
         $test = $this->adapter->getValidators('bar');
         $this->assertEquals(2, count($test));
         $filesSize = array_shift($test);
-        $this->assertTrue($filesSize instanceof FileValidator\Count);
+        $this->assertInstanceOf('Zend\Validator\File\Count', $filesSize);
         $mimeType = array_shift($test);
-        $this->assertTrue($mimeType instanceof FileValidator\MimeType);
+        $this->assertInstanceOf('Zend\Validator\File\MimeType', $mimeType);
 
         $test = $this->adapter->getValidators('baz');
         $this->assertEquals(0, count($test));

test/Transfer/Adapter/HttpTest.php

@@ -64,7 +64,7 @@ public function testAutoSetUploadValidator()
         );
         $this->adapter->setValidators($validators);
         $test = $this->adapter->getValidator('Upload');
-        $this->assertTrue($test instanceof FileValidator\Upload);
+        $this->assertInstanceOf('Zend\Validator\File\Upload', $test);
     }
 
     public function testSendingFiles()
@@ -231,23 +231,23 @@ public function testUploadProgressAdapter()
         $adapter = new AdapterProgressBar\Console();
         $status = array('progress' => $adapter, 'session' => 'upload');
         $status = HttpTestMockAdapter::getProgress($status);
-        $this->assertTrue(array_key_exists('total', $status));
-        $this->assertTrue(array_key_exists('current', $status));
-        $this->assertTrue(array_key_exists('rate', $status));
-        $this->assertTrue(array_key_exists('id', $status));
-        $this->assertTrue(array_key_exists('message', $status));
-        $this->assertTrue(array_key_exists('progress', $status));
-        $this->assertTrue($status['progress'] instanceof ProgressBar\ProgressBar);
+        $this->assertArrayHasKey('total', $status);
+        $this->assertArrayHasKey('current', $status);
+        $this->assertArrayHasKey('rate', $status);
+        $this->assertArrayHasKey('id', $status);
+        $this->assertArrayHasKey('message', $status);
+        $this->assertArrayHasKey('progress', $status);
+        $this->assertInstanceOf('Zend\ProgressBar\ProgressBar', $status['progress']);
 
         $this->adapter->switchApcToUP();
         $status = HttpTestMockAdapter::getProgress($status);
-        $this->assertTrue(array_key_exists('total', $status));
-        $this->assertTrue(array_key_exists('current', $status));
-        $this->assertTrue(array_key_exists('rate', $status));
-        $this->assertTrue(array_key_exists('id', $status));
-        $this->assertTrue(array_key_exists('message', $status));
-        $this->assertTrue(array_key_exists('progress', $status));
-        $this->assertTrue($status['progress'] instanceof ProgressBar\ProgressBar);
+        $this->assertArrayHasKey('total', $status);
+        $this->assertArrayHasKey('current', $status);
+        $this->assertArrayHasKey('rate', $status);
+        $this->assertArrayHasKey('id', $status);
+        $this->assertArrayHasKey('message', $status);
+        $this->assertArrayHasKey('progress', $status);
+        $this->assertInstanceOf('Zend\ProgressBar\ProgressBar', $status['progress']);
     }
 
     public function testValidationOfPhpExtendsFormError()