[core] Cleanup some tests. (#1587)

phingofficial · Apr 24, 2021 · a2dce01 · a2dce01
1 parent 1152fcf
commit a2dce01
Show file tree

Hide file tree

Showing 233 changed files with 1,236 additions and 1,231 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,7 +68,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: pdo_sqlite,pdo_mysql
+          extensions: pdo_sqlite,pdo_mysql,sockets,xsl
 
       - uses: ramsey/composer-install@v1
         with:

diff --git a/composer.json b/composer.json
@@ -81,8 +81,13 @@
     "require-dev": {
         "ext-curl": "*",
         "ext-iconv": "*",
+        "ext-openssl": "*",
         "ext-pdo_sqlite": "*",
+        "ext-phar": "*",
         "ext-simplexml": "*",
+        "ext-sockets": "*",
+        "ext-xsl": "*",
+        "ext-zip":  "*",
         "roave/security-advisories": "dev-master",
         "aws/aws-sdk-php": "^3.112",
         "friendsofphp/php-cs-fixer": "^2.18",

diff --git a/composer.lock b/composer.lock
diff --git a/custom.task.properties b/custom.task.properties
@@ -87,7 +87,6 @@ ssh=Phing\Task\Ext\SshTask
 scp=Phing\Task\Ext\ScpTask
 phpunit=Phing\Task\Ext\PHPUnitTask
 phpunitreport=Phing\Task\Ext\PHPUnitReportTask
-visualizer=Phing\Task\Ext\VisualizerTask
 svnlastrevision=Phing\Tasks\Ext\SvnLastRevisionTask
 svncheckout=Phing\Tasks\Ext\SvnCheckoutTask
 svnexport=Phing\Tasks\Ext\SvnExportTask
@@ -102,3 +101,4 @@ svnproplist=Phing\Tasks\Ext\SvnProplistTask
 svnpropget=Phing\Tasks\Ext\SvnPropgetTask
 svnpropset=Phing\Tasks\Ext\SvnPropsetTask
 svnrevert=Phing\Tasks\Ext\SvnRevertTask
+visualizer=Phing\Task\Ext\VisualizerTask
diff --git a/tests/Phing/ExtensionPointTest.php b/tests/Phing/ExtensionPointTest.php
@@ -39,17 +39,17 @@ public function setUp(): void
         );
     }
 
-    public function testExtensionPointWorksLikeTarget()
+    public function testExtensionPointWorksLikeTarget(): void
     {
         $this->expectLogContaining(__FUNCTION__, 'foobar');
     }
 
-    public function testAddToExtensionPoint()
+    public function testAddToExtensionPoint(): void
     {
         $this->expectLogContaining(__FUNCTION__, 'In target bar');
     }
 
-    public function testExtensionPointMustBeEmpty()
+    public function testExtensionPointMustBeEmpty(): void
     {
         $this->expectNotToPerformAssertions();
 
@@ -60,39 +60,39 @@ public function testExtensionPointMustBeEmpty()
         }
     }
 
-    public function testCantAddToPlainTarget()
+    public function testCantAddToPlainTarget(): void
     {
         $this->expectBuildException(__FUNCTION__, 'referenced target foo is not an extension-point');
     }
 
-    public function testExtensionPointInImportedBuildfile()
+    public function testExtensionPointInImportedBuildfile(): void
     {
         $this->expectLogContaining(__FUNCTION__, 'in target prepare');
     }
 
-    public function testExtensionPointInImportedBuildfileWithNestedImport()
+    public function testExtensionPointInImportedBuildfileWithNestedImport(): void
     {
         $this->expectLogContaining(__FUNCTION__, 'in compile java');
     }
 
-    public function testMissingExtensionPointCausesError()
+    public function testMissingExtensionPointCausesError(): void
     {
         $this->expectBuildException(__FUNCTION__, 'can\'t add target bar to extension-point foo because the extension-point is unknown');
     }
 
-    public function testMissingExtensionPointCausesWarningWhenConfigured()
+    public function testMissingExtensionPointCausesWarningWhenConfigured(): void
     {
         $this->executeTarget(__FUNCTION__);
         $this->assertInLogs('can\'t add target bar to extension-point foo because the extension-point is unknown', Project::MSG_WARN);
     }
 
-    public function testMissingExtensionPointIgnoredWhenConfigured()
+    public function testMissingExtensionPointIgnoredWhenConfigured(): void
     {
         $this->executeTarget(__FUNCTION__);
         $this->assertNotInLogs('can\'t add target bar to extension-point foo because the extension-point is unknown', Project::MSG_WARN);
     }
 
-    public function testOnlyAllowsExtensionPointMissingAttributeWhenExtensionOfPresent()
+    public function testOnlyAllowsExtensionPointMissingAttributeWhenExtensionOfPresent(): void
     {
         $this->expectBuildException(__FUNCTION__, 'onMissingExtensionPoint attribute cannot be specified unless extensionOf is specified');
     }

diff --git a/tests/Phing/Filter/ClassConstantsTest.php b/tests/Phing/Filter/ClassConstantsTest.php
@@ -38,7 +38,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testClassConstants()
+    public function testClassConstants(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/ConcatFilterTest.php b/tests/Phing/Filter/ConcatFilterTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testConcatFilter()
+    public function testConcatFilter(): void
     {
         $this->executeTarget('testConcatFilter');
 

diff --git a/tests/Phing/Filter/EscapeUnicodeTest.php b/tests/Phing/Filter/EscapeUnicodeTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testEscapeUnicode()
+    public function testEscapeUnicode(): void
     {
         $this->executeTarget('testEscapeUnicode');
 

diff --git a/tests/Phing/Filter/ExpandPropertiesTest.php b/tests/Phing/Filter/ExpandPropertiesTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testExpandProperties()
+    public function testExpandProperties(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/HeadFilterTest.php b/tests/Phing/Filter/HeadFilterTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testHeadFilter()
+    public function testHeadFilter(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/LineContainsRegexpTest.php b/tests/Phing/Filter/LineContainsRegexpTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testLineContainsRegexp()
+    public function testLineContainsRegexp(): void
     {
         $this->executeTarget(__FUNCTION__);
 
@@ -50,7 +50,7 @@ public function testLineContainsRegexp()
         $this->assertTrue($this->fu->contentEquals($expected, $result), "Files don't match!");
     }
 
-    public function testLineContainsRegexpNegate()
+    public function testLineContainsRegexpNegate(): void
     {
         $this->executeTarget(__FUNCTION__);
 
@@ -59,7 +59,7 @@ public function testLineContainsRegexpNegate()
         $this->assertTrue($this->fu->contentEquals($expected, $result), "Files don't match!");
     }
 
-    public function testLineContainsRegexpCaseInsensitive()
+    public function testLineContainsRegexpCaseInsensitive(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/LineContainsTest.php b/tests/Phing/Filter/LineContainsTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testLineContains()
+    public function testLineContains(): void
     {
         $this->executeTarget('testLineContains');
 
@@ -50,7 +50,7 @@ public function testLineContains()
         $this->assertTrue($this->fu->contentEquals($expected, $result), "Files don't match!");
     }
 
-    public function testLineContainsNegate()
+    public function testLineContainsNegate(): void
     {
         $this->executeTarget(__FUNCTION__);
 
@@ -59,7 +59,7 @@ public function testLineContainsNegate()
         $this->assertTrue($this->fu->contentEquals($expected, $result), "Files don't match!");
     }
 
-    public function testLineContainsMatchAny()
+    public function testLineContainsMatchAny(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/PrefixLinesTest.php b/tests/Phing/Filter/PrefixLinesTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testPrefixLines()
+    public function testPrefixLines(): void
     {
         $this->executeTarget('testPrefixLines');
 

diff --git a/tests/Phing/Filter/ReplaceTokensWithFileTest.php b/tests/Phing/Filter/ReplaceTokensWithFileTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
     /**
      * Inspired by ticket #798 - http://www.phing.info/trac/ticket/798.
      */
-    public function testPostfix()
+    public function testPostfix(): void
     {
         $this->executeTarget(__FUNCTION__);
 
@@ -47,7 +47,7 @@ public function testPostfix()
     /**
      * Inspired by ticket #1046 - http://www.phing.info/trac/ticket/1046.
      */
-    public function testSlashInToken()
+    public function testSlashInToken(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/SortFilterTest.php b/tests/Phing/Filter/SortFilterTest.php
@@ -41,7 +41,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testSortFilter()
+    public function testSortFilter(): void
     {
         $this->executeTarget('testSortFilter');
 

diff --git a/tests/Phing/Filter/StripPhpCommentsTest.php b/tests/Phing/Filter/StripPhpCommentsTest.php
@@ -47,10 +47,9 @@ public function tearDown(): void
 
     /**
      * @throws IOException
-     * @requires PHP 7
      * @requires OSFAMILY Windows|Linux
      */
-    public function testStripPhpComments()
+    public function testStripPhpComments(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/StripWhitespaceTest.php b/tests/Phing/Filter/StripWhitespaceTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testStripWhitespace()
+    public function testStripWhitespace(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Filter/SuffixLinesTest.php b/tests/Phing/Filter/SuffixLinesTest.php
@@ -42,7 +42,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testSuffixLines()
+    public function testSuffixLines(): void
     {
         $this->executeTarget('testSuffixLines');
 

diff --git a/tests/Phing/Filter/TailFilterTest.php b/tests/Phing/Filter/TailFilterTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void
         $this->executeTarget('cleanup');
     }
 
-    public function testTailFilter()
+    public function testTailFilter(): void
     {
         $this->executeTarget(__FUNCTION__);
 
@@ -47,7 +47,7 @@ public function testTailFilter()
         $this->assertFileEquals($expected->getAbsolutePath(), $result->getAbsolutePath());
     }
 
-    public function testTailHeadFilter()
+    public function testTailHeadFilter(): void
     {
         $this->executeTarget(__FUNCTION__);
 

diff --git a/tests/Phing/Input/ConsoleInputHandlerTest.php b/tests/Phing/Input/ConsoleInputHandlerTest.php
@@ -29,7 +29,7 @@
 
 class ConsoleInputHandlerTest extends TestCase
 {
-    public function testDefaultValue()
+    public function testDefaultValue(): void
     {
         $inputStream = $this->createStream([' ']);
         $output = new NullOutput();
@@ -42,7 +42,7 @@ public function testDefaultValue()
         self::assertEquals('default', $request->getInput());
     }
 
-    public function testMultipleChoiceQuestion()
+    public function testMultipleChoiceQuestion(): void
     {
         $inputStream = $this->createStream(['choice1']);
         $output = new NullOutput();
@@ -54,7 +54,7 @@ public function testMultipleChoiceQuestion()
         self::assertEquals('choice1', $request->getInput());
     }
 
-    public function testYesNoQuestion()
+    public function testYesNoQuestion(): void
     {
         $inputStream = $this->createStream(['no']);
         $output = new NullOutput();

diff --git a/tests/Phing/Input/NoInteractionInputHandlerTest.php b/tests/Phing/Input/NoInteractionInputHandlerTest.php
@@ -30,7 +30,7 @@
 
 class NoInteractionInputHandlerTest extends TestCase
 {
-    public function testDefaultValue()
+    public function testDefaultValue(): void
     {
         $request = new InputRequest('Enter a value');
         $request->setDefaultValue('default');
@@ -41,7 +41,7 @@ public function testDefaultValue()
         self::assertEquals('default', $request->getInput());
     }
 
-    public function testMultipleChoiceQuestion()
+    public function testMultipleChoiceQuestion(): void
     {
         $request = new MultipleChoiceInputRequest('Enter a choice', ['choice1', 'choice2']);
         $handler = new NoInteractionInputHandler();
@@ -51,7 +51,7 @@ public function testMultipleChoiceQuestion()
         self::assertNull($request->getInput());
     }
 
-    public function testYesNoQuestion()
+    public function testYesNoQuestion(): void
     {
         $request = new YesNoInputRequest('Enter a choice', ['yes', 'no']);
         $handler = new NoInteractionInputHandler();

diff --git a/tests/Phing/IntrospectionHelperTest.php b/tests/Phing/IntrospectionHelperTest.php
@@ -51,7 +51,7 @@ public function setUp(): void
     /**
      * @throws BuildException
      */
-    public function testAddText()
+    public function testAddText(): void
     {
         $ih = IntrospectionHelper::getHelper(Exception::class);
 
@@ -68,15 +68,15 @@ public function testAddText()
         $this->assertSame('test', $element->text);
     }
 
-    public function testSupportsCharactersAdders()
+    public function testSupportsCharactersAdders(): void
     {
         $ih = IntrospectionHelper::getHelper(Exception::class);
         $this->assertFalse($ih->supportsCharacters(), "String doesn\\'t support addText");
         $ih = IntrospectionHelper::getHelper(IHProjectComponent::class);
         $this->assertTrue($ih->supportsCharacters(), 'IHProjectComponent supports addText');
     }
 
-    public function testElementCreators()
+    public function testElementCreators(): void
     {
         try {
             IntrospectionHelper::getHelper(IHCreatorFail1::class);