[TASK] Improve tests

FriendsOfTYPO3 · Jul 7, 2024 · e1a8c26 · e1a8c26
1 parent 529ead6
commit e1a8c26
Show file tree

Hide file tree

Showing 9 changed files with 562 additions and 353 deletions.
diff --git a/.github/workflows/core12.yml b/.github/workflows/core12.yml
@@ -5,7 +5,7 @@ on: [ push, pull_request ]
 jobs:
   tests:
     name: v12
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       # This prevents cancellation of matrix job runs, if one/two already failed and let the
       # rest matrix jobs be executed anyway.
@@ -24,10 +24,26 @@ jobs:
         run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s lint
 
       - name: Validate code against CGL
-        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p 8.2 -s cgl -n
+        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s cgl -n
 
       - name: Unit Tests
         run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s unit
 
-      - name: Functional Tests
-        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s functional
+      - name: Functional Tests with mariadb and mysqli
+        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional
+#
+#      - name: Functional Tests with mariadb and pdo_mysql
+#        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional
+#
+#      - name: Functional Tests with mysql and mysqli
+#        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mysql -a mysqli -s functional
+#
+#      - name: Functional Tests with mysql and pdo_mysql
+#        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional
+
+#      - name: Functional Tests with postgres
+#        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d postgres -s functional
+
+      # @todo disabled, due cross dbmns issues in code. Should be fixed first
+      # - name: Functional Tests with sqlite
+      #   run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -d sqlite -s functional
diff --git a/.github/workflows/core13.yml b/.github/workflows/core13.yml
@@ -5,13 +5,13 @@ on: [ push, pull_request ]
 jobs:
   tests:
     name: v13
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       # This prevents cancellation of matrix job runs, if one/two already failed and let the
       # rest matrix jobs be executed anyway.
       fail-fast: true
       matrix:
-        php: ['8.2', '8.3' ]
+        php: [ '8.2', '8.3' ]
         composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
     steps:
       - name: Checkout
@@ -24,10 +24,26 @@ jobs:
         run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s lint
 
       - name: Validate code against CGL
-        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 13 -p 8.2 -s cgl -n
+        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s cgl -n
 
       - name: Unit Tests
         run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s unit
 
-      - name: Functional Tests
-        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s functional
+#      - name: Functional Tests with mariadb and mysqli
+#        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional
+#
+#      - name: Functional Tests with mariadb and pdo_mysql
+#        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional
+#
+#      - name: Functional Tests with mysql and mysqli
+#        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a mysqli -s functional
+#
+#      - name: Functional Tests with mysql and pdo_mysql
+#        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional
+#
+#      - name: Functional Tests with postgres
+#        run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -s functional
+
+      # @todo disabled, due cross dbmns issues in code. Should be fixed first
+      # - name: Functional Tests with sqlite
+      #   run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional
diff --git a/Build/.gitignore b/Build/.gitignore
@@ -1 +1 @@
-Build/php-cs-fixer/.php-cs-fixer.cache
+php-cs-fixer/.php-cs-fixer.cache
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Build/php-cs-fixer/.php-cs-fixer.cache
		php-cs-fixer/.php-cs-fixer.cache