From 3045a27b2e007c877f2adce71d7e02b24901fbf3 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 10 Mar 2021 11:44:38 +0100 Subject: [PATCH] 53 tests of BuildPlugin in salome test mechanism --- src/BuildPlugin/CMakeLists.txt | 74 ++++++---------------- src/BuildPlugin/CTestTestfileInstall.cmake | 26 ++++++++ src/BuildPlugin/tests.set | 74 ++++++++++++++++++++++ src/CTestTestfileInstall.cmake | 1 + 4 files changed, 121 insertions(+), 54 deletions(-) create mode 100644 src/BuildPlugin/CTestTestfileInstall.cmake create mode 100644 src/BuildPlugin/tests.set diff --git a/src/BuildPlugin/CMakeLists.txt b/src/BuildPlugin/CMakeLists.txt index be036a0a6..9b2092c55 100644 --- a/src/BuildPlugin/CMakeLists.txt +++ b/src/BuildPlugin/CMakeLists.txt @@ -115,57 +115,23 @@ INSTALL(TARGETS BuildPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Build) -ADD_UNIT_TESTS(TestVertex.py - TestVertex_ErrorMsg.py - TestVertex_WholeSketch_1.py - TestVertex_WholeSketch_2.py - TestEdge.py - TestEdge_ByPoints.py - TestEdge_ErrorMsg.py - TestEdge_WholeSketch_1.py - TestEdge_WholeSketch_2.py - TestEdge_WholeSketch_3.py - TestEdge_WholeSketch_4.py - TestWire.py - TestWire_ErrorMsg.py - TestWire_WholeSketch_1.py - TestWire_WholeSketch_2.py - TestWire_WholeSketch_3.py - TestWire_WholeSketch_4.py - TestWire_WholeSketch_5.py - TestWire_WholeSketch_6.py - TestPolyline.py - TestInterpolation.py - TestFace.py - TestFace_ErrorMsg.py - TestFace_WholeSketch_1.py - TestFace_WholeSketch_2.py - TestShell.py - TestShell_WholeSketch_1.py - TestShell_WholeSketch_2.py - TestSolid.py - TestSolid_ErrorMsg.py - TestCompSolid.py - TestCompound.py - TestCompound_ErrorMsg.py - TestCompound_History.py - TestSubShapes.py - TestSubShapes_ErrorMsg.py - TestFilling.py - TestFilling_ByEdges.py - TestFilling_ByWires.py - TestFilling_Mixed.py - TestFilling_ErrorMsg.py - Test1920.py - Test2398.py - Test2409.py - Test2415.py - Test2439.py - Test2454.py - Test3125.py - Test3271.py - Test19056.py - Test20469.py - Test20513_1.py - Test20513_2.py -) +include(tests.set) + +ADD_UNIT_TESTS(${TEST_NAMES}) + +if(${HAVE_SALOME}) + enable_testing() + set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/BuildPlugin") + + 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/BuildPlugin/CTestTestfileInstall.cmake b/src/BuildPlugin/CTestTestfileInstall.cmake new file mode 100644 index 000000000..ceaee95f9 --- /dev/null +++ b/src/BuildPlugin/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/BuildPlugin/tests.set b/src/BuildPlugin/tests.set new file mode 100644 index 000000000..fde203508 --- /dev/null +++ b/src/BuildPlugin/tests.set @@ -0,0 +1,74 @@ +# 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 + TestVertex.py + TestVertex_ErrorMsg.py + TestVertex_WholeSketch_1.py + TestVertex_WholeSketch_2.py + TestEdge.py + TestEdge_ByPoints.py + TestEdge_ErrorMsg.py + TestEdge_WholeSketch_1.py + TestEdge_WholeSketch_2.py + TestEdge_WholeSketch_3.py + TestEdge_WholeSketch_4.py + TestWire.py + TestWire_ErrorMsg.py + TestWire_WholeSketch_1.py + TestWire_WholeSketch_2.py + TestWire_WholeSketch_3.py + TestWire_WholeSketch_4.py + TestWire_WholeSketch_5.py + TestWire_WholeSketch_6.py + TestPolyline.py + TestInterpolation.py + TestFace.py + TestFace_ErrorMsg.py + TestFace_WholeSketch_1.py + TestFace_WholeSketch_2.py + TestShell.py + TestShell_WholeSketch_1.py + TestShell_WholeSketch_2.py + TestSolid.py + TestSolid_ErrorMsg.py + TestCompSolid.py + TestCompound.py + TestCompound_ErrorMsg.py + TestCompound_History.py + TestSubShapes.py + TestSubShapes_ErrorMsg.py + TestFilling.py + TestFilling_ByEdges.py + TestFilling_ByWires.py + TestFilling_Mixed.py + TestFilling_ErrorMsg.py + Test1920.py + Test2398.py + Test2409.py + Test2415.py + Test2439.py + Test2454.py + Test3125.py + Test3271.py + Test19056.py + Test20469.py + Test20513_1.py + Test20513_2.py +) \ No newline at end of file diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index bb9876514..039d47ff8 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake @@ -31,4 +31,5 @@ SUBDIRS(ConnectorAPI ModelAPI FiltersPlugin CollectionPlugin + BuildPlugin ) -- 2.39.2