From 94585b6c7026d6ba622a5560ff538a145d911849 Mon Sep 17 00:00:00 2001 From: sbh Date: Thu, 24 Jul 2014 17:22:09 +0400 Subject: [PATCH] TestSketchBasics.py has been refactored --- src/GeomDataAPI/CMakeLists.txt | 3 +++ src/GeomDataAPI/Test/TestConstants.py | 7 ++++++ src/ModelAPI/CMakeLists.txt | 4 ++-- src/ModelAPI/Test/TestConstants.py | 10 ++++++++ src/SketchPlugin/CMakeLists.txt | 2 +- ...SketchBasics.py => TestSketchPointLine.py} | 23 ++----------------- 6 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 src/GeomDataAPI/Test/TestConstants.py create mode 100644 src/ModelAPI/Test/TestConstants.py rename src/SketchPlugin/Test/{TestSketchBasics.py => TestSketchPointLine.py} (79%) diff --git a/src/GeomDataAPI/CMakeLists.txt b/src/GeomDataAPI/CMakeLists.txt index 389463212..d956835d1 100644 --- a/src/GeomDataAPI/CMakeLists.txt +++ b/src/GeomDataAPI/CMakeLists.txt @@ -1,6 +1,7 @@ FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE(UnitTest) SET(PROJECT_HEADERS GeomDataAPI.h @@ -36,3 +37,5 @@ ENDIF(WIN32) INSTALL(TARGETS _GeomDataAPI DESTINATION swig) INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) + +ADD_UNIT_TESTS(TestConstants.py) diff --git a/src/GeomDataAPI/Test/TestConstants.py b/src/GeomDataAPI/Test/TestConstants.py new file mode 100644 index 000000000..bb6bc044a --- /dev/null +++ b/src/GeomDataAPI/Test/TestConstants.py @@ -0,0 +1,7 @@ +#=============================================================================== +# Test GeomDataAPI static methods +#=============================================================================== +from GeomDataAPI import * +assert (GeomDataAPI_Point.type() == "Point") +assert (GeomDataAPI_Dir.type() == "Dir") +assert (GeomDataAPI_Point2D.type() == "Point2D") \ No newline at end of file diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index c92f95df6..4d10c9ce1 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -77,5 +77,5 @@ INSTALL(TARGETS _ModelAPI DESTINATION swig) INSTALL(TARGETS ModelAPI DESTINATION bin) INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) -ADD_UNIT_TESTS(TestUndoRedo.py - ) +ADD_UNIT_TESTS(TestConstants.py + TestUndoRedo.py) diff --git a/src/ModelAPI/Test/TestConstants.py b/src/ModelAPI/Test/TestConstants.py new file mode 100644 index 000000000..fd851f310 --- /dev/null +++ b/src/ModelAPI/Test/TestConstants.py @@ -0,0 +1,10 @@ +#=============================================================================== +# Test ModelAPI static methods +#=============================================================================== +from ModelAPI import * +assert (ModelAPI_Feature.group() == "Features") +assert (ModelAPI_AttributeDocRef.type() == "DocRef") +assert (ModelAPI_AttributeDouble.type() == "Double") +assert (ModelAPI_AttributeReference.type() == "Reference") +assert (ModelAPI_AttributeRefAttr.type() == "RefAttr") +assert (ModelAPI_AttributeRefList.type() == "RefList") \ No newline at end of file diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 79404ee70..cbcfdc7a8 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -61,4 +61,4 @@ INCLUDE_DIRECTORIES( INSTALL(TARGETS SketchPlugin DESTINATION plugins) INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins) -ADD_UNIT_TESTS(TestSketchBasics.py) +ADD_UNIT_TESTS(TestSketchPointLine.py) diff --git a/src/SketchPlugin/Test/TestSketchBasics.py b/src/SketchPlugin/Test/TestSketchPointLine.py similarity index 79% rename from src/SketchPlugin/Test/TestSketchBasics.py rename to src/SketchPlugin/Test/TestSketchPointLine.py index b4889ea98..a03ca8fdf 100644 --- a/src/SketchPlugin/Test/TestSketchBasics.py +++ b/src/SketchPlugin/Test/TestSketchPointLine.py @@ -8,23 +8,6 @@ __updated__ = "2014-07-24" aPluginManager = ModelAPI_PluginManager.get() aDocument = aPluginManager.rootDocument() -#=============================================================================== -# Test ModelAPI static methods -# TODO: Move this test in the ModelAPI progect -#=============================================================================== -assert (ModelAPI_Feature.group() == "Features") -assert (ModelAPI_AttributeDocRef.type() == "DocRef") -assert (ModelAPI_AttributeDouble.type() == "Double") -assert (ModelAPI_AttributeReference.type() == "Reference") -assert (ModelAPI_AttributeRefAttr.type() == "RefAttr") -assert (ModelAPI_AttributeRefList.type() == "RefList") -#=============================================================================== -# Test GeomDataAPI static methods -# TODO: Move this test in the GeomDataAPI progect -#=============================================================================== -assert (GeomDataAPI_Point.type() == "Point") -assert (GeomDataAPI_Dir.type() == "Dir") -assert (GeomDataAPI_Point2D.type() == "Point2D") #========================================================================= # Creation of a sketch #========================================================================= @@ -91,6 +74,7 @@ aDocument.finishOperation() #=============================================================================== aDocument.startOperation() aSketchLine = aDocument.addFeature("SketchLine") +assert (aSketchLine.getKind() == "SketchLine") aSketchReflist.append(aSketchLine) assert (aSketchReflist.size() == 2) assert (len(aSketchReflist.list()) == 2) @@ -118,13 +102,10 @@ assert (aLineEndPoint.x() == 60.0) assert (aLineEndPoint.y() == 60.0) aDocument.finishOperation() #=============================================================================== -# Check results +# Check the results #=============================================================================== aResult = aSketchLine.firstResult() aResultConstruction = modelAPI_ResultConstruction(aResult) aShape = aResultConstruction.shape() assert (aShape is not None) assert (not aShape.isNull()) - #============================================================================== - # Finish the test - #============================================================================== -- 2.39.2