From 47267bfa3f1937543c5490cbd719470e693426a7 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 10 Mar 2021 11:39:39 +0100 Subject: [PATCH] 51 tests of CollectionPlugin in salome test mechanism --- src/CTestTestfileInstall.cmake | 1 + src/CollectionPlugin/CMakeLists.txt | 73 +++++-------------- .../CTestTestfileInstall.cmake | 26 +++++++ src/CollectionPlugin/tests.set | 72 ++++++++++++++++++ 4 files changed, 119 insertions(+), 53 deletions(-) create mode 100644 src/CollectionPlugin/CTestTestfileInstall.cmake create mode 100644 src/CollectionPlugin/tests.set diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index b2620f5ce..bb9876514 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake @@ -30,4 +30,5 @@ SUBDIRS(ConnectorAPI SketchPlugin ModelAPI FiltersPlugin + CollectionPlugin ) diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt index bd65ca86a..a14e4f2bc 100644 --- a/src/CollectionPlugin/CMakeLists.txt +++ b/src/CollectionPlugin/CMakeLists.txt @@ -115,56 +115,23 @@ INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Collection) INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) -ADD_UNIT_TESTS( - TestGroup.py - TestGroup2.py - TestField.py - TestGroup1799.py - TestGroupMove01.py - TestGroupMove02.py - TestGroupMove03.py - TestGroupMove04.py - TestGroupMove05.py - TestGroupMove06.py - TestGroupMove07.py - TestGroupMove08.py - TestGroupMove09.py - TestGroupMove10.py - TestGroupMove11.py - TestGroupMove12.py - TestGroupMove13.py - TestGroupMove14.py - TestGroupMove15.py - TestGroupMove16.py - TestGroupMove17.py - TestGroupMove18.py - TestGroupMove19.py - TestGroupMove20.py - TestGroupMove21.py - TestGroupMove22.py - TestGroupMove23.py - TestGroupMove24.py - TestGroupMove25.py - TestGroupMove26.py - TestGroupShareTopology.py - TestGroupAddition.py - TestGroupAddition_Error.py - TestGroupIntersection.py - TestGroupIntersection_Error.py - TestGroupSubstraction.py - TestGroupSubstraction2.py - TestGroupSubstraction_Error1.py - TestGroupSubstraction_Error2.py - Test2977.py - TestGroupWholeResult1.py - TestGroupWholeResult2.py - Test3031.py - TestGroupWholeFeature1.py - TestGroupWholeFeature2.py - TestGroupMoveAndSplit1.py - TestGroupMoveAndSplit2.py - TestGroupMoveAndSplit3.py - TestGroupMoveAndSplit4.py - Test3114.py - Test18739.py -) +include(tests.set) + +ADD_UNIT_TESTS(${TEST_NAMES}) + +if(${HAVE_SALOME}) + enable_testing() + set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/CollectionPlugin") + + 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/CollectionPlugin/CTestTestfileInstall.cmake b/src/CollectionPlugin/CTestTestfileInstall.cmake new file mode 100644 index 000000000..ceaee95f9 --- /dev/null +++ b/src/CollectionPlugin/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/CollectionPlugin/tests.set b/src/CollectionPlugin/tests.set new file mode 100644 index 000000000..387c5af8b --- /dev/null +++ b/src/CollectionPlugin/tests.set @@ -0,0 +1,72 @@ +# 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 + TestGroup.py + TestGroup2.py + TestField.py + TestGroup1799.py + TestGroupMove01.py + TestGroupMove02.py + TestGroupMove03.py + TestGroupMove04.py + TestGroupMove05.py + TestGroupMove06.py + TestGroupMove07.py + TestGroupMove08.py + TestGroupMove09.py + TestGroupMove10.py + TestGroupMove11.py + TestGroupMove12.py + TestGroupMove13.py + TestGroupMove14.py + TestGroupMove15.py + TestGroupMove16.py + TestGroupMove17.py + TestGroupMove18.py + TestGroupMove19.py + TestGroupMove20.py + TestGroupMove21.py + TestGroupMove22.py + TestGroupMove23.py + TestGroupMove24.py + TestGroupMove25.py + TestGroupMove26.py + TestGroupShareTopology.py + TestGroupAddition.py + TestGroupAddition_Error.py + TestGroupIntersection.py + TestGroupIntersection_Error.py + TestGroupSubstraction.py + TestGroupSubstraction2.py + TestGroupSubstraction_Error1.py + TestGroupSubstraction_Error2.py + Test2977.py + TestGroupWholeResult1.py + TestGroupWholeResult2.py + Test3031.py + TestGroupWholeFeature1.py + TestGroupWholeFeature2.py + TestGroupMoveAndSplit1.py + TestGroupMoveAndSplit2.py + TestGroupMoveAndSplit3.py + TestGroupMoveAndSplit4.py + Test3114.py + Test18739.py +) \ No newline at end of file -- 2.39.2