Merge pull request #849 from rteitge/patch-tests-v13

remove no longer existing column t3_origuid in tests for v13

Author: lochmueller

Build/testing-docker/docker-compose.yml

@@ -107,7 +107,8 @@ services:
               -v \
               ${CGLCHECK_DRY_RUN} \
               --config=.Build/vendor/typo3/coding-standards/templates/extension_php_cs.dist \
-              --using-cache=no .
+              --using-cache=no \
+              --diff .
         else
           DOCKER_HOST=`route -n | awk '/^0.0.0.0/ { print $$2 }'`
           XDEBUG_MODE=\"debug,develop\" \
@@ -118,7 +119,8 @@ services:
             -v \
             ${CGLCHECK_DRY_RUN} \
             --config=.Build/vendor/typo3/coding-standards/templates/extension_php_cs.dist \
-            --using-cache=no .
+            --using-cache=no \
+            --diff .
         fi
       "
 

Tests/Functional/Domain/Repository/Fixtures/EventsWithCategories_v13.csv

@@ -0,0 +1,34 @@
+"pages"
+,"uid","pid",doktype,"sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title"
+,1,0,1,256,0,0,0,0,0,"Parent page"
+,2,1,254,256,0,0,0,0,0,"Events"
+,3,2,254,256,0,0,0,0,0,"Events with Categories"
+
+"sys_category",
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parent","items","l10n_diffsource","description"
+,28,0,256,0,0,0,0,0,0,0,"Category A",0,0,,
+,29,0,512,0,0,0,0,0,0,0,"Category B",0,0,,
+,30,0,768,0,0,0,0,0,0,0,"Category C",0,0,,
+,31,0,1024,0,0,0,0,0,0,0,"Category A.A",28,0,,
+
+"sys_category_record_mm",
+,"uid_local","uid_foreign","tablenames","sorting","sorting_foreign","fieldname"
+,28,20,"tx_calendarize_domain_model_event",0,1,"categories"
+,28,21,"tx_calendarize_domain_model_event",0,2,"categories"
+,29,30,"tx_calendarize_domain_model_event",0,3,"categories"
+
+"tx_calendarize_domain_model_event"
+,uid,pid,sys_language_uid,l10n_parent,title,calendarize,categories
+,10,2,0,0,No Category,10,0
+,11,2,1,10,[Translated to German] No Category,11,0
+,20,3,0,0,Only Category A,20,1
+,21,3,1,20,[Translated to German] Only Category A,21,1
+,30,3,0,0,Only Category B,30,0
+
+"tx_calendarize_domain_model_configuration"
+,"uid","pid","type","handling","start_date","all_day","t3ver_oid","t3ver_wsid","t3ver_state"
+,10,2,"time","include","2025-03-01",1,0,0,0
+,11,2,"time","include","2025-03-01",1,0,0,0
+,20,3,"time","include","2025-03-02",1,0,0,0
+,21,3,"time","include","2025-03-02",1,0,0,0
+,30,3,"time","include","2025-03-03",1,0,0,0

Tests/Functional/Domain/Repository/IndexRepositoryTest.php

@@ -9,6 +9,7 @@
 use HDNET\Calendarize\Service\IndexerService;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
@@ -21,7 +22,11 @@ class IndexRepositoryTest extends FunctionalTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories.csv');
+        if ((new Typo3Version())->getMajorVersion() >= 13) {
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories_v13.csv');
+        } else {
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories.csv');
+        }
 
         $this->indexerService = GeneralUtility::makeInstance(IndexerService::class);
         $this->indexerService->reindexAll();

Tests/Functional/EventListener/CategoryConstraintEventListenerTest.php

@@ -8,6 +8,7 @@
 use HDNET\Calendarize\Event\IndexRepositoryDefaultConstraintEvent;
 use HDNET\Calendarize\EventListener\CategoryConstraintEventListener;
 use HDNET\Calendarize\Register;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Extbase\Domain\Model\Category;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -21,7 +22,13 @@ class CategoryConstraintEventListenerTest extends FunctionalTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories.csv');
+
+        if ((new Typo3Version())->getMajorVersion() >= 13) {
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories_v13.csv');
+        } else {
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/EventsWithCategories.csv');
+        }
+
         $this->subject = new CategoryConstraintEventListener();
     }
 

Tests/Functional/EventListener/Fixtures/EventsWithCategories_v13.csv

@@ -0,0 +1,28 @@
+tx_calendarize_domain_model_event,,,,,,,,,,,,,,
+,uid,pid,sys_language_uid,title,calendarize,categories,,,,,,,,
+,10,0,0,No Category,0,0,,,,,,,,
+,11,0,0,Only Category A,0,1,,,,,,,,
+,12,0,0,Only Category B,0,0,,,,,,,,
+,13,0,0,Category B and C,0,0,,,,,,,,
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories"
+,20,0,0,0,0,0,0,0,0,0,"Element with Category A",0,1
+,21,0,0,0,0,0,0,0,0,0,"Element with Category A and B",0,2
+,22,0,0,0,0,0,0,0,0,0,"Element with Category B and C",0,2
+sys_category,,,,,,,,,,,,,,
+,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,title,parent,items
+,30,0,256,0,0,0,0,0,0,0,Category A,0,0
+,31,0,512,0,0,0,0,0,0,0,Category B,0,0
+,32,0,768,0,0,0,0,0,0,0,Category C,0,0
+,33,0,1024,0,0,0,0,0,0,0,Category A.A,28,0
+sys_category_record_mm,,,,,,,,,,,,,,
+,uid_local,uid_foreign,tablenames,sorting,sorting_foreign,fieldname,,,,,,,,
+,30,11,tx_calendarize_domain_model_event,0,1,categories,,,,,,,,
+,31,12,tx_calendarize_domain_model_event,0,1,categories,,,,,,,,
+,31,13,tx_calendarize_domain_model_event,0,1,categories,,,,,,,,
+,32,13,tx_calendarize_domain_model_event,0,2,categories,,,,,,,,
+,30,20,tt_content,0,1,categories,,,,,,,,
+,30,21,tt_content,0,1,categories,,,,,,,,
+,31,21,tt_content,0,2,categories,,,,,,,,
+,31,22,tt_content,0,1,categories,,,,,,,,
+,32,22,tt_content,0,2,categories,,,,,,,,

composer.json

@@ -97,7 +97,7 @@
 			"php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php"
 		],
 		"tool:php-cs-fixer-check": [
-			"php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --dry-run"
+			"php-cs-fixer fix --config Resources/Private/Build/PhpCsFixer.php --dry-run --diff"
 		],
 		"tool:phpunit": [
 			"phpunit --configuration=Tests/Unit/Build/UnitTests.xml"