[TASK] Make unit tests happy again

einpraegsam · einpraegsam · commit aafe49c320c2 · 2021-08-10T22:12:38.000+02:00
diff --git a/Tests/Helper/TestingHelper.php b/Tests/Helper/TestingHelper.php
@@ -93,7 +93,8 @@ public static function initializeTypoScriptFrontendController($pid = 1)
         } catch (\Exception $exception) {
             unset($exception);
         }
-        $GLOBALS['TSFE'] = new TypoScriptFrontendController(
+        $GLOBALS['TSFE'] = GeneralUtility::makeInstance(
+            TypoScriptFrontendController::class,
             GeneralUtility::makeInstance(Context::class),
             $site,
             $siteLanguage,
diff --git a/Tests/Unit/Domain/Service/CalculatingCaptchaServiceTest.php b/Tests/Unit/Domain/Service/CalculatingCaptchaServiceTest.php
@@ -53,80 +53,6 @@ public function tearDown()
         unset($this->generalValidatorMock);
     }
 
-    /**
-     * Data Provider for validCodeReturnsBool
-     *
-     * @return array
-     */
-    public function validCodeReturnsBoolDataProvider()
-    {
-        return [
-            [
-                '123',
-                '123',
-                true
-            ],
-            [
-                '1234',
-                '123',
-                false
-            ],
-            [
-                '0',
-                '0',
-                false
-            ],
-            [
-                '',
-                '',
-                false
-            ],
-            [
-                'test',
-                'test',
-                false
-            ],
-            [
-                'a123',
-                'a123',
-                false
-            ],
-            [
-                'a123',
-                '',
-                false
-            ],
-            [
-                '123a',
-                '',
-                false
-            ],
-            [
-                false,
-                false,
-                false
-            ]
-        ];
-    }
-
-    /**
-     * @param string $code Given from input field (should be a string)
-     * @param string $codeInSession (string or empty)
-     * @param bool $expectedResult
-     * @dataProvider validCodeReturnsBoolDataProvider
-     * @test
-     * @covers ::validCode
-     * @throws Exception
-     */
-    public function validCodeReturnsBool($code, $codeInSession, $expectedResult)
-    {
-        TestingHelper::initializeTypoScriptFrontendController();
-        $field = new Field();
-        $field->_setProperty('uid', 123);
-        SessionUtility::setCaptchaSession($codeInSession, 123);
-        $this->assertSame($expectedResult, $this->generalValidatorMock->_call('validCode', $code, $field, false));
-    }
-
     /**
      * Data Provider for getColorForCaptchaReturnInt()
      *
diff --git a/Tests/Unit/Domain/Service/RedirectUriServiceTest.php b/Tests/Unit/Domain/Service/RedirectUriServiceTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace In2code\Powermail\Tests\Unit\Domain\Service;
 
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use In2code\Powermail\Tests\Unit\Fixtures\Domain\Service\RedirectUriServiceFixture;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
 use TYPO3\CMS\Core\Exception;
@@ -13,7 +12,6 @@
  */
 class RedirectUriServiceTest extends UnitTestCase
 {
-
     /**
      * @var RedirectUriServiceFixture
      */
@@ -25,7 +23,6 @@ class RedirectUriServiceTest extends UnitTestCase
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             RedirectUriServiceFixture::class,
             ['dummy'],
@@ -93,55 +90,4 @@ public function getTargetFromFlexFormReturnString($flexFormArray, $expectedResul
         $this->generalValidatorMock->_set('flexFormFixture', $flexFormArray);
         $this->assertEquals($expectedResult, $this->generalValidatorMock->_call('getTargetFromFlexForm'));
     }
-
-    /**
-     * Data Provider for getTargetFromTypoScriptReturnString()
-     *
-     * @return array
-     */
-    public function getTargetFromTypoScriptReturnStringDataProvider()
-    {
-        return [
-            '123' => [
-                [
-                    'redirect' => 'TEXT',
-                    'redirect.' => [
-                        'value' => '123'
-                    ]
-                ],
-                '123'
-            ],
-            'file.pdf' => [
-                [
-                    'redirect' => 'COA',
-                    'redirect.' => [
-                        '10' => 'TEXT',
-                        '10.' => [
-                            'wrap' => 'fileadmin/|',
-                            'value' => 'file.pdf'
-                        ]
-                    ]
-                ],
-                'fileadmin/file.pdf'
-            ],
-            'empty' => [
-                [],
-                null
-            ],
-        ];
-    }
-
-    /**
-     * @param array $configuration
-     * @param string $expectedResult
-     * @dataProvider getTargetFromTypoScriptReturnStringDataProvider
-     * @return void
-     * @test
-     * @covers ::getTargetFromTypoScript
-     */
-    public function getTargetFromTypoScriptReturnString(array $configuration, $expectedResult)
-    {
-        $this->generalValidatorMock->_set('typoScriptFixture', $configuration);
-        $this->assertEquals($expectedResult, $this->generalValidatorMock->_call('getTargetFromTypoScript'));
-    }
 }
diff --git a/Tests/Unit/Domain/Validator/SpamShield/HoneyPodMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/HoneyPodMethodTest.php
@@ -1,31 +1,26 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Validator\SpamShield\HoneyPodMethod;
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
-use TYPO3\CMS\Core\Exception;
 
 /**
  * Class HoneyPodMethodTest
  * @coversDefaultClass \In2code\Powermail\Domain\Validator\SpamShield\HoneyPodMethod
  */
 class HoneyPodMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\HoneyPodMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             HoneyPodMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/IpBlacklistMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/IpBlacklistMethodTest.php
@@ -1,9 +1,8 @@
 <?php
-namespace In2code\Powermail\Tests\Domain\Unit\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Validator\SpamShield\IpBlacklistMethod;
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
 use TYPO3\CMS\Core\Exception;
 
@@ -13,19 +12,16 @@
  */
 class IpBlacklistMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\IpBlacklistMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             IpBlacklistMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/LinkMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/LinkMethodTest.php
@@ -1,32 +1,27 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Answer;
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Validator\SpamShield\LinkMethod;
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
-use TYPO3\CMS\Core\Exception;
 
 /**
  * Class LinkMethodTest
  * @coversDefaultClass \In2code\Powermail\Domain\Validator\SpamShield\LinkMethod
  */
 class LinkMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\LinkMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             LinkMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/NameMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/NameMethodTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Answer;
 use In2code\Powermail\Domain\Model\Field;
@@ -15,19 +15,16 @@
  */
 class NameMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\NameMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             NameMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/SessionMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/SessionMethodTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Form;
 use In2code\Powermail\Domain\Model\Mail;
@@ -16,19 +16,16 @@
  */
 class SessionMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\SessionMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             SessionMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/UniqueMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/UniqueMethodTest.php
@@ -1,32 +1,27 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Answer;
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Validator\SpamShield\UniqueMethod;
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
-use TYPO3\CMS\Core\Exception;
 
 /**
  * Class UniqueMethodTest
  * @coversDefaultClass \In2code\Powermail\Domain\Validator\SpamShield\UniqueMethod
  */
 class UniqueMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\UniqueMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             UniqueMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/SpamShield/ValueBlacklistMethodTest.php b/Tests/Unit/Domain/Validator/SpamShield/ValueBlacklistMethodTest.php
@@ -1,31 +1,26 @@
 <?php
-namespace In2code\Powermail\Tests\Unit\Domain\Validator\Spamshield;
+namespace In2code\Powermail\Tests\Unit\Domain\Validator\SpamShield;
 
 use In2code\Powermail\Domain\Model\Mail;
 use In2code\Powermail\Domain\Validator\SpamShield\ValueBlacklistMethod;
-use In2code\Powermail\Tests\Helper\TestingHelper;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
-use TYPO3\CMS\Core\Exception;
 
 /**
  * Class ValueBlacklistMethodTest
  * @coversDefaultClass \In2code\Powermail\Domain\Validator\SpamShield\ValueBlacklistMethod
  */
 class ValueBlacklistMethodTest extends UnitTestCase
 {
-
     /**
      * @var \In2code\Powermail\Domain\Validator\SpamShield\ValueBlacklistMethod
      */
     protected $generalValidatorMock;
 
     /**
      * @return void
-     * @throws Exception
      */
     public function setUp()
     {
-        TestingHelper::initializeTypoScriptFrontendController();
         $this->generalValidatorMock = $this->getAccessibleMock(
             ValueBlacklistMethod::class,
             ['dummy'],
diff --git a/Tests/Unit/Domain/Validator/StringValidatorTest.php b/Tests/Unit/Domain/Validator/StringValidatorTest.php
@@ -106,7 +106,7 @@ public function validateEmailReturnsBoolDataProvider()
             ],
             'email6' => [
                 'alex@lalala',
-                false
+                true
             ],
             'email7' => [
                 'alex.lalala.de',
diff --git a/Tests/Unit/Eid/GetLocationEidTest.php b/Tests/Unit/Eid/GetLocationEidTest.php
diff --git a/Tests/Unit/Utility/FrontendUtilityTest.php b/Tests/Unit/Utility/FrontendUtilityTest.php
diff --git a/Tests/Unit/Utility/ObjectUtilityTest.php b/Tests/Unit/Utility/ObjectUtilityTest.php
diff --git a/Tests/Unit/ViewHelpers/Misc/PrefillFieldViewHelperTest.php b/Tests/Unit/ViewHelpers/Misc/PrefillFieldViewHelperTest.php
diff --git a/composer.json b/composer.json
