Merge remote-tracking branch 'origin/support/3.1' into develop

tests/php-unit-tests/integration-tests/CompiledDictionariesConsistencyTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ * This file is part of iTop.
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Integration;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Dict;
+use const APPROOT;
+
+/**
+ * As {@see DictionariesConsistencyTest}, we are testing dict files, but the ones that are compiled, so we cannot be in the beforeSetup group !
+ */
+class CompiledDictionariesConsistencyTest extends ItopTestCase
+{
+	/**
+	 * make sure N°5305 dictionary changes are still here and UI remains unbroken for any lang
+	 */
+	public function testImportCsvMessageStillOk()
+	{
+		$aFailedLabels = [];
+		$aLabelsToTest = [
+			'UI:CSVReport-Value-SetIssue' => [],
+			'UI:CSVReport-Value-ChangeIssue' => ['arg1'],
+			'UI:CSVReport-Value-NoMatch' => ['arg1'],
+			'UI:CSVReport-Value-NoMatch-PossibleValues' => ['arg1', 'arg2'],
+			'UI:CSVReport-Value-NoMatch-NoObject' => ['arg1'],
+			'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => ['arg1'],
+			'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => ['arg1'],
+		];
+
+		$sCompiledLanguagesFilePath = APPROOT . 'env-' . \utils::GetCurrentEnvironment() . '/dictionaries/languages.php';
+		$this->assertFileExists($sCompiledLanguagesFilePath, 'We must have an existing compiled language.php file in the current env !');
+		require_once($sCompiledLanguagesFilePath);
+		$this->assertNotEmpty(Dict::GetLanguages(), 'the languages.php file exists but didn\'t load any language');
+
+		foreach (glob(APPROOT . 'env-' . \utils::GetCurrentEnvironment() . '/dictionaries/*.dict.php') as $sDictFile) {
+			if (preg_match('/.*\\/(.*).dict.php/', $sDictFile, $aMatches)) {
+				$sLangCode = $aMatches[1];
+				$sLanguageCode = strtoupper(str_replace('-', ' ', $sLangCode));
+				Dict::SetUserLanguage($sLanguageCode);
+
+				foreach ($aLabelsToTest as $sLabelKey => $aLabelArgs) {
+					echo "Testing $sDictFile, label $sLabelKey with " . \var_export($aLabelArgs, true) . "\n";
+					try {
+						$sLabelValue = Dict::Format($sLabelKey, ...$aLabelArgs);
+						//$this->debug($sLabelValue);
+					} catch (\ValueError $e) {
+						$aFailedLabels[] = $sLabelKey;
+
+						$this->debug([
+							'exception' => $e->getMessage(),
+							'trace' => $e->getTraceAsString(),
+							'label_name' => $sLabelKey,
+							'label_args' => $aLabelArgs,
+						]);
+					}
+				}
+				$this->assertEquals([], $aFailedLabels, "$sDictFile : test fail for lang $sLangCode and labels (" . implode(", ", $aFailedLabels) . ')');
+			}
+		}
+	}
+}

tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php

@@ -16,9 +16,9 @@
 namespace Combodo\iTop\Test\UnitTest\Integration;
 
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
-use Dict;
 
 /**
+ * For tests on compiled dict files, see {@see CompiledDictionariesConsistencyTest}
  * @group beforeSetup
  */
 class DictionariesConsistencyTest extends ItopTestCase
@@ -152,67 +152,4 @@ class DictionariesConsistencyTest extends ItopTestCase
 		$sMessage = "File `{$sDictFile}` syntax didn't matched expectations\nparsing results=".var_export($output, true);
 		self::assertEquals($bIsSyntaxValid, $bDictFileSyntaxOk, $sMessage);
 	}
-
-	/**
-	 * @dataProvider ImportCsvMessageStillOkProvider
-	 * make sure N°5305 dictionary changes are still here and UI remains unbroken for any lang
-	 */
-	public function testImportCsvMessageStillOk($sLangCode, $sDictFile)
-	{
-		$aFailedLabels = [];
-		$aLabelsToTest = [
-			'UI:CSVReport-Value-SetIssue' => [],
-			'UI:CSVReport-Value-ChangeIssue' => [ 'arg1' ],
-			'UI:CSVReport-Value-NoMatch' => [ 'arg1' ],
-			'UI:CSVReport-Value-NoMatch-PossibleValues' => [ 'arg1', 'arg2' ],
-			'UI:CSVReport-Value-NoMatch-NoObject' => [ 'arg1' ],
-			'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => [ 'arg1' ],
-			'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => [ 'arg1' ],
-		];
-
-		$sLanguageCode = strtoupper(str_replace('-', ' ', $sLangCode));
-		require_once(APPROOT.'env-'.\utils::GetCurrentEnvironment().'/dictionaries/languages.php');
-		Dict::SetUserLanguage($sLanguageCode);
-		foreach ($aLabelsToTest as $sLabelKey => $aLabelArgs){
-			try{
-				$sLabelValue = Dict::Format($sLabelKey, ...$aLabelArgs);
-				//$this->debug($sLabelValue);
-			} catch (\ValueError $e){
-				$aFailedLabels[] = $sLabelKey;
-
-				$this->debug([
-					'exception' => $e->getMessage(),
-					'trace' => $e->getTraceAsString(),
-					'label_name' => $sLabelKey,
-					'label_args' =>$aLabelArgs,
-				]);
-			}
-		}
-		$this->assertEquals([], $aFailedLabels, "test fail for lang $sLangCode and labels (" . implode(", ", $aFailedLabels) . ')');
-	}
-
-	public function ImportCsvMessageStillOkProvider(){
-		return $this->GetDictFiles();
-	}
-
-	/**
-	 * return a map linked to *.dict.php files that are generated after setup
-	 * each entry key is lang code (example 'en')
-	 * each value is an array with lang code (again) and dict file path
-	 * @return array
-	 */
-	private function GetDictFiles() : array {
-		$aDictFiles = [];
-
-		foreach (glob(APPROOT.'env-'.\utils::GetCurrentEnvironment().'/dictionaries/*.dict.php') as $sDictFile){
-			if (preg_match('/.*\\/(.*).dict.php/', $sDictFile, $aMatches)){
-				$sLangCode = $aMatches[1];
-				$aDictFiles[$sLangCode] = [
-					'lang' => $sLangCode,
-					'file' => $sDictFile
-				];
-			}
-		}
-		return $aDictFiles;
-	}
 }

tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php

@@ -22,6 +22,7 @@ use utils;
 
 /**
  * @package Combodo\iTop\Test\UnitTest\Setup
+ * @group beforeSetup
  */
 class iTopModulesPhpVersionIntegrationTest extends ItopTestCase {
 	/**

tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php

@@ -24,6 +24,7 @@ use iTopDesignFormat;
  * @covers iTopDesignFormat
  *
  * @package Combodo\iTop\Test\UnitTest\Setup
+ * @group beforeSetup
  */
 class iTopModulesXmlVersionIntegrationTest extends ItopTestCase
 {

tests/php-unit-tests/integration-tests/iTopXmlVersionChecklistTest.php

@@ -20,6 +20,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
 /**
  * @package Combodo\iTop\Test\UnitTest\Setup
+ * @group beforeSetup
  */
 class iTopXmlVersionIntegrationTest extends ItopTestCase
 {