From 36ee1a5957a250c27b0cf8f9a8a54e61953019f5 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com>
Date: Fri, 10 May 2024 14:22:32 +0200
Subject: [PATCH] fix tests

---
 phpunit.xml                                   | 36 +++++++++++++++++++
 tests/phpunit.xml                             | 27 --------------
 .../Model/Exceptions/DebugExceptionTest.php   |  2 +-
 .../Model/ExportRenderer/CsvTest.php          | 11 +++---
 4 files changed, 41 insertions(+), 35 deletions(-)
 create mode 100644 phpunit.xml
 delete mode 100644 tests/phpunit.xml

diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..f651f58
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="true"
+         bootstrap="../../../source/bootstrap.php"
+         colors="false"
+         backupStaticAttributes="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="false"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         verbose="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <testsuites>
+        <testsuite name="Unit">
+            <directory>tests/unit</directory>
+        </testsuite>
+    </testsuites>
+    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">Application</directory>
+        </include>
+        <exclude>
+            <file>../.php-cs-fixer.php</file>
+            <file>../IntelliSenseHelper.php</file>
+        </exclude>
+    </coverage>
+    <php>
+        <const name="OXID_PHP_UNIT" value="true"/>
+    </php>
+</phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 6c09de6..0000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         cacheTokens="true"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="false"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         verbose="false">
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">../Application</directory>
-            <directory suffix=".php">../Modules</directory>
-            <directory suffix=".php">../public</directory>
-            <directory suffix=".php">../Setup</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="reports/logfile.xml"/>
-    </logging>
-</phpunit>
diff --git a/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php b/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
index 73e5bc5..2d273ee 100644
--- a/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
+++ b/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
@@ -51,7 +51,7 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
         );
 
         $this->assertStringContainsString(
-            'DEBUG',
+            'Debug',
             $this->callMethod(
                 $this->_oModel,
                 'getMessage'
diff --git a/tests/unit/Application/Model/ExportRenderer/CsvTest.php b/tests/unit/Application/Model/ExportRenderer/CsvTest.php
index a4a058f..b3a509d 100644
--- a/tests/unit/Application/Model/ExportRenderer/CsvTest.php
+++ b/tests/unit/Application/Model/ExportRenderer/CsvTest.php
@@ -122,13 +122,10 @@ class CsvTest extends ExportRendererTest
             ->getMock();
         $configMock->expects($this->atLeastOnce())->method('getConfigParam')->willReturnCallback(
             function ($argName) {
-                switch ($argName) {
-                    case 'sGiCsvFieldEncloser':
-                    case 'sCSVSign':
-                        return false;
-                    default:
-                        return Registry::getConfig()->getConfigParam($argName);
-                }
+                return match ( $argName ) {
+                    'sGiCsvFieldEncloser', 'sCSVSign' => null,
+                    default => Registry::getConfig()->getConfigParam( $argName ),
+                };
             }
         );