Merge 9bc4f26 into 09dcb67

facile-it · Feb 27, 2019 · f38fb95 · f38fb95
2 parents 09dcb67 + 9bc4f26
commit f38fb95
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/src/Paraunit/Configuration/PHPUnitConfig.php b/src/Paraunit/Configuration/PHPUnitConfig.php
@@ -6,7 +6,9 @@
 
 class PHPUnitConfig
 {
-    const DEFAULT_FILE_NAME = 'phpunit.xml.dist';
+    public const DEFAULT_FILE_NAME = 'phpunit.xml';
+
+    public const FALLBACK_CONFIG_FILE_NAME = 'phpunit.xml.dist';
 
     /** @var string */
     private $configFilename;
@@ -64,7 +66,7 @@ private function getConfigFileRealpath(string $inputPathOrFileName): string
         }
 
         if (is_dir($configFile)) {
-            $configFile .= DIRECTORY_SEPARATOR . self::DEFAULT_FILE_NAME;
+            $configFile .= DIRECTORY_SEPARATOR . $this->getConfigFile($configFile);
         }
 
         if (! is_file($configFile) || ! is_readable($configFile)) {
@@ -73,4 +75,13 @@ private function getConfigFileRealpath(string $inputPathOrFileName): string
 
         return $configFile;
     }
+
+    private function getConfigFile(string $path): string
+    {
+        if (file_exists($path . DIRECTORY_SEPARATOR . self::DEFAULT_FILE_NAME)) {
+            return self::DEFAULT_FILE_NAME;
+        }
+
+        return self::FALLBACK_CONFIG_FILE_NAME;
+    }
 }
diff --git a/src/Paraunit/Configuration/TempFilenameFactory.php b/src/Paraunit/Configuration/TempFilenameFactory.php
@@ -33,7 +33,7 @@ public function getFilenameForCoverage(string $uniqueId): string
 
     public function getFilenameForConfiguration(): string
     {
-        return $this->getTempFilename('config', 'phpunit', 'xml.dist');
+        return $this->getTempFilename('config', 'phpunit', 'xml');
     }
 
     private function getTempFilename(string $subDir, string $filename, string $extension): string

diff --git a/tests/Stub/StubbedXMLConfigs/MissDefault/phpunit.xml.dist b/tests/Stub/StubbedXMLConfigs/MissDefault/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+        >
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <ini name="intl.default_locale" value="en"/>
+        <ini name="intl.error_level" value="0"/>
+        <ini name="memory_limit" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite>
+            <directory suffix="TestSuffix.php">./only/selected/test/suite/</directory>
+        </testsuite>
+        <testsuite>
+            <directory>./other/test/suite/</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>
diff --git a/tests/Stub/StubbedXMLConfigs/MissDefaultAndFallback/.gitkeep b/tests/Stub/StubbedXMLConfigs/MissDefaultAndFallback/.gitkeep
diff --git a/tests/Unit/Configuration/PHPUnitConfigTest.php b/tests/Unit/Configuration/PHPUnitConfigTest.php
@@ -29,11 +29,30 @@ public function testGetFileFullPathWithDirAndUseDefaultFileName()
         $this->assertEquals($configurationFile, $config->getFileFullPath());
     }
 
+    public function testGetFileFullPathWithMissConfigDefault(): void
+    {
+        $dir = $this->getStubPath() . 'StubbedXMLConfigs' . DIRECTORY_SEPARATOR . 'MissDefault';
+        $config = new PHPUnitConfig($dir);
+
+        $configurationFile = $dir . DIRECTORY_SEPARATOR . 'phpunit.xml.dist';
+        $this->assertEquals($configurationFile, $config->getFileFullPath());
+    }
+
+    public function testGetFileFullPathWithMissConfigDefaultAndFallBack(): void
+    {
+        $dir = $this->getStubPath() . 'StubbedXMLConfigs' . DIRECTORY_SEPARATOR . 'MissDefaultAndFallback';
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(PHPUnitConfig::FALLBACK_CONFIG_FILE_NAME . ' does not exist');
+
+        new PHPUnitConfig($dir);
+    }
+
     public function testGetFileFullPathWithFileDoesNotExistWillThrowException()
     {
         $dir = $this->getStubPath() . 'PHPUnitJSONLogOutput';
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage(PHPUnitConfig::DEFAULT_FILE_NAME . ' does not exist');
+        $this->expectExceptionMessage(PHPUnitConfig::FALLBACK_CONFIG_FILE_NAME . ' does not exist');
 
         new PHPUnitConfig($dir);
     }