mv unit tests directories to test/UnitTests

KhiopsML · Mar 18, 2024 · 8291dee · 8291dee
1 parent e6ded73
commit 8291dee
Show file tree

Hide file tree

Showing 51 changed files with 40 additions and 40 deletions.
diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
@@ -12,8 +12,8 @@ on:
       - src/**.inc
       - src/**.lex
       - src/**.yac
-      - test/**.h
-      - test/**.cpp
+      - test/UnitTests/**.h
+      - test/UnitTests/**.cpp
 # Cancel any ongoing run of this workflow on the same PR or ref
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
@@ -78,12 +78,12 @@ jobs:
         if: success() || failure()
         run: |
           if (grep -q -E -r "Assert failed in file|Require failed in file|Ensure failed in file|Check failed in file" \
-            test/KNITest/results/ \
-            test/Norm/results/ \
-            test/Learning/results/ \
-            test/Norm/results/ \
-            test/Parallel/results/ \
-            test/Parallel-mpi/results/); then
+            test/UnitTests/KNItestresults/ \
+            test/UnitTests/Norm/results/ \
+            test/UnitTests/Learning/results/ \
+            test/UnitTests/Norm/results/ \
+            test/UnitTests/Parallel/results/ \
+            test/UnitTests/Parallel-mpi/results/); then
             echo "::error::At least one test binary has failed with an assertion (assert, check, require, ensure..). Check result files available for download as artifacts."
           fi
       - name: Upload test results
@@ -93,12 +93,12 @@ jobs:
           name: unit-tests-results-${{ matrix.build-setup.os }}
           retention-days: 7
           path: |-
-            test/KNITest/results/
-            test/Norm/results/
-            test/Learning/results/
-            test/Norm/results/
-            test/Parallel/results/
-            test/Parallel-mpi/results/
+            test/UnitTests/KNItest/results/
+            test/UnitTests/Norm/results/
+            test/UnitTests/Learning/results/
+            test/UnitTests/Norm/results/
+            test/UnitTests/Parallel/results/
+            test/UnitTests/Parallel-mpi/results/
       - name: Create Unit Test Reports Dashboards
         uses: phoenix-actions/test-reporting@v12
         if: success() || failure()

diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@ build/
 CMakeFiles/
 
 # Test exceptions
-test/*/results/
+test/UnitTests/*/results/
 test/LearningTest/*/*/*/results/
 comparisonResults.log
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -343,12 +343,12 @@ if(TESTING)
   enable_testing()
 
   # Add testing targets
-  add_subdirectory(test/Norm)
-  add_subdirectory(test/Parallel)
-  add_subdirectory(test/Parallel-mpi)
-  add_subdirectory(test/Learning)
-  add_subdirectory(test/KNITest)
-  add_subdirectory(test/Utils)
+  add_subdirectory(test/UnitTests/Norm)
+  add_subdirectory(test/UnitTests/Parallel)
+  add_subdirectory(test/UnitTests/Parallel-mpi)
+  add_subdirectory(test/UnitTests/Learning)
+  add_subdirectory(test/UnitTests/KNITest)
+  add_subdirectory(test/UnitTests/Utils)
 endif(TESTING)
 
 # Exclude googletest from the installation

diff --git a/test/KNITest/results.ref/KNI_Adult.txt b/test/KNITest/results.ref/KNI_Adult.txt
diff --git a/test/KNITest/CMakeLists.txt → test/UnitTests/KNITest/CMakeLists.txt b/test/KNITest/CMakeLists.txt → test/UnitTests/KNITest/CMakeLists.txt
diff --git a/test/KNITest/KNITest.cpp → test/UnitTests/KNITest/KNITest.cpp b/test/KNITest/KNITest.cpp → test/UnitTests/KNITest/KNITest.cpp
@@ -9,7 +9,7 @@
 
 #include "KNITest.h"
 #include "TestServices.h"
-#include "../../src/Learning/KNITransfer/KNIRecodeFile.cpp"
+#include "../../../src/Learning/KNITransfer/KNIRecodeFile.cpp"
 
 #define MAXITER 1000
 #define MAXBUFFERSIZE 1000
@@ -199,7 +199,7 @@ void TestIris()
 
 	sTestPath = FileService::GetPathName(__FILE__);
 	sDictionaryPath = FileService::BuildFilePathName(sTestPath, "ModelingIris.kdic");
-	sDataPath = FileService::BuildFilePathName(sTestPath, "../LearningTest/datasets/Iris/Iris.txt");
+	sDataPath = FileService::BuildFilePathName(sTestPath, "../../LearningTest/datasets/Iris/Iris.txt");
 	sOutputPath = sTestPath + "results" + FileService::GetFileSeparator() + "R_Iris.txt";
 	sRefFilePath = sTestPath + "results.ref" + FileService::GetFileSeparator() + "R_Iris.txt";
 
@@ -232,8 +232,8 @@ void TestAdult()
 	boolean bOk;
 
 	sTestPath = FileService::GetPathName(__FILE__);
-	sDictionaryPath = FileService::BuildFilePathName(sTestPath, "../LearningTest/datasets/Adult/Adult.kdic");
-	sDataPath = FileService::BuildFilePathName(sTestPath, "../LearningTest/datasets/Adult/Adult.txt");
+	sDictionaryPath = FileService::BuildFilePathName(sTestPath, "../../LearningTest/datasets/Adult/Adult.kdic");
+	sDataPath = FileService::BuildFilePathName(sTestPath, "../../LearningTest/datasets/Adult/Adult.txt");
 	sOutputPath = sTestPath + "results" + FileService::GetFileSeparator() + "R_Adult.txt";
 
 	// Test de deploiement

diff --git a/test/KNITest/KNITest.h → test/UnitTests/KNITest/KNITest.h b/test/KNITest/KNITest.h → test/UnitTests/KNITest/KNITest.h
@@ -10,4 +10,4 @@
 #include <string.h>
 
 #include "KhiopsNativeInterface.h"
-#include "../../src/Learning/KNITransfer/KNIRecodeFile.h"
+#include "../../../src/Learning/KNITransfer/KNIRecodeFile.h"
diff --git a/test/KNITest/ModelingIris.kdic → test/UnitTests/KNITest/ModelingIris.kdic b/test/KNITest/ModelingIris.kdic → test/UnitTests/KNITest/ModelingIris.kdic
diff --git a/test/UnitTests/KNITest/results.ref/KNI_Adult.txt b/test/UnitTests/KNITest/results.ref/KNI_Adult.txt
@@ -0,0 +1,5 @@
+
+Recode records of @ROOT_DIR@/UnitTests/KNITest/../../LearningTest/datasets/Adult/Adult.txt to @ROOT_DIR@/UnitTests/KNITest/results/R_Adult.txt
+Recoded record number: 48842
+
+End test Adult
diff --git a/test/KNITest/results.ref/KNI_Iris.txt → ...nitTests/KNITest/results.ref/KNI_Iris.txt b/test/KNITest/results.ref/KNI_Iris.txt → ...nitTests/KNITest/results.ref/KNI_Iris.txt
@@ -1,7 +1,7 @@
 Begin test KNI
 SYS KNI version: 110
 SYS KNI full version: 10.1.5
-Open stream @ROOT_DIR@/test/KNITest/ModelingIris.kdic SNB_Iris: 1
+Open stream @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic SNB_Iris: 1
 Recode stream record Iris-setosa	Iris-setosa	0.9960418693	0.001979090503	0.001979040221: 0
 Recode stream record Iris-virginica	Iris-virginica	0.00198971666	0.03512915094	0.9628811324: 0
 Recode invalid stream record : -14
@@ -14,12 +14,12 @@ Recode stream record with negative output size : -15
 Wrong parameter tests
 Open stream with NULL dictionary file NULL SNB_Iris: -2
 Open stream with missing dictionary file WrongFile SNB_Iris: -3
-Open stream with invalid dictionary file @ROOT_DIR@/test/KNITest/../LearningTest/datasets/Iris/Iris.txt SNB_Iris: -4
-Open stream with NULL dictionary @ROOT_DIR@/test/KNITest/ModelingIris.kdic NULL: -5
-Open stream with missing dictionary @ROOT_DIR@/test/KNITest/ModelingIris.kdic WrongDic: -6
-Open stream with NULL header line @ROOT_DIR@/test/KNITest/ModelingIris.kdic SNB_Iris: -8
-Open stream with bad header line @ROOT_DIR@/test/KNITest/ModelingIris.kdic SNB_Iris: -23
-Open stream with eol separator @ROOT_DIR@/test/KNITest/ModelingIris.kdic SNB_Iris: -9
+Open stream with invalid dictionary file @ROOT_DIR@/UnitTests/KNITest/../../LearningTest/datasets/Iris/Iris.txt SNB_Iris: -4
+Open stream with NULL dictionary @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic NULL: -5
+Open stream with missing dictionary @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic WrongDic: -6
+Open stream with NULL header line @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic SNB_Iris: -8
+Open stream with bad header line @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic SNB_Iris: -23
+Open stream with eol separator @ROOT_DIR@/UnitTests/KNITest/ModelingIris.kdic SNB_Iris: -9
 Recode with wrong stream : -10
 Close wrong stream (-1): -10
 Close wrong stream (0): -10
@@ -30,7 +30,7 @@ SYS	=> stream index 317
 	=> Error -22
 Muliple close stream
 
-Recode records of @ROOT_DIR@/test/KNITest/../LearningTest/datasets/Iris/Iris.txt to @ROOT_DIR@/test/KNITest/results/R_Iris.txt
+Recode records of @ROOT_DIR@/UnitTests/KNITest/../../LearningTest/datasets/Iris/Iris.txt to @ROOT_DIR@/UnitTests/KNITest/results/R_Iris.txt
 Recoded record number: 150
 
 End test KNI
diff --git a/test/KNITest/results.ref/R_Iris.txt → .../UnitTests/KNITest/results.ref/R_Iris.txt b/test/KNITest/results.ref/R_Iris.txt → .../UnitTests/KNITest/results.ref/R_Iris.txt
diff --git a/test/Learning/CMakeLists.txt → test/UnitTests/Learning/CMakeLists.txt b/test/Learning/CMakeLists.txt → test/UnitTests/Learning/CMakeLists.txt
diff --git a/test/Learning/Learning_test.cpp → test/UnitTests/Learning/Learning_test.cpp b/test/Learning/Learning_test.cpp → test/UnitTests/Learning/Learning_test.cpp
diff --git a/.../KWDataPreparation_KWProbabilityTable.txt → .../KWDataPreparation_KWProbabilityTable.txt b/.../KWDataPreparation_KWProbabilityTable.txt → .../KWDataPreparation_KWProbabilityTable.txt
diff --git a/...Preparation_KWQuantileIntervalBuilder.txt → ...Preparation_KWQuantileIntervalBuilder.txt b/...Preparation_KWQuantileIntervalBuilder.txt → ...Preparation_KWQuantileIntervalBuilder.txt
diff --git a/test/Learning/results.ref/KWData_KWClass.txt → ...s/Learning/results.ref/KWData_KWClass.txt b/test/Learning/results.ref/KWData_KWClass.txt → ...s/Learning/results.ref/KWData_KWClass.txt
diff --git a/...ning/results.ref/KWData_KWClassDomain.txt → ...ning/results.ref/KWData_KWClassDomain.txt b/...ning/results.ref/KWData_KWClassDomain.txt → ...ning/results.ref/KWData_KWClassDomain.txt
diff --git a/test/Norm/CMakeLists.txt → test/UnitTests/Norm/CMakeLists.txt b/test/Norm/CMakeLists.txt → test/UnitTests/Norm/CMakeLists.txt
diff --git a/test/Norm/Nom_test.cpp → test/UnitTests/Norm/Nom_test.cpp b/test/Norm/Nom_test.cpp → test/UnitTests/Norm/Nom_test.cpp
diff --git a/test/Norm/results.ref/base_ALString.txt → ...tTests/Norm/results.ref/base_ALString.txt b/test/Norm/results.ref/base_ALString.txt → ...tTests/Norm/results.ref/base_ALString.txt
diff --git a/test/Norm/results.ref/base_CharVector.txt → ...ests/Norm/results.ref/base_CharVector.txt b/test/Norm/results.ref/base_CharVector.txt → ...ests/Norm/results.ref/base_CharVector.txt
diff --git a/test/Norm/results.ref/base_DoubleVector.txt → ...ts/Norm/results.ref/base_DoubleVector.txt b/test/Norm/results.ref/base_DoubleVector.txt → ...ts/Norm/results.ref/base_DoubleVector.txt
diff --git a/test/Norm/results.ref/base_Error.txt → ...UnitTests/Norm/results.ref/base_Error.txt b/test/Norm/results.ref/base_Error.txt → ...UnitTests/Norm/results.ref/base_Error.txt
diff --git a/test/Norm/results.ref/base_FileService.txt → ...sts/Norm/results.ref/base_FileService.txt b/test/Norm/results.ref/base_FileService.txt → ...sts/Norm/results.ref/base_FileService.txt
diff --git a/test/Norm/results.ref/base_IntVector.txt → ...Tests/Norm/results.ref/base_IntVector.txt b/test/Norm/results.ref/base_IntVector.txt → ...Tests/Norm/results.ref/base_IntVector.txt
diff --git a/...rm/results.ref/base_LongintDictionary.txt → ...rm/results.ref/base_LongintDictionary.txt b/...rm/results.ref/base_LongintDictionary.txt → ...rm/results.ref/base_LongintDictionary.txt
diff --git a/....ref/base_LongintNumericKeyDictionary.txt → ....ref/base_LongintNumericKeyDictionary.txt b/....ref/base_LongintNumericKeyDictionary.txt → ....ref/base_LongintNumericKeyDictionary.txt
diff --git a/test/Norm/results.ref/base_LongintVector.txt → ...s/Norm/results.ref/base_LongintVector.txt b/test/Norm/results.ref/base_LongintVector.txt → ...s/Norm/results.ref/base_LongintVector.txt
diff --git a/test/Norm/results.ref/base_Mem.txt → test/UnitTests/Norm/results.ref/base_Mem.txt b/test/Norm/results.ref/base_Mem.txt → test/UnitTests/Norm/results.ref/base_Mem.txt
diff --git a/...results.ref/base_NumericKeyDictionary.txt → ...results.ref/base_NumericKeyDictionary.txt b/...results.ref/base_NumericKeyDictionary.txt → ...results.ref/base_NumericKeyDictionary.txt
diff --git a/test/Norm/results.ref/base_ObjectArray.txt → ...sts/Norm/results.ref/base_ObjectArray.txt b/test/Norm/results.ref/base_ObjectArray.txt → ...sts/Norm/results.ref/base_ObjectArray.txt
diff --git a/...orm/results.ref/base_ObjectDictionary.txt → ...orm/results.ref/base_ObjectDictionary.txt b/...orm/results.ref/base_ObjectDictionary.txt → ...orm/results.ref/base_ObjectDictionary.txt
diff --git a/test/Norm/results.ref/base_ObjectList.txt → ...ests/Norm/results.ref/base_ObjectList.txt b/test/Norm/results.ref/base_ObjectList.txt → ...ests/Norm/results.ref/base_ObjectList.txt
diff --git a/test/Norm/results.ref/base_Random.txt → ...nitTests/Norm/results.ref/base_Random.txt b/test/Norm/results.ref/base_Random.txt → ...nitTests/Norm/results.ref/base_Random.txt
diff --git a/test/Norm/results.ref/base_Regex.txt → ...UnitTests/Norm/results.ref/base_Regex.txt b/test/Norm/results.ref/base_Regex.txt → ...UnitTests/Norm/results.ref/base_Regex.txt
diff --git a/test/Norm/results.ref/base_SortedList.txt → ...ests/Norm/results.ref/base_SortedList.txt b/test/Norm/results.ref/base_SortedList.txt → ...ests/Norm/results.ref/base_SortedList.txt
diff --git a/test/Norm/results.ref/base_StringVector.txt → ...ts/Norm/results.ref/base_StringVector.txt b/test/Norm/results.ref/base_StringVector.txt → ...ts/Norm/results.ref/base_StringVector.txt
diff --git a/.../Norm/results.ref/base_SystemResource.txt → .../Norm/results.ref/base_SystemResource.txt b/.../Norm/results.ref/base_SystemResource.txt → .../Norm/results.ref/base_SystemResource.txt
diff --git a/test/Norm/results.ref/base_Timer.txt → ...UnitTests/Norm/results.ref/base_Timer.txt b/test/Norm/results.ref/base_Timer.txt → ...UnitTests/Norm/results.ref/base_Timer.txt
diff --git a/test/Parallel-mpi/CMakeLists.txt → test/UnitTests/Parallel-mpi/CMakeLists.txt b/test/Parallel-mpi/CMakeLists.txt → test/UnitTests/Parallel-mpi/CMakeLists.txt
diff --git a/test/Parallel-mpi/PEProtocolTest.cpp → ...UnitTests/Parallel-mpi/PEProtocolTest.cpp b/test/Parallel-mpi/PEProtocolTest.cpp → ...UnitTests/Parallel-mpi/PEProtocolTest.cpp
diff --git a/test/Parallel-mpi/main.cpp → test/UnitTests/Parallel-mpi/main.cpp b/test/Parallel-mpi/main.cpp → test/UnitTests/Parallel-mpi/main.cpp
diff --git a/test/Parallel/CMakeLists.txt → test/UnitTests/Parallel/CMakeLists.txt b/test/Parallel/CMakeLists.txt → test/UnitTests/Parallel/CMakeLists.txt
diff --git a/test/Parallel/PLSerializer_test.cpp → .../UnitTests/Parallel/PLSerializer_test.cpp b/test/Parallel/PLSerializer_test.cpp → .../UnitTests/Parallel/PLSerializer_test.cpp
diff --git a/...arallel/results.ref/PLSerializer_full.txt → ...arallel/results.ref/PLSerializer_full.txt b/...arallel/results.ref/PLSerializer_full.txt → ...arallel/results.ref/PLSerializer_full.txt
diff --git a/...allel/results.ref/resourceManager.log.ref → ...allel/results.ref/resourceManager.log.ref b/...allel/results.ref/resourceManager.log.ref → ...allel/results.ref/resourceManager.log.ref
diff --git a/test/Utils/CMakeLists.txt → test/UnitTests/Utils/CMakeLists.txt b/test/Utils/CMakeLists.txt → test/UnitTests/Utils/CMakeLists.txt
diff --git a/test/Utils/MpiEnvironment.h → test/UnitTests/Utils/MpiEnvironment.h b/test/Utils/MpiEnvironment.h → test/UnitTests/Utils/MpiEnvironment.h
diff --git a/test/Utils/ParallelTest.h → test/UnitTests/Utils/ParallelTest.h b/test/Utils/ParallelTest.h → test/UnitTests/Utils/ParallelTest.h
diff --git a/test/Utils/TestServices.cpp → test/UnitTests/Utils/TestServices.cpp b/test/Utils/TestServices.cpp → test/UnitTests/Utils/TestServices.cpp
diff --git a/test/Utils/TestServices.h → test/UnitTests/Utils/TestServices.h b/test/Utils/TestServices.h → test/UnitTests/Utils/TestServices.h
@@ -38,7 +38,7 @@
 // Pour que le test soit valide sur differentes machines, il faut si necessaire remplacer
 // dans le fichier de reference les chemins propres à l'environnement par des tags, a savoir :
 //  - le repertoire temporaire par @TMP_DIR@
-//	- le repertoire qui contient le projet khiops par @ROOT_DIR@
+//	- le repertoire qui contient le projet des tests unitaires par @ROOT_DIR@
 // Cela concerne essentiellement les tests impliquant des fichiers temporaires.
 //
 // Le test est reussi lorsque les 2 fichiers sont identiques (a l'exception des