Merge branch '0.11'

infection · Nov 18, 2018 · 739e782 · 739e782
2 parents 65be86b + 62b41f8
commit 739e782
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 7 deletions.
diff --git a/src/TestFramework/PhpUnit/Config/Builder/MutationConfigBuilder.php b/src/TestFramework/PhpUnit/Config/Builder/MutationConfigBuilder.php
@@ -59,11 +59,6 @@ class MutationConfigBuilder extends ConfigBuilder
      */
     private $xmlConfigurationHelper;
 
-    /**
-     * @var string
-     */
-    private $originalXmlConfigContent;
-
     /**
      * @var \DOMDocument
      */
@@ -75,12 +70,11 @@ public function __construct(string $tempDirectory, string $originalXmlConfigCont
         $this->projectDir = $projectDir;
 
         $this->xmlConfigurationHelper = $xmlConfigurationHelper;
-        $this->originalXmlConfigContent = $originalXmlConfigContent;
 
         $this->dom = new \DOMDocument();
         $this->dom->preserveWhiteSpace = false;
         $this->dom->formatOutput = true;
-        $this->dom->loadXML($this->originalXmlConfigContent);
+        $this->dom->loadXML($originalXmlConfigContent);
     }
 
     public function build(MutantInterface $mutant): string
@@ -95,6 +89,7 @@ public function build(MutantInterface $mutant): string
         $this->xmlConfigurationHelper->deactivateColours($xPath);
         $this->xmlConfigurationHelper->removeExistingLoggers($dom, $xPath);
         $this->xmlConfigurationHelper->removeExistingPrinters($dom, $xPath);
+        $this->xmlConfigurationHelper->removeDefaultTestSuite($dom, $xPath);
 
         $customAutoloadFilePath = sprintf(
             '%s/interceptor.autoload.%s.infection.php',

diff --git a/src/TestFramework/PhpUnit/Config/XmlConfigurationHelper.php b/src/TestFramework/PhpUnit/Config/XmlConfigurationHelper.php
@@ -137,6 +137,13 @@ public function validate(\DOMDocument $dom, \DOMXPath $xPath): bool
         return true;
     }
 
+    public function removeDefaultTestSuite(\DOMDocument $dom, \DOMXPath $xPath): void
+    {
+        if ($xPath->query('/phpunit/@defaultTestSuite')->length) {
+            $dom->documentElement->removeAttribute('defaultTestSuite');
+        }
+    }
+
     private function getXmlErrorsString(): string
     {
         $errorsString = '';

diff --git a/tests/Fixtures/Files/phpunit/phpunit.xml b/tests/Fixtures/Files/phpunit/phpunit.xml
@@ -15,6 +15,7 @@
          processIsolation="false"
          syntaxCheck="false"
          printerClass="Fake\Printer\Class"
+         defaultTestSuite="unit"
 >
     <testsuites>
         <testsuite name="Application Test Suite">

diff --git a/tests/TestFramework/PhpUnit/Config/Builder/MutationConfigBuilderTest.php b/tests/TestFramework/PhpUnit/Config/Builder/MutationConfigBuilderTest.php
@@ -262,6 +262,19 @@ public function test_it_sets_sorted_list_of_test_files(array $coverageTests, arr
         $this->assertSame($expectedFiles, $files);
     }
 
+    public function test_it_removes_default_test_suite(): void
+    {
+        $this->mutant->shouldReceive('getCoverageTests')->andReturn([]);
+
+        $configurationPath = $this->builder->build($this->mutant);
+
+        $xml = file_get_contents($configurationPath);
+
+        $value = $this->queryXpath($xml, '/phpunit/@defaultTestSuite');
+
+        $this->assertCount(0, $value);
+    }
+
     public function coverageTestsProvider(): array
     {
         return [

diff --git a/tests/TestFramework/PhpUnit/Config/XmlConfigurationHelperTest.php b/tests/TestFramework/PhpUnit/Config/XmlConfigurationHelperTest.php
@@ -328,6 +328,33 @@ public function test_it_passes_validation_by_xsd(string $xsdSchema): void
         $this->assertTrue(true, $xmlHelper->validate($dom, $xPath));
     }
 
+    public function test_it_removes_default_test_suite(): void
+    {
+        $dom = new \DOMDocument();
+        $dom->preserveWhiteSpace = false;
+        $dom->formatOutput = true;
+        $dom->loadXML(<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit syntaxCheck="false" printerClass="Fake\Printer\Class" stopOnFailure="false" defaultTestSuite="unit">
+</phpunit>
+
+XML
+        );
+
+        $xmlconfig = new XmlConfigurationHelper($this->getPathReplacer(), '');
+
+        $xmlconfig->removeDefaultTestSuite($dom, new \DOMXPath($dom));
+
+        $this->assertSame(<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit syntaxCheck="false" printerClass="Fake\Printer\Class" stopOnFailure="false">
+</phpunit>
+
+XML
+            , $dom->saveXML()
+        );
+    }
+
     private function getDomDocument(): \DOMDocument
     {
         $dom = new \DOMDocument();