Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit ed43e42

Browse files
Maks3wMaks3w
committed
Print useful error messages for isValid assertions
1 parent da2bd8e commit ed43e42

File tree

6 files changed

+88
-21
lines changed

6 files changed

+88
-21
lines changed

‎test/ArrayInputTest.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ public function testValidationOperatesOnFilteredValue()
7474
$this->input->getFilterChain()->attach($filter);
7575
$validator = new Validator\Digits();
7676
$this->input->getValidatorChain()->attach($validator);
77-
$this->assertTrue($this->input->isValid());
77+
$this->assertTrue(
78+
$this->input->isValid(),
79+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
80+
);
7881
}
7982

8083
public function testSpecifyingMessagesToInputReturnsThoseOnFailedValidation()
@@ -162,7 +165,10 @@ public function testNotAllowEmptyWithFilterConvertsEmptyToNonEmptyIsValid()
162165
->getFilterChain()->attach(new Filter\Callback(function () {
163166
return 'nonempty';
164167
}));
165-
$this->assertTrue($this->input->isValid());
168+
$this->assertTrue(
169+
$this->input->isValid(),
170+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
171+
);
166172
}
167173

168174
public function testMerge($sourceRawValue = 'bazRawValue')

‎test/BaseInputFilterTest.php‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,10 @@ public function testValidationSkipsFieldsMarkedNotRequiredWhenNoDataPresent()
524524

525525
$filter->setData($data);
526526

527-
$this->assertTrue($filter->isValid(), json_encode($filter->getMessages()));
527+
$this->assertTrue(
528+
$filter->isValid(),
529+
'isValid() value not match. Detail . ' . json_encode($filter->getMessages())
530+
);
528531
$this->assertArrayNotHasKey(
529532
$optionalInputName,
530533
$filter->getValidInput(),
@@ -649,7 +652,10 @@ public function testIsValidWhenValuesSetOnFilters()
649652

650653
//test invalid with setData
651654
$filter->setData(['foo' => 'thisisavalidstring']);
652-
$this->assertTrue($filter->isValid());
655+
$this->assertTrue(
656+
$filter->isValid(),
657+
'isValid() value not match. Detail . ' . json_encode($filter->getMessages())
658+
);
653659

654660
//test invalid when setting data on actual filter
655661
$filter->get('foo')->setValue('invalid');
@@ -658,8 +664,18 @@ public function testIsValidWhenValuesSetOnFilters()
658664

659665
//test valid when setting data on actual filter
660666
$filter->get('foo')->setValue('thisisavalidstring');
661-
$this->assertTrue($filter->get('foo')->isValid(), 'Filtered value is not valid');
662-
$this->assertTrue($filter->isValid(), 'Input filter did return value from filter');
667+
$this->assertTrue(
668+
$filter->get('foo')
669+
->isValid(),
670+
'Filtered value is not valid. Detail . ' . json_encode(
671+
$filter->get('foo')
672+
->getMessages()
673+
)
674+
);
675+
$this->assertTrue(
676+
$filter->isValid(),
677+
'Input filter did return value from filter. Detail . ' . json_encode($filter->getMessages())
678+
);
663679
}
664680

665681
/**

‎test/CollectionInputFilterTest.php‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,10 @@ public function testCanValidateValidData()
195195

196196
$this->filter->setInputFilter($this->getBaseInputFilter());
197197
$this->filter->setData($this->getValidCollectionData());
198-
$this->assertTrue($this->filter->isValid());
198+
$this->assertTrue(
199+
$this->filter->isValid(),
200+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
201+
);
199202
}
200203

201204
public function testCanValidateValidDataWithNonConsecutiveKeys()
@@ -209,7 +212,10 @@ public function testCanValidateValidDataWithNonConsecutiveKeys()
209212
unset($collectionData[0]);
210213
$this->filter->setInputFilter($this->getBaseInputFilter());
211214
$this->filter->setData($collectionData);
212-
$this->assertTrue($this->filter->isValid());
215+
$this->assertTrue(
216+
$this->filter->isValid(),
217+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
218+
);
213219
}
214220

215221
public function testInvalidDataReturnsFalse()
@@ -293,7 +299,10 @@ public function testGetValues()
293299
$this->filter->setInputFilter($this->getBaseInputFilter());
294300
$this->filter->setData($this->getValidCollectionData());
295301

296-
$this->assertTrue($this->filter->isValid());
302+
$this->assertTrue(
303+
$this->filter->isValid(),
304+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
305+
);
297306
$this->assertEquals($expectedData, $this->filter->getValues());
298307

299308
$this->assertCount(2, $this->filter->getValidInput());
@@ -334,7 +343,10 @@ public function testGetRawValues()
334343
$this->filter->setInputFilter($this->getBaseInputFilter());
335344
$this->filter->setData($this->getValidCollectionData());
336345

337-
$this->assertTrue($this->filter->isValid());
346+
$this->assertTrue(
347+
$this->filter->isValid(),
348+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
349+
);
338350
$this->assertEquals($expectedData, $this->filter->getRawValues());
339351
}
340352

@@ -440,7 +452,10 @@ public function testSetValidationGroupUsingFormStyle()
440452
$this->filter->setData($data);
441453
$this->filter->setValidationGroup($formValidationGroup);
442454

443-
$this->assertTrue($this->filter->isValid());
455+
$this->assertTrue(
456+
$this->filter->isValid(),
457+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
458+
);
444459
}
445460

446461
public function testEmptyCollectionIsValidByDefault()
@@ -454,7 +469,10 @@ public function testEmptyCollectionIsValidByDefault()
454469
$this->filter->setInputFilter($this->getBaseInputFilter());
455470
$this->filter->setData($data);
456471

457-
$this->assertTrue($this->filter->isValid());
472+
$this->assertTrue(
473+
$this->filter->isValid(),
474+
'isValid() value not match. Detail . ' . json_encode($this->filter->getMessages())
475+
);
458476
}
459477

460478
public function testEmptyCollectionIsNotValidIfRequired()

‎test/FileInputTest.php‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ function ($value) use ($filterMock) {
6565
);
6666

6767
$this->assertEquals($value, $this->input->getValue());
68-
$this->assertTrue($this->input->isValid());
68+
$this->assertTrue(
69+
$this->input->isValid(),
70+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
71+
);
6972
$this->assertEquals($newValue, $this->input->getValue());
7073
}
7174

@@ -97,7 +100,10 @@ function ($value) use ($filterMock) {
97100
);
98101

99102
$this->assertEquals($values, $this->input->getValue());
100-
$this->assertTrue($this->input->isValid());
103+
$this->assertTrue(
104+
$this->input->isValid(),
105+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
106+
);
101107
$this->assertEquals(
102108
[$newValue, $newValue, $newValue],
103109
$this->input->getValue()
@@ -158,7 +164,10 @@ function ($value) use ($filterMock) {
158164
'error' => 0,
159165
];
160166
$this->input->setValue($goodValue);
161-
$this->assertTrue($this->input->isValid());
167+
$this->assertTrue(
168+
$this->input->isValid(),
169+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
170+
);
162171
$this->assertEquals($filteredValue, $this->input->getValue());
163172
}
164173

@@ -195,7 +204,10 @@ public function testCanValidateArrayOfMultiFileData()
195204
$this->input->setValue($values);
196205
$validator = new Validator\File\Exists();
197206
$this->input->getValidatorChain()->attach($validator);
198-
$this->assertTrue($this->input->isValid());
207+
$this->assertTrue(
208+
$this->input->isValid(),
209+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
210+
);
199211

200212
// Negative test
201213
$values[1]['tmp_name'] = 'file-not-found';
@@ -249,7 +261,10 @@ public function testUploadValidatorIsNotAddedWhenIsValidIsCalled()
249261
$validatorChain = $this->input->getValidatorChain();
250262
$this->assertEquals(0, count($validatorChain->getValidators()));
251263

252-
$this->assertTrue($this->input->isValid());
264+
$this->assertTrue(
265+
$this->input->isValid(),
266+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
267+
);
253268
$this->assertEquals(0, count($validatorChain->getValidators()));
254269
}
255270

@@ -268,7 +283,10 @@ public function testRequiredUploadValidatorValidatorNotAddedWhenOneExists()
268283

269284
$validatorChain = $this->input->getValidatorChain();
270285
$validatorChain->prependValidator($uploadMock);
271-
$this->assertTrue($this->input->isValid());
286+
$this->assertTrue(
287+
$this->input->isValid(),
288+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
289+
);
272290

273291
$validators = $validatorChain->getValidators();
274292
$this->assertEquals(1, count($validators));

‎test/InputFilterTest.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ public function testGetValueReturnsArrayIfNestedInputFilters()
6262
];
6363

6464
$this->inputFilter->setData($data);
65-
$this->assertTrue($this->inputFilter->isValid());
65+
$this->assertTrue(
66+
$this->inputFilter->isValid(),
67+
'isValid() value not match. Detail . ' . json_encode($this->inputFilter->getMessages())
68+
);
6669

6770
$this->assertInternalType('array', $this->inputFilter->getValue('people'));
6871
}

‎test/InputTest.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ public function testValidationOperatesOnFilteredValue()
239239
$this->input->getFilterChain()->attach($filter);
240240
$validator = new Validator\Digits();
241241
$this->input->getValidatorChain()->attach($validator);
242-
$this->assertTrue($this->input->isValid());
242+
$this->assertTrue(
243+
$this->input->isValid(),
244+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
245+
);
243246
}
244247

245248
public function testSpecifyingMessagesToInputReturnsThoseOnFailedValidation()
@@ -317,7 +320,10 @@ public function testNotAllowEmptyWithFilterConvertsEmptyToNonEmptyIsValid()
317320
->getFilterChain()->attach(new Filter\Callback(function () {
318321
return 'nonempty';
319322
}));
320-
$this->assertTrue($this->input->isValid());
323+
$this->assertTrue(
324+
$this->input->isValid(),
325+
'isValid() value not match. Detail . ' . json_encode($this->input->getMessages())
326+
);
321327
}
322328

323329
public function testDoNotInjectNotEmptyValidatorIfAnywhereInChain()

0 commit comments

Comments
 (0)