From ba8ea1fc819f16073625833b572b15fd1db8469f Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 10 Mar 2021 12:37:25 +0100 Subject: [PATCH] 28 tests of PythonAPI in salome test mechanism --- src/CTestTestfileInstall.cmake | 1 + src/PythonAPI/CMakeLists.txt | 54 +++++++++--------------- src/PythonAPI/CTestTestfileInstall.cmake | 26 ++++++++++++ src/PythonAPI/tests.set | 53 +++++++++++++++++++++++ 4 files changed, 100 insertions(+), 34 deletions(-) create mode 100644 src/PythonAPI/CTestTestfileInstall.cmake create mode 100644 src/PythonAPI/tests.set diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index ebf749335..a2dff6f04 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake @@ -33,4 +33,5 @@ SUBDIRS(ConnectorAPI CollectionPlugin BuildPlugin ExchangePlugin + PythonAPI ) diff --git a/src/PythonAPI/CMakeLists.txt b/src/PythonAPI/CMakeLists.txt index b1c14f67c..2e97d3a89 100644 --- a/src/PythonAPI/CMakeLists.txt +++ b/src/PythonAPI/CMakeLists.txt @@ -25,37 +25,23 @@ INSTALL(FILES initConfig.py DESTINATION ${SHAPER_INSTALL_PYTHON_API}) # --------- Unit tests ----------- INCLUDE(UnitTest) -ADD_UNIT_TESTS( - TestPythonAPI.py - TestModel.py - - TestSketcherAddPoint.py - TestSketcherAddLine.py - TestSketcherAddArc.py - TestSketcherAddCircle.py - TestSketcherAddMirror.py - TestSketcherSetCoincident.py - TestSketcherSetTangent.py - TestSketcherSetParallel.py - TestSketcherSetPerpendicular.py - TestSketcherSetHorizontal.py - TestSketcherSetVertical.py - TestSketcherSetFixed.py - TestSketcherSetLength.py - TestSketcherSetRadius.py - TestSketcherSetAngle.py - TestSketcherSetEqual.py - TestSketcherSetFillet.py - - TestFeatures.py - TestFeaturesExtrusion.py - TestFeaturesRevolution.py - - TestPrimitivesBox.py - - TestMakeBrick1.py - TestMakeBrick2.py - TestPlatine.py - - Test2044.py - ) +include(tests.set) + +ADD_UNIT_TESTS(${TEST_NAMES}) + +if(${HAVE_SALOME}) + enable_testing() + set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/PythonAPI") + + 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/PythonAPI/CTestTestfileInstall.cmake b/src/PythonAPI/CTestTestfileInstall.cmake new file mode 100644 index 000000000..ceaee95f9 --- /dev/null +++ b/src/PythonAPI/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/PythonAPI/tests.set b/src/PythonAPI/tests.set new file mode 100644 index 000000000..2781db704 --- /dev/null +++ b/src/PythonAPI/tests.set @@ -0,0 +1,53 @@ +# 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 + TestPythonAPI.py + TestModel.py + + TestSketcherAddPoint.py + TestSketcherAddLine.py + TestSketcherAddArc.py + TestSketcherAddCircle.py + TestSketcherAddMirror.py + TestSketcherSetCoincident.py + TestSketcherSetTangent.py + TestSketcherSetParallel.py + TestSketcherSetPerpendicular.py + TestSketcherSetHorizontal.py + TestSketcherSetVertical.py + TestSketcherSetFixed.py + TestSketcherSetLength.py + TestSketcherSetRadius.py + TestSketcherSetAngle.py + TestSketcherSetEqual.py + TestSketcherSetFillet.py + + TestFeatures.py + TestFeaturesExtrusion.py + TestFeaturesRevolution.py + + TestPrimitivesBox.py + + TestMakeBrick1.py + TestMakeBrick2.py + TestPlatine.py + + Test2044.py +) -- 2.39.2