[TASK] Shorten the extend class in all unit tests
[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Tests / Unit / Validation / Validator / DisjunctionValidatorTest.php
index a038394..9fb409a 100644 (file)
@@ -21,40 +21,29 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
 /**
  * Test case
  */
-class DisjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
+class DisjunctionValidatorTest extends UnitTestCase
 {
-    /**
-     * @test
-     */
-    public function allValidatorsInTheDisjunctionAreCalledEvenIfOneReturnsNoError()
-    {
-        $this->markTestSkipped('Needs a bugfix of Flow first.');
-        $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
-        $validatorObject->expects($this->once())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
-        $errors = new \TYPO3\CMS\Extbase\Error\Result();
-        $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
-        $secondValidatorObject->expects($this->exactly(1))->method('validate')->will($this->returnValue($errors));
-        $validatorDisjunction->addValidator($validatorObject);
-        $validatorDisjunction->addValidator($secondValidatorObject);
-        $validatorDisjunction->validate('some subject');
-    }
 
     /**
      * @test
      */
     public function validateReturnsNoErrorsIfOneValidatorReturnsNoError()
     {
-        $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator([]);
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(['validate', 'getOptions'])
+            ->getMock();
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $errors = new \TYPO3\CMS\Extbase\Error\Result();
         $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(['validate', 'getOptions'])
+            ->getMock();
         $secondValidatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors));
         $validatorDisjunction->addValidator($validatorObject);
         $validatorDisjunction->addValidator($secondValidatorObject);
@@ -66,19 +55,23 @@ class DisjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function validateReturnsAllErrorsIfAllValidatorsReturnErrrors()
     {
-        $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator(array());
+        $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator([]);
         $error1 = new \TYPO3\CMS\Extbase\Error\Error('Error', 123);
         $error2 = new \TYPO3\CMS\Extbase\Error\Error('Error2', 123);
         $errors1 = new \TYPO3\CMS\Extbase\Error\Result();
         $errors1->addError($error1);
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(['validate', 'getOptions'])
+            ->getMock();
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors1));
         $errors2 = new \TYPO3\CMS\Extbase\Error\Result();
         $errors2->addError($error2);
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(['validate', 'getOptions'])
+            ->getMock();
         $secondValidatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors2));
         $validatorDisjunction->addValidator($validatorObject);
         $validatorDisjunction->addValidator($secondValidatorObject);
-        $this->assertEquals(array($error1, $error2), $validatorDisjunction->validate('some subject')->getErrors());
+        $this->assertEquals([$error1, $error2], $validatorDisjunction->validate('some subject')->getErrors());
     }
 }