Print useful error messages for isValid assertions

zendframework · Sep 3, 2015 · ed43e42 · ed43e42
1 parent da2bd8e
commit ed43e42
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 21 deletions.
diff --git a/test/ArrayInputTest.php b/test/ArrayInputTest.php
@@ -74,7 +74,10 @@ public function testValidationOperatesOnFilteredValue()
         $this->input->getFilterChain()->attach($filter);
         $validator = new Validator\Digits();
         $this->input->getValidatorChain()->attach($validator);
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
     }
 
     public function testSpecifyingMessagesToInputReturnsThoseOnFailedValidation()
@@ -162,7 +165,10 @@ public function testNotAllowEmptyWithFilterConvertsEmptyToNonEmptyIsValid()
                     ->getFilterChain()->attach(new Filter\Callback(function () {
                         return 'nonempty';
                     }));
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
     }
 
     public function testMerge($sourceRawValue = 'bazRawValue')

diff --git a/test/BaseInputFilterTest.php b/test/BaseInputFilterTest.php
@@ -524,7 +524,10 @@ public function testValidationSkipsFieldsMarkedNotRequiredWhenNoDataPresent()
 
         $filter->setData($data);
 
-        $this->assertTrue($filter->isValid(), json_encode($filter->getMessages()));
+        $this->assertTrue(
+            $filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($filter->getMessages())
+        );
         $this->assertArrayNotHasKey(
             $optionalInputName,
             $filter->getValidInput(),
@@ -649,7 +652,10 @@ public function testIsValidWhenValuesSetOnFilters()
 
         //test invalid with setData
         $filter->setData(['foo' => 'thisisavalidstring']);
-        $this->assertTrue($filter->isValid());
+        $this->assertTrue(
+            $filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($filter->getMessages())
+        );
 
         //test invalid when setting data on actual filter
         $filter->get('foo')->setValue('invalid');
@@ -658,8 +664,18 @@ public function testIsValidWhenValuesSetOnFilters()
 
         //test valid when setting data on actual filter
         $filter->get('foo')->setValue('thisisavalidstring');
-        $this->assertTrue($filter->get('foo')->isValid(), 'Filtered value is not valid');
-        $this->assertTrue($filter->isValid(), 'Input filter did return value from filter');
+        $this->assertTrue(
+            $filter->get('foo')
+                ->isValid(),
+            'Filtered value is not valid. Detail . ' . json_encode(
+                $filter->get('foo')
+                    ->getMessages()
+            )
+        );
+        $this->assertTrue(
+            $filter->isValid(),
+            'Input filter did return value from filter. Detail . ' . json_encode($filter->getMessages())
+        );
     }
 
     /**

diff --git a/test/CollectionInputFilterTest.php b/test/CollectionInputFilterTest.php
@@ -195,7 +195,10 @@ public function testCanValidateValidData()
 
         $this->filter->setInputFilter($this->getBaseInputFilter());
         $this->filter->setData($this->getValidCollectionData());
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
     }
 
     public function testCanValidateValidDataWithNonConsecutiveKeys()
@@ -209,7 +212,10 @@ public function testCanValidateValidDataWithNonConsecutiveKeys()
         unset($collectionData[0]);
         $this->filter->setInputFilter($this->getBaseInputFilter());
         $this->filter->setData($collectionData);
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
     }
 
     public function testInvalidDataReturnsFalse()
@@ -293,7 +299,10 @@ public function testGetValues()
         $this->filter->setInputFilter($this->getBaseInputFilter());
         $this->filter->setData($this->getValidCollectionData());
 
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
         $this->assertEquals($expectedData, $this->filter->getValues());
 
         $this->assertCount(2, $this->filter->getValidInput());
@@ -334,7 +343,10 @@ public function testGetRawValues()
         $this->filter->setInputFilter($this->getBaseInputFilter());
         $this->filter->setData($this->getValidCollectionData());
 
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
         $this->assertEquals($expectedData, $this->filter->getRawValues());
     }
 
@@ -440,7 +452,10 @@ public function testSetValidationGroupUsingFormStyle()
         $this->filter->setData($data);
         $this->filter->setValidationGroup($formValidationGroup);
 
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
     }
 
     public function testEmptyCollectionIsValidByDefault()
@@ -454,7 +469,10 @@ public function testEmptyCollectionIsValidByDefault()
         $this->filter->setInputFilter($this->getBaseInputFilter());
         $this->filter->setData($data);
 
-        $this->assertTrue($this->filter->isValid());
+        $this->assertTrue(
+            $this->filter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
+        );
     }
 
     public function testEmptyCollectionIsNotValidIfRequired()

diff --git a/test/FileInputTest.php b/test/FileInputTest.php
@@ -65,7 +65,10 @@ function ($value) use ($filterMock) {
         );
 
         $this->assertEquals($value, $this->input->getValue());
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
         $this->assertEquals($newValue, $this->input->getValue());
     }
 
@@ -97,7 +100,10 @@ function ($value) use ($filterMock) {
         );
 
         $this->assertEquals($values, $this->input->getValue());
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
         $this->assertEquals(
             [$newValue, $newValue, $newValue],
             $this->input->getValue()
@@ -158,7 +164,10 @@ function ($value) use ($filterMock) {
             'error'    => 0,
         ];
         $this->input->setValue($goodValue);
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
         $this->assertEquals($filteredValue, $this->input->getValue());
     }
 
@@ -195,7 +204,10 @@ public function testCanValidateArrayOfMultiFileData()
         $this->input->setValue($values);
         $validator = new Validator\File\Exists();
         $this->input->getValidatorChain()->attach($validator);
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
 
         // Negative test
         $values[1]['tmp_name'] = 'file-not-found';
@@ -249,7 +261,10 @@ public function testUploadValidatorIsNotAddedWhenIsValidIsCalled()
         $validatorChain = $this->input->getValidatorChain();
         $this->assertEquals(0, count($validatorChain->getValidators()));
 
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
         $this->assertEquals(0, count($validatorChain->getValidators()));
     }
 
@@ -268,7 +283,10 @@ public function testRequiredUploadValidatorValidatorNotAddedWhenOneExists()
 
         $validatorChain = $this->input->getValidatorChain();
         $validatorChain->prependValidator($uploadMock);
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
 
         $validators = $validatorChain->getValidators();
         $this->assertEquals(1, count($validators));

diff --git a/test/InputFilterTest.php b/test/InputFilterTest.php
@@ -62,7 +62,10 @@ public function testGetValueReturnsArrayIfNestedInputFilters()
         ];
 
         $this->inputFilter->setData($data);
-        $this->assertTrue($this->inputFilter->isValid());
+        $this->assertTrue(
+            $this->inputFilter->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->inputFilter->getMessages())
+        );
 
         $this->assertInternalType('array', $this->inputFilter->getValue('people'));
     }

diff --git a/test/InputTest.php b/test/InputTest.php
@@ -239,7 +239,10 @@ public function testValidationOperatesOnFilteredValue()
         $this->input->getFilterChain()->attach($filter);
         $validator = new Validator\Digits();
         $this->input->getValidatorChain()->attach($validator);
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
     }
 
     public function testSpecifyingMessagesToInputReturnsThoseOnFailedValidation()
@@ -317,7 +320,10 @@ public function testNotAllowEmptyWithFilterConvertsEmptyToNonEmptyIsValid()
                     ->getFilterChain()->attach(new Filter\Callback(function () {
                         return 'nonempty';
                     }));
-        $this->assertTrue($this->input->isValid());
+        $this->assertTrue(
+            $this->input->isValid(),
+            'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
+        );
     }
 
     public function testDoNotInjectNotEmptyValidatorIfAnywhereInChain()