Merge branch 'master' into feature/unwrap-array-splice

infection · Jan 11, 2019 · 778af29 · 778af29
2 parents d46a753 + 3ec02da
commit 778af29
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 14 deletions.
diff --git a/src/Command/InfectionCommand.php b/src/Command/InfectionCommand.php
@@ -51,6 +51,7 @@
 use Infection\Process\Runner\MutationTestingRunner;
 use Infection\Process\Runner\TestRunConstraintChecker;
 use Infection\TestFramework\Coverage\CodeCoverageData;
+use Infection\TestFramework\Coverage\CoverageDoesNotExistException;
 use Infection\TestFramework\HasExtraNodeVisitors;
 use Infection\TestFramework\PhpSpec\PhpSpecExtraOptions;
 use Infection\TestFramework\PhpUnit\Coverage\CoverageXmlParser;
@@ -61,6 +62,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Process\Process;
 
 /**
  * @internal
@@ -236,6 +238,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
+        $this->assertCodeCoverageExists($initialTestSuitProcess, $testFrameworkKey);
+
         $container->get('memory.limit.applier')->applyMemoryLimitFromProcess($initialTestSuitProcess, $adapter);
 
         $codeCoverageData = $this->getCodeCoverageData($testFrameworkKey);
@@ -367,4 +371,28 @@ private function runConfigurationCommand(Locator $locator): void
             }
         }
     }
+
+    private function assertCodeCoverageExists(Process $initialTestsProcess, string $testFrameworkKey): void
+    {
+        $coverageDir = $this->getContainer()->get(sprintf('coverage.dir.%s', $testFrameworkKey));
+
+        $coverageIndexFilePath = $coverageDir . '/' . CodeCoverageData::COVERAGE_INDEX_FILE_NAME;
+
+        $processInfo = sprintf(
+            '%sCommand line: %s%sProcess Output: %s',
+            PHP_EOL,
+            $initialTestsProcess->getCommandLine(),
+            PHP_EOL,
+            $initialTestsProcess->getOutput()
+        );
+
+        if (!file_exists($coverageIndexFilePath)) {
+            throw CoverageDoesNotExistException::with(
+                $coverageIndexFilePath,
+                $testFrameworkKey,
+                \dirname($coverageIndexFilePath, 2),
+                $processInfo
+            );
+        }
+    }
 }
diff --git a/src/Finder/TestFrameworkFinder.php b/src/Finder/TestFrameworkFinder.php
@@ -134,23 +134,23 @@ private function findTestFramework(): string
             return $this->customPath;
         }
 
-        /*
-         * There's a glitch where ExecutableFinder would find a non-executable
-         * file on Windows, even if there's a proper executable .bat by its side.
-         * Therefore we have to explicitly look for a .bat first.
-         */
-        $candidates = [
-            $this->testFrameworkName . '.bat',
-            $this->testFrameworkName,
-            $this->testFrameworkName . '.phar',
-        ];
+        $candidates = [];
 
         if ($this->testFrameworkName === TestFrameworkTypes::PHPUNIT) {
             $candidates[] = 'simple-phpunit.bat';
             $candidates[] = 'simple-phpunit';
             $candidates[] = 'simple-phpunit.phar';
         }
 
+        /*
+         * There's a glitch where ExecutableFinder would find a non-executable
+         * file on Windows, even if there's a proper executable .bat by its side.
+         * Therefore we have to explicitly look for a .bat first.
+         */
+        $candidates[] = $this->testFrameworkName . '.bat';
+        $candidates[] = $this->testFrameworkName;
+        $candidates[] = $this->testFrameworkName . '.phar';
+
         $finder = new ExecutableFinder();
 
         $cwd = getcwd();

diff --git a/src/Mutator/Unwrap/UnwrapArraySlice.php b/src/Mutator/Unwrap/UnwrapArraySlice.php
@@ -2,7 +2,7 @@
 /**
  * This code is licensed under the BSD 3-Clause License.
  *
- * Copyright (c) 2017-2018, Maks Rafalko
+ * Copyright (c) 2017-2019, Maks Rafalko
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/TestFramework/Coverage/CoverageDoesNotExistException.php b/src/TestFramework/Coverage/CoverageDoesNotExistException.php
@@ -43,11 +43,17 @@
  */
 final class CoverageDoesNotExistException extends InfectionException
 {
-    public static function with(string $coverageIndexFilePath, string $testFrameworkKey, string $tempDir): self
+    public static function with(string $coverageIndexFilePath, string $testFrameworkKey, string $tempDir, string $processInfo = ''): self
     {
+        $message = 'Code Coverage does not exist. File %s is not found. Check %s version Infection was run with and generated config files inside %s.';
+
+        if ($processInfo) {
+            $message .= $processInfo . PHP_EOL;
+        }
+
         return new self(
             sprintf(
-                'Code Coverage does not exist. File %s is not found. Check %s version Infection was run with and generated config files inside %s. Make sure to either: %s%s',
+                $message . ' Make sure to either: %s%s',
                 $coverageIndexFilePath,
                 $testFrameworkKey,
                 $tempDir,

diff --git a/tests/Mutator/Unwrap/UnwrapArraySliceTest.php b/tests/Mutator/Unwrap/UnwrapArraySliceTest.php
@@ -2,7 +2,7 @@
 /**
  * This code is licensed under the BSD 3-Clause License.
  *
- * Copyright (c) 2017-2018, Maks Rafalko
+ * Copyright (c) 2017-2019, Maks Rafalko
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without