Added functional tests

bin/phpcsDiffFilter

@@ -1,19 +1,3 @@
 #!/usr/bin/env php
 <?php
-namespace exussum12\CoverageChecker;
-
-include (__DIR__ . "/../functions.php");
-
-findAutoLoader();
-$args = new ArgParser($argv);
-checkCallIsCorrect($args);
-$minimumPercentCovered = getMinPercent($args->getArg(3));
-
-$matcher = new FileMatchers\EndsWith();
-$diff = new  DiffFileLoader($args->getArg(1));
-$phpcs = new PhpCsLoader($args->getArg(2));
-$coverageCheck = new CoverageCheck($diff, $phpcs, $matcher);
-
-$lines = $coverageCheck->getCoveredLines();
-
-handleOutput($lines, $minimumPercentCovered);
+require __DIR__ . '/../src/runners/phpcsDiffFilter.php';

bin/phpmdDiffFilter

@@ -1,24 +1,3 @@
 #!/usr/bin/env php
 <?php
-namespace exussum12\CoverageChecker;
-
-include (__DIR__ . "/../functions.php");
-
-findAutoLoader();
-$args = new ArgParser($argv);
-checkCallIsCorrect($args);
-$minimumPercentCovered = getMinPercent($args->getArg(3));
-
-$matcher = new FileMatchers\EndsWith();
-
-$diff = new  DiffFileLoader(adjustForStdIn($args->getArg(1)));
-$phpmd = new PhpMdLoader(adjustForStdIn($args->getArg(2)));
-if ($args->getArg("strict")) {
-    $phpmd = new PhpMdLoaderStrict(adjustForStdIn($args->getArg(2)));
-}
-
-$coverageCheck = new CoverageCheck($diff, $phpmd, $matcher);
-
-$lines = $coverageCheck->getCoveredLines();
-
-handleOutput($lines, $minimumPercentCovered);
+require __DIR__ . '/../src/runners/phpmdDiffFilter.php';

bin/phpunitDiffFilter

@@ -1,19 +1,3 @@
 #!/usr/bin/env php
 <?php
-namespace exussum12\CoverageChecker;
-
-require_once (__DIR__ . "/../functions.php");
-
-findAutoLoader();
-$args = new ArgParser($argv);
-checkCallIsCorrect($args);
-$minimumPercentCovered = getMinPercent($args->getArg(3));
-
-$matcher = new FileMatchers\EndsWith();
-$diff = new  DiffFileLoader($args->getArg(1));
-$phpunit = new XMLReport($args->getArg(2));
-$coverageCheck = new CoverageCheck($diff, $phpunit, $matcher);
-
-$lines = $coverageCheck->getCoveredLines();
-
-handleOutput($lines, $minimumPercentCovered);
+require __DIR__ . '/../src/runners/phpunitDiffFilter.php';

phpunit.xml

@@ -13,7 +13,7 @@
     </testsuite>
 
     <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+        <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
         </whitelist>
     </filter>

src/ArgParser.php

@@ -21,7 +21,7 @@ public function getArg($name)
 
     protected function numericArg($position)
     {
-        foreach($this->args as $arg) {
+        foreach ($this->args as $arg) {
             if ($arg{0} != '-' && $position-- == 0) {
                 return $arg;
             }
@@ -35,8 +35,7 @@ protected function letterArg($name)
         $name = strlen($name) == 1 ?
             "-" . $name :
             "--" . $name;
-
-        foreach($this->args as $arg) {
+        foreach ($this->args as $arg) {
             if ($arg{0} == '-' && $name == $arg) {
                 return true;
             }

src/DiffFileLoader.php

@@ -49,7 +49,7 @@ public function getChangedLines()
     private function getLineHandle($line)
     {
         foreach ($this->diffLines as $lineType) {
-	    $lineType = $this->getClass($lineType);
+            $lineType = $this->getClass($lineType);
             if ($lineType->isValid($line)) {
                 return $lineType;
             }

src/PhpMdLoader.php

@@ -48,11 +48,11 @@ public function getLines()
     public function isValidLine($file, $lineNumber)
     {
         $valid = true;
-        foreach($this->errorRanges[$file] as $number => $errors) {
-            if (
+        foreach ($this->errorRanges[$file] as $number => $errors) {
+            if ((
                 $errors['start'] >= $lineNumber &&
                 $errors['end'] <= $lineNumber
-            ) {
+            )) {
                 //unset this error
                 unset($this->errorRanges[$file][$number]);
                 $valid = false;

functions.php → src/functions.php

@@ -1,11 +1,13 @@
 <?php
 namespace exussum12\CoverageChecker;
 
+use Exception;
+
 function findAutoLoader()
 {
     $locations = [
-        __DIR__ . '/vendor/autoload.php',
-        __DIR__ . '/autoload.php'
+        __DIR__ . '/../vendor/autoload.php',
+        __DIR__ . '/../autoload.php'
     ];
 
     $found = false;
@@ -17,27 +19,31 @@ function findAutoLoader()
             break;
         }
     }
-
+    // @codeCoverageIgnoreStart
     if (!$found) {
         error_log(
             "Can't find the autoload file," .
             "please make sure 'composer install' has been run"
         );
 
         exit(1);
+    // @codeCoverageIgnoreEnd
     }
 }
 
 function checkCallIsCorrect(ArgParser $args)
 {
-    if (false === $args->getArg(1) || false === $args->getArg(2)) {
-        error_log(
-            "Missing arguments, please call with diff and check file"
+    if (!$args->getArg(1) || !$args->getArg(2)) {
+        throw new Exception(
+            "Missing arguments, please call with diff and check file",
+            1
         );
-        exit(1);
     }
 }
 
+/**
+ * @codeCoverageIgnore
+ */
 function adjustForStdIn($argument)
 {
     if ($argument == "-") {
@@ -63,14 +69,14 @@ function getMinPercent($percent)
 
 function handleOutput($lines, $minimumPercentCovered)
 {
-    $coveredLines = count($lines['coveredLines'], COUNT_RECURSIVE);
-    $uncoveredLines = count($lines['uncoveredLines'], COUNT_RECURSIVE);
+    $coveredLines = calculateLines($lines['coveredLines']);
+    $uncoveredLines = calculateLines($lines['uncoveredLines']);
+
 
     if ($coveredLines + $uncoveredLines == 0) {
         echo "No lines found!";
-        exit(0);
+        return;
     }
-
     $percentCovered = 100 * ($coveredLines / ($coveredLines + $uncoveredLines));
 
     $extra = PHP_EOL;
@@ -85,8 +91,28 @@ function handleOutput($lines, $minimumPercentCovered)
     printf('%.2f%% Covered%s', $percentCovered, $extra);
 
     if ($percentCovered >= $minimumPercentCovered) {
-        exit(0);
+        return;
     }
 
-    exit(2);
+    throw new Exception(
+        "Failing due to coverage being lower than threshold",
+        2
+    );
+}
+
+function calculateLines($lines)
+{
+    return count($lines, COUNT_RECURSIVE) - count($lines);
+}
+
+function addExceptionHandler()
+{
+    set_exception_handler(
+        function (Exception $exception) {
+            // @codeCoverageIgnoreStart
+            error_log($exception->getMessage());
+            exit($exception->getCode());
+            // @codeCoverageIgnoreEnd
+        }
+    );
 }

src/runners/phpcsDiffFilter.php

@@ -0,0 +1,20 @@
+<?php
+namespace exussum12\CoverageChecker;
+
+require_once __DIR__ . "/../functions.php";
+global $argv;
+
+addExceptionHandler();
+findAutoLoader();
+$args = new ArgParser($argv);
+checkCallIsCorrect($args);
+$minimumPercentCovered = getMinPercent($args->getArg(3));
+
+$matcher = new FileMatchers\EndsWith();
+$diff = new  DiffFileLoader($args->getArg(1));
+$phpcs = new PhpCsLoader($args->getArg(2));
+$coverageCheck = new CoverageCheck($diff, $phpcs, $matcher);
+
+$lines = $coverageCheck->getCoveredLines();
+
+handleOutput($lines, $minimumPercentCovered);

src/runners/phpmdDiffFilter.php

@@ -0,0 +1,25 @@
+<?php
+namespace exussum12\CoverageChecker;
+
+require_once __DIR__ . "/../functions.php";
+global $argv;
+
+addExceptionHandler();
+findAutoLoader();
+$args = new ArgParser($argv);
+checkCallIsCorrect($args);
+$minimumPercentCovered = getMinPercent($args->getArg(3));
+
+$matcher = new FileMatchers\EndsWith();
+
+$diff = new  DiffFileLoader(adjustForStdIn($args->getArg(1)));
+$phpmd = new PhpMdLoader(adjustForStdIn($args->getArg(2)));
+if ($args->getArg("strict")) {
+    $phpmd = new PhpMdLoaderStrict(adjustForStdIn($args->getArg(2)));
+}
+
+$coverageCheck = new CoverageCheck($diff, $phpmd, $matcher);
+
+$lines = $coverageCheck->getCoveredLines();
+
+handleOutput($lines, $minimumPercentCovered);

src/runners/phpunitDiffFilter.php

@@ -0,0 +1,20 @@
+<?php
+namespace exussum12\CoverageChecker;
+
+global $argv;
+
+require_once __DIR__ . "/../functions.php";
+addExceptionHandler();
+findAutoLoader();
+$args = new ArgParser($argv);
+checkCallIsCorrect($args);
+$minimumPercentCovered = getMinPercent($args->getArg(3));
+
+$matcher = new FileMatchers\EndsWith();
+$diff = new  DiffFileLoader($args->getArg(1));
+$phpunit = new XMLReport($args->getArg(2));
+$coverageCheck = new CoverageCheck($diff, $phpunit, $matcher);
+
+$lines = $coverageCheck->getCoveredLines();
+
+handleOutput($lines, $minimumPercentCovered);

tests/DiffFileLoadTest.php

@@ -22,7 +22,7 @@ public function testDiffResultsMatch($file, $expected)
      */
     public function testNonExistantFile()
     {
-        $changed = $this->getChangedLines('ufhbubfusdf');
+        $this->getChangedLines('ufhbubfusdf');
     }
 
     public function getResults()

tests/LoadPhpcsReportTest.php

@@ -27,7 +27,7 @@ public function testCanMakeClass()
      */
     public function testRejectsInvalidData()
     {
-        $phpcs = new PhpCsLoader(__DIR__ . '/fixtures/change.txt');
+        new PhpCsLoader(__DIR__ . '/fixtures/change.txt');
     }
 
     public function testCorrectMissingFile()

tests/PhpcsDiffFilterTest.php

@@ -0,0 +1,21 @@
+<?php
+namespace exussum12\CoverageChecker\tests;
+
+use PHPUnit\Framework\TestCase;
+
+class PhpcsDiffFilterTest extends TestCase
+{
+
+    public function testValid()
+    {
+        $GLOBALS['argv'] = [
+            'phpunitDiffFilter',
+            __DIR__ . '/fixtures/change.txt',
+            __DIR__ . '/fixtures/phpcs.json'
+        ];
+        ob_start();
+        require(__DIR__ . "/../src/runners/phpcsDiffFilter.php");
+        $output = ob_get_clean();
+        $this->assertContains('100.00%', $output);
+    }
+}

tests/PhpmdDiffFilterTest.php

@@ -0,0 +1,63 @@
+<?php
+namespace exussum12\CoverageChecker\tests;
+
+use PHPUnit\Framework\TestCase;
+use Exception;
+
+class PhpmdDiffFilterTest extends TestCase
+{
+
+    public function testValid()
+    {
+        $GLOBALS['argv'] = [
+            'phpunitDiffFilter',
+            __DIR__ . '/fixtures/change.txt',
+            __DIR__ . '/fixtures/phpmd.xml'
+        ];
+        ob_start();
+        require(__DIR__ . "/../src/runners/phpmdDiffFilter.php");
+        $output = ob_get_clean();
+        $this->assertContains('100.00%', $output);
+    }
+
+    public function testNoValidLines()
+    {
+        $GLOBALS['argv'] = [
+            'phpunitDiffFilter',
+            __DIR__ . '/fixtures/change.txt',
+            __DIR__ . '/fixtures/phpmd-change.xml',
+        ];
+        try {
+            ob_start();
+            require(__DIR__ . "/../src/runners/phpmdDiffFilter.php");
+        } catch (Exception $e) {
+            $output = ob_get_clean();
+            $this->assertEquals(2, $e->getCode());
+            $this->assertContains('0.00%', $output);
+            return;
+        }
+        $this->fail("no exception thrown");
+
+    }
+
+    public function testNoValidLinesStrict()
+    {
+        $GLOBALS['argv'] = [
+            'phpunitDiffFilter',
+            __DIR__ . '/fixtures/change.txt',
+            __DIR__ . '/fixtures/phpmd-change.xml',
+            '--strict',
+        ];
+        try {
+            ob_start();
+            require(__DIR__ . "/../src/runners/phpmdDiffFilter.php");
+        } catch (Exception $e) {
+            $output = ob_get_clean();
+            $this->assertEquals(2, $e->getCode());
+            $this->assertContains('0%', $output);
+            return;
+        }
+
+        $this->fail("no exception thrown");
+    }
+}