OK for ModelHighAPI and ParametersPlugin

diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake
index a9a5d46e737eb4cfa71ef74f77104a969a866569..6e9cb57d4cc421d0576bdc9de3f968cce80df252 100644 (file)
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@ -35,4 +35,6 @@ SUBDIRS(ConnectorAPI
         ExchangePlugin
         PythonAPI
         GeomAPI
+        ModelHighAPI
+        ParametersPlugin
 )

diff --git a/src/ModelHighAPI/CMakeLists.txt b/src/ModelHighAPI/CMakeLists.txt
index e52c3807d8448c4a7148890c1fbe42f1d1ae4e30..268b3cdf52e7f4b87520c07c995b6ca2d139713e 100644 (file)
--- a/src/ModelHighAPI/CMakeLists.txt
+++ b/src/ModelHighAPI/CMakeLists.txt
@@ -116,17 +116,23 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ModelHighAPI.py DESTINATION ${SHAPER_I
 
 INCLUDE(UnitTest)
 
-ADD_UNIT_TESTS(
-  TestDouble.py
-  TestInteger.py
-  TestRefAttr.py
-  TestReference.py
-  TestDeflectionDump.py
-  TestUndoRedo.py
-  Test2488.py
-  Test18451.py
-  Test19031.py
-  Test19990_1.py
-  Test19990_2.py
-  Test20167.py
-)
+include(tests.set)
+
+ADD_UNIT_TESTS(${TEST_NAMES})
+
+if(${HAVE_SALOME})
+  enable_testing()
+  set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/ModelHighAPI")
+  
+  install(FILES CTestTestfileInstall.cmake
+  DESTINATION ${TEST_INSTALL_DIRECTORY}
+  RENAME CTestTestfile.cmake)
+  install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
+  
+  set(TMP_TESTS_NAMES)
+  foreach(tfile ${TEST_NAMES})
+    list(APPEND TMP_TESTS_NAMES "Test/${tfile}")
+  endforeach(tfile ${TEST_NAMES})
+  
+  install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY})
+endif(${HAVE_SALOME})

diff --git a/src/ModelHighAPI/CTestTestfileInstall.cmake b/src/ModelHighAPI/CTestTestfileInstall.cmake
new file mode 100644 (file)
index 0000000..ceaee95
--- /dev/null
+++ b/src/ModelHighAPI/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2021  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include(tests.set)
+
+foreach(tfile ${TEST_NAMES})
+  set(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  add_test(${TEST_NAME} python ${tfile})
+  set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${SALOME_TEST_LABEL_ADV}")
+endforeach()

diff --git a/src/ModelHighAPI/tests.set b/src/ModelHighAPI/tests.set
new file mode 100644 (file)
index 0000000..626f238
--- /dev/null
+++ b/src/ModelHighAPI/tests.set
@@ -0,0 +1,33 @@
+# Copyright (C) 2021  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES
+  TestDouble.py
+  TestInteger.py
+  TestRefAttr.py
+  TestReference.py
+  TestDeflectionDump.py
+  TestUndoRedo.py
+  Test2488.py
+  Test18451.py
+  Test19031.py
+  Test19990_1.py
+  Test19990_2.py
+  Test20167.py
+)

diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt
index 89b45c450620bf1beff857fae6042db6f5600843..9776dc2996f57a64fcf4b1af34956f537738583b 100644 (file)
--- a/src/ParametersPlugin/CMakeLists.txt
+++ b/src/ParametersPlugin/CMakeLists.txt
@@ -118,14 +118,23 @@ INSTALL(TARGETS ParametersPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 INSTALL(FILES ${QM_RESOURCES} DESTINATION ${SHAPER_INSTALL_QM_RESOURCES})
 
-ADD_UNIT_TESTS(TestParameterCreation.py
-               TestParameterRename.py
-               TestParameterChangeValue.py
-               TestParameterDelete.py
-               TestParameterErrorMsg.py
-               TestParametersMgr.py
-               Test1806.py
-               Test2392.py
-               Test2474.py
-               Test19036.py
-              )
+include(tests.set)
+
+ADD_UNIT_TESTS(${TEST_NAMES})
+
+if(${HAVE_SALOME})
+  enable_testing()
+  set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/ParametersPlugin")
+  
+  install(FILES CTestTestfileInstall.cmake
+  DESTINATION ${TEST_INSTALL_DIRECTORY}
+  RENAME CTestTestfile.cmake)
+  install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
+  
+  set(TMP_TESTS_NAMES)
+  foreach(tfile ${TEST_NAMES})
+    list(APPEND TMP_TESTS_NAMES "Test/${tfile}")
+  endforeach(tfile ${TEST_NAMES})
+  
+  install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY})
+endif(${HAVE_SALOME})

diff --git a/src/ParametersPlugin/CTestTestfileInstall.cmake b/src/ParametersPlugin/CTestTestfileInstall.cmake
new file mode 100644 (file)
index 0000000..ceaee95
--- /dev/null
+++ b/src/ParametersPlugin/CTestTestfileInstall.cmake
@@ -0,0 +1,26 @@
+# Copyright (C) 2021  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include(tests.set)
+
+foreach(tfile ${TEST_NAMES})
+  set(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  add_test(${TEST_NAME} python ${tfile})
+  set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${SALOME_TEST_LABEL_ADV}")
+endforeach()

diff --git a/src/ParametersPlugin/tests.set b/src/ParametersPlugin/tests.set
new file mode 100644 (file)
index 0000000..48514ff
--- /dev/null
+++ b/src/ParametersPlugin/tests.set
@@ -0,0 +1,31 @@
+# Copyright (C) 2021  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(TEST_NAMES
+               TestParameterCreation.py
+               TestParameterRename.py
+               TestParameterChangeValue.py
+               TestParameterDelete.py
+               TestParameterErrorMsg.py
+               TestParametersMgr.py
+               Test1806.py
+               Test2392.py
+               Test2474.py
+               Test19036.py
+)