repairs code coverage logic

github action for coverage github action for coverage
HuasoFoundries · Apr 27, 2021 · 1563b54 · 1563b54
1 parent e62abad
commit 1563b54
Show file tree

Hide file tree

Showing 30 changed files with 172 additions and 132 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -0,0 +1,45 @@
+name: coverage
+
+on: ['pull_request']
+
+jobs:
+  coverage:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      matrix:
+        php: ['7.4']
+
+    name: PHP ${{ matrix.php }} - 'ubuntu-latest' - 'prefer-stable'
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        tools: composer:v2
+        extensions:
+          gd
+          pcov
+        coverage: pcov
+
+    - name: Cache dependencies installed with composer
+      uses: actions/cache@v2
+      with:
+        path: "~/.composer/cache"
+        key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          php${{ matrix.php-version }}-composer-
+
+    - name: Setup Problem Matches
+      run: |
+        echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+    - name: Install PHP dependencies
+      run: composer update --'prefer-stable' --no-interaction --no-progress
+
+    - name: Coverage
+      run: composer coverage
+      if: "matrix.php == 7.4"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
       with:
         php-version: ${{ matrix.php }}
         tools: composer:v2
-        extensions: gd
+        extensions: gd, pcov
         coverage: none
 
     - name: Setup Problem Matches
@@ -31,4 +31,4 @@ jobs:
       run: composer update --'prefer-stable' --no-interaction --no-progress
 
     - name: Unit Tests
-      run: composer test
+      run: composer test
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -11,20 +11,23 @@ build:
         analysis:
             tests:
                 override:
-                    -
-                        command: phpcs-run
-                        use_website_config: false
+                    - phpcs-run
 
+                    -
+                        command: composer coverage
+                        coverage:
+                            file: 'tests/_output/coverage.xml'
+                            format: 'clover'
                     - php-scrutinizer-run
 
 
 
 tools:
-    php_code_coverage: false
+    php_code_coverage: true
 
 filter:
     excluded_paths:
         - 'Examples/'
         - 'tests/'
     dependency_paths:
-        - 'vendor/'
+        - 'vendor/'
diff --git a/Examples/index.html b/Examples/index.html
@@ -18,8 +18,8 @@
         max-height: 100vh;
         overflow-y: auto;
         border-right: 1px solid #AAA;
-        width: 300px;
-        float-left;
+        width: 350px;
+        float:left;
         padding-left: 0;
         padding-right: 0;
     }

diff --git a/Examples/show-example.php b/Examples/show-example.php
@@ -1,40 +1,34 @@
 <?php
-if (!isset($_GET['target'])) {
-    $_GET['target'] = 'axislabelbkgex01.php';
-}
-if (!isset($_GET['folder'])) {
-    $_GET['folder'] = 'examples_axis';
-}
 
-$target = basename(urldecode($_GET['target']));
-$folder = basename(urldecode($_GET['folder']));
+$target = basename(urldecode($_GET['target'] ?? 'axislabelbkgex01.php'));
+$folder = basename(urldecode($_GET['folder'] ?? 'examples_axis'));
+
+echo "<html>";
+echo '<head>';
+echo '<title> Image ' . $target . '</title>';
 
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html>
-<head>
-<title> Test suite for JpGraph - <?php echo $target; ?></title>
-<script type="text/javascript" language="javascript">
-<!--
-function resize()
-{
-	return true;
-}
-//-->
-</script>
-</head>
 
-	<?php
 if (!strstr($target, 'csim')) {
-    echo '<frameset rows="*,*" onLoad="resize()">';
-    echo '<frame src="show-image.php?' . 'folder=' . ($folder) . '&target=' . ($target) . '" name="image">';
-    echo '<frame src="show-source.php?folder=' . ($folder) . '&target=' . ($target) . '" name="source">';
+    $highlighted =    highlight_file(($folder ? $folder . '/' : '') . $target, true);
+
+    echo '</head>';
+    echo '<body>';
+    echo '<div style="float:right;"><img src="' . ($folder ? $folder . '/' : '') . ($target) . '" border=0 alt="' . $target . '" align="left"></div>';
+    echo $highlighted;
+    echo '</body>';
 } else {
+
+    echo '<script type="text/javascript" language="javascript">';
+    echo '<!--';
+    echo 'function resize() {';
+    echo 'return true;';
+    echo '}';
+    echo '//';
+    echo '-->';
+    echo '</script>';
+    echo '</head>';
     echo '<frameset rows="*" onLoad="resize()">';
     echo '<frame src="' . ($folder) . '/' . ($target) . '" name="image">';
+    echo '</frameset>';
 }
-?>
-
-
-</frameset>
-</html>
+echo '</html>';
diff --git a/Examples/show-image.php b/Examples/show-image.php
diff --git a/Examples/show-source.php b/Examples/show-source.php
diff --git a/Examples/testsuit.php b/Examples/testsuit.php
@@ -1,5 +1,5 @@
 <?php
-
+require __DIR__ . '/../vendor/autoload.php';
 /**
  * JPGraph v4.0.3
  */
@@ -26,11 +26,11 @@ class TestDriver
     private $iDir;
     private $exampleDir;
 
-    public function __construct($aType = 1, $folder = 'examples_axis', $aDir = '')
+    public function __construct($aType = 1, $folder = 'examples_axis', $aDir = __DIR__)
     {
         $this->iType = $aType;
         if ($aDir == '') {
-            $aDir = getcwd();
+            $aDir = __DIR__;
         }
         if (!chdir($aDir)) {
             die("PANIC: Can't access directory : ${aDir}");

diff --git a/composer.json b/composer.json
@@ -59,7 +59,8 @@
         "fix": "vendor/bin/phpcbf  --standard=.phpcs.xml src/* tests/* && vendor/bin/php-cs-fixer fix --config=.php_cs.php",
         "lint": "vendor/bin/phplint",
         "start": "php -S localhost:8000 -t Examples",
-        "test": "php vendor/bin/codecept run unit "
+        "test": "php vendor/bin/codecept run unit ",
+        "coverage": "XDEBUG_MODE=coverage php vendor/bin/codecept run unit --coverage --coverage-xml"
     },
     "support": {
         "issues": "https://github.com/huasofoundries/jpgraph/issues"

diff --git a/tests/AxisTest.php b/tests/AxisTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class AxisTest extends \Codeception\Test\Unit
 {

diff --git a/tests/BackgroundTest.php b/tests/BackgroundTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class BackgroundTest extends \Codeception\Test\Unit
 {

diff --git a/tests/BarTest.php b/tests/BarTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class BarTest extends \Codeception\Test\Unit
 {

diff --git a/tests/CanvasTest.php b/tests/CanvasTest.php
@@ -9,7 +9,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class CanvasTest extends \Codeception\Test\Unit
 {

diff --git a/tests/ContourTest.php b/tests/ContourTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class ContourTest extends \Codeception\Test\Unit
 {

diff --git a/tests/DateTest.php b/tests/DateTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class DateTest extends \Codeception\Test\Unit
 {

diff --git a/tests/GanttTest.php b/tests/GanttTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class GanttTest extends \Codeception\Test\Unit
 {

diff --git a/tests/GeneralTest.php b/tests/GeneralTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class GeneralTest extends \Codeception\Test\Unit
 {

diff --git a/tests/ImgTest.php b/tests/ImgTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class ImgTest extends \Codeception\Test\Unit
 {

diff --git a/tests/LineTest.php b/tests/LineTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class LineTest extends \Codeception\Test\Unit
 {

diff --git a/tests/PieTest.php b/tests/PieTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class PieTest extends \Codeception\Test\Unit
 {

diff --git a/tests/RotateTest.php b/tests/RotateTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class RotateTest extends \Codeception\Test\Unit
 {

diff --git a/tests/ScatterTest.php b/tests/ScatterTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class ScatterTest extends \Codeception\Test\Unit
 {

diff --git a/tests/StaticbandTest.php b/tests/StaticbandTest.php
@@ -8,7 +8,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class StaticbandTest extends \Codeception\Test\Unit
 {

diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class ThemeTest extends \Codeception\Test\Unit
 {

diff --git a/tests/TickTest.php b/tests/TickTest.php
@@ -10,7 +10,7 @@
  * @group ready
  *
  * @internal
- * @coversNothing
+ * 
  */
 class TickTest extends \Codeception\Test\Unit
 {