Make unit tests adopted to the updated API

diff --git a/src/FeaturesPlugin/Test/TestBoolean.py b/src/FeaturesPlugin/Test/TestBoolean.py
index d9a33eb1992157320084036eb738329118985273..767e51e15240ceac23d78b21f3e77d74e58e72c4 100644 (file)
--- a/src/FeaturesPlugin/Test/TestBoolean.py
+++ b/src/FeaturesPlugin/Test/TestBoolean.py
@@ -26,8 +26,8 @@ aSession = ModelAPI_Session.get()
 # Create a part for extrusions & boolean
 aSession.startOperation()
 aPartFeature = aSession.moduleDocument().addFeature("Part")
-aPart = aSession.activeDocument()
 aSession.finishOperation()
+aPart = aSession.activeDocument()
 #=========================================================================
 # Create a sketch with circle to extrude
 #=========================================================================
@@ -37,8 +37,6 @@ origin = geomDataAPI_Point(aCircleSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aCircleSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aCircleSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSketchCircle = aCircleSketchFeature.addFeature("SketchCircle")
@@ -56,8 +54,6 @@ origin = geomDataAPI_Point(aTriangleSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aTriangleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSketchLineA = aTriangleSketchFeature.addFeature("SketchLine")
@@ -88,11 +84,10 @@ for eachSketchFeature in [aCircleSketchFeature, aTriangleSketchFeature]:
     aSketchEdges = modelAPI_ResultConstruction(aSketchResult).shape()
     origin = geomDataAPI_Point(eachSketchFeature.attribute("Origin")).pnt()
     dirX = geomDataAPI_Dir(eachSketchFeature.attribute("DirX")).dir()
-    dirY = geomDataAPI_Dir(eachSketchFeature.attribute("DirY")).dir()
     norm = geomDataAPI_Dir(eachSketchFeature.attribute("Norm")).dir()
     aSketchFaces = ShapeList()
     GeomAlgoAPI_SketchBuilder.createFaces(
-        origin, dirX, dirY, norm, aSketchEdges, aSketchFaces)
+        origin, dirX, norm, aSketchEdges, aSketchFaces)
     # Create extrusion on them
     anExtrusionFt = aPart.addFeature("Extrusion")
     anExtrusionFt.selectionList("base").append(

diff --git a/src/FeaturesPlugin/Test/TestExtrusion.py b/src/FeaturesPlugin/Test/TestExtrusion.py
index fd2c2a8faea32cb072d3547b1f4c0161b19bacb8..bf5a2c0825e0a519747531c03e55b298fd1f8943 100644 (file)
--- a/src/FeaturesPlugin/Test/TestExtrusion.py
+++ b/src/FeaturesPlugin/Test/TestExtrusion.py
@@ -4,9 +4,9 @@
       
       class FeaturesPlugin_Extrusion : public ModelAPI_Feature
         static const std::string MY_EXTRUSION_ID("Extrusion");
-        static const std::string MY_FACE_ID("extrusion_face");
-        static const std::string MY_SIZE_ID("extrusion_size");
-        static const std::string MY_REVERSE_ID("extrusion_reverse");
+        static const std::string MY_FACE_ID("base");
+        static const std::string MY_SIZE_ID("size");
+        static const std::string MY_REVERSE_ID("reverse");
           
         data()->addAttribute(FeaturesPlugin_Extrusion::FACE_ID(), ModelAPI_AttributeSelection::typeId());
         data()->addAttribute(FeaturesPlugin_Extrusion::SIZE_ID(), ModelAPI_AttributeDouble::typeId());
@@ -42,8 +42,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 # Create circle
@@ -61,11 +59,10 @@ aSketchResult = aSketchFeature.firstResult()
 aSketchEdges = modelAPI_ResultConstruction(aSketchResult).shape()
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin")).pnt()
 dirX = geomDataAPI_Dir(aSketchFeature.attribute("DirX")).dir()
-dirY = geomDataAPI_Dir(aSketchFeature.attribute("DirY")).dir()
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm")).dir()
 aSketchFaces = ShapeList()
 GeomAlgoAPI_SketchBuilder.createFaces(
-    origin, dirX, dirY, norm, aSketchEdges, aSketchFaces)
+    origin, dirX, norm, aSketchEdges, aSketchFaces)
 assert (len(aSketchFaces) > 0)
 assert (aSketchFaces[0] is not None)
 # Create extrusion

diff --git a/src/FeaturesPlugin/Test/TestGroup.py b/src/FeaturesPlugin/Test/TestGroup.py
index 41f6a6cc0fe5b1301e3c3af838aaaa14b15cd439..4fda808d6fa172fc378358cef1e42547c218872e 100644 (file)
--- a/src/FeaturesPlugin/Test/TestGroup.py
+++ b/src/FeaturesPlugin/Test/TestGroup.py
@@ -33,8 +33,6 @@ origin = geomDataAPI_Point(aTriangleSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aTriangleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSketchLineA = aTriangleSketchFeature.addFeature("SketchLine")
@@ -59,11 +57,10 @@ aSketchResult = aTriangleSketchFeature.firstResult()
 aSketchEdges = modelAPI_ResultConstruction(aSketchResult).shape()
 origin = geomDataAPI_Point(aTriangleSketchFeature.attribute("Origin")).pnt()
 dirX = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirX")).dir()
-dirY = geomDataAPI_Dir(aTriangleSketchFeature.attribute("DirY")).dir()
 norm = geomDataAPI_Dir(aTriangleSketchFeature.attribute("Norm")).dir()
 aSketchFaces = ShapeList()
 GeomAlgoAPI_SketchBuilder.createFaces(
-    origin, dirX, dirY, norm, aSketchEdges, aSketchFaces)
+    origin, dirX, norm, aSketchEdges, aSketchFaces)
 # Create extrusion on them
 anExtrusionFt = aPart.addFeature("Extrusion")
 anExtrusionFt.selectionList("base").append(

diff --git a/src/FeaturesPlugin/Test/TestMultiBoolean.py b/src/FeaturesPlugin/Test/TestMultiBoolean.py
index 953ffc4ee0c3e4d15bb0b8f8d7afaa0c135412d0..8ff8dabb1273db26bf3c726c8ad0440c43a14077 100644 (file)
--- a/src/FeaturesPlugin/Test/TestMultiBoolean.py
+++ b/src/FeaturesPlugin/Test/TestMultiBoolean.py
@@ -50,13 +50,11 @@ aSketchFeatures = []
 for i in xrange(0, N):
     for j in xrange(0, N):
         # Create circle
-        aSketchFeature = modelAPI_CompositeFeature(aPart.addFeature("Sketch"))
+        aSketchFeature = featureToCompositeFeature(aPart.addFeature("Sketch"))
         origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
         origin.setValue(0, 0, 0)
         dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
         dirx.setValue(1, 0, 0)
-        diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-        diry.setValue(0, 1, 0)
         norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
         norm.setValue(0, 0, 1)
         aSketchCircle = aSketchFeature.addFeature("SketchCircle")
@@ -82,11 +80,10 @@ for i in xrange(0, N * N):
     aSketchEdges = modelAPI_ResultConstruction(aSketchResult).shape()
     origin = geomDataAPI_Point(aSketchFeatures[i].attribute("Origin")).pnt()
     dirX = geomDataAPI_Dir(aSketchFeatures[i].attribute("DirX")).dir()
-    dirY = geomDataAPI_Dir(aSketchFeatures[i].attribute("DirY")).dir()
     norm = geomDataAPI_Dir(aSketchFeatures[i].attribute("Norm")).dir()
     aSketchFaces = ShapeList()
     GeomAlgoAPI_SketchBuilder.createFaces(
-        origin, dirX, dirY, norm, aSketchEdges, aSketchFaces)
+        origin, dirX, norm, aSketchEdges, aSketchFaces)
 
     anExtrusionFt = aPart.addFeature("Extrusion")
     assert (anExtrusionFt.getKind() == "Extrusion")
@@ -108,13 +105,11 @@ aSession.finishOperation()
 # Make rectangle sketch: base for the box, size 100x100
 #=========================================================================
 aSession.startOperation()
-aQuadrangleSketchFeature = modelAPI_CompositeFeature(aPart.addFeature("Sketch"))
+aQuadrangleSketchFeature = featureToCompositeFeature(aPart.addFeature("Sketch"))
 origin = geomDataAPI_Point(aQuadrangleSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSketchLineA = aQuadrangleSketchFeature.addFeature("SketchLine")
@@ -148,11 +143,10 @@ aSketchResult = aQuadrangleSketchFeature.firstResult()
 aSketchEdges = modelAPI_ResultConstruction(aSketchResult).shape()
 origin = geomDataAPI_Point(aQuadrangleSketchFeature.attribute("Origin")).pnt()
 dirX = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("DirX")).dir()
-dirY = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("DirY")).dir()
 norm = geomDataAPI_Dir(aQuadrangleSketchFeature.attribute("Norm")).dir()
 aSketchFaces = ShapeList()
 GeomAlgoAPI_SketchBuilder.createFaces(
-    origin, dirX, dirY, norm, aSketchEdges, aSketchFaces)
+    origin, dirX, norm, aSketchEdges, aSketchFaces)
 # Create extrusion on them
 aBox = aPart.addFeature("Extrusion")
 aBox.selectionList("base").append(

diff --git a/src/SketchPlugin/Test/TestConstraintConcidence.py b/src/SketchPlugin/Test/TestConstraintConcidence.py
index 79589ac4c6fa840149bf2d0f68bb6891a0eccc17..580a45e3255779ea3e78c8b445990f2345e1237f 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintConcidence.py
+++ b/src/SketchPlugin/Test/TestConstraintConcidence.py
@@ -36,8 +36,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintDistance.py b/src/SketchPlugin/Test/TestConstraintDistance.py
index 13aeada6f9f4fd19c766a85a48a363509d28aa8e..1e0880e68bbc6d980e8226c2dc433a1a11ef74b8 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintDistance.py
+++ b/src/SketchPlugin/Test/TestConstraintDistance.py
@@ -50,8 +50,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintEqual.py b/src/SketchPlugin/Test/TestConstraintEqual.py
index 5e99e051250f9e883848dcd6fe634dd08d581a50..751be751d52cb044582b19631421e81483301b43 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintEqual.py
+++ b/src/SketchPlugin/Test/TestConstraintEqual.py
@@ -24,13 +24,11 @@ aDocument = aSession.moduleDocument()
 #=========================================================================
 aSession.startOperation()
 aSketchCommonFeature = aDocument.addFeature("Sketch")
-aSketchFeature = modelAPI_CompositeFeature(aSketchCommonFeature)
+aSketchFeature = featureToCompositeFeature(aSketchCommonFeature)
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintHorizontal.py b/src/SketchPlugin/Test/TestConstraintHorizontal.py
index 050c60f249e7084053c6cad865e887c80661c520..7a7a7d3faa92392503e7839b5b20bb2ad3717fdb 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintHorizontal.py
+++ b/src/SketchPlugin/Test/TestConstraintHorizontal.py
@@ -22,13 +22,11 @@ aDocument = aSession.moduleDocument()
 #=========================================================================
 aSession.startOperation()
 aSketchCommonFeature = aDocument.addFeature("Sketch")
-aSketchFeature = modelAPI_CompositeFeature(aSketchCommonFeature)
+aSketchFeature = featureToCompositeFeature(aSketchCommonFeature)
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintLength.py b/src/SketchPlugin/Test/TestConstraintLength.py
index 4dc391889ed59c437751b40b12dcb0cf26386b88..87a388a65021fb5eaf48bd593810e67ceafbe5ab 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintLength.py
+++ b/src/SketchPlugin/Test/TestConstraintLength.py
@@ -29,8 +29,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintMirror.py b/src/SketchPlugin/Test/TestConstraintMirror.py
index 4f85ec44ecf22a0c97f9dcfcb387c1b36aab02eb..43d2c45bb3fc2a1c32010e6c692219b7ecc7718d 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintMirror.py
+++ b/src/SketchPlugin/Test/TestConstraintMirror.py
@@ -25,13 +25,11 @@ aDocument = aSession.moduleDocument()
 #=========================================================================
 aSession.startOperation()
 aSketchCommonFeature = aDocument.addFeature("Sketch")
-aSketchFeature = modelAPI_CompositeFeature(aSketchCommonFeature)
+aSketchFeature = featureToCompositeFeature(aSketchCommonFeature)
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintParallel.py b/src/SketchPlugin/Test/TestConstraintParallel.py
index 965193b4e4ac188a5fdd787314204390ee8017e3..03eba23ccf379ae59722e2f90b440a10a59585ad 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintParallel.py
+++ b/src/SketchPlugin/Test/TestConstraintParallel.py
@@ -29,8 +29,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintPerpendicular.py b/src/SketchPlugin/Test/TestConstraintPerpendicular.py
index 64e15c899af7b1d0195aa9d8b7d9ec99618e05f0..837eb262695ded641b8737836bf0a6c3b7706fbd 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintPerpendicular.py
+++ b/src/SketchPlugin/Test/TestConstraintPerpendicular.py
@@ -36,8 +36,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintRadius.py b/src/SketchPlugin/Test/TestConstraintRadius.py
index 175823e1e1e775cce2692e439ebbda784be54171..9349352b32b4f4512ec674be73e694b5b1252517 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintRadius.py
+++ b/src/SketchPlugin/Test/TestConstraintRadius.py
@@ -38,8 +38,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintRigid.py b/src/SketchPlugin/Test/TestConstraintRigid.py
index e00acda2ca37e6a7a1952c1b4f8cb373a82c8ead..6a3a352c985c77bd3f9d2f69d733d7f5ef5cd521 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintRigid.py
+++ b/src/SketchPlugin/Test/TestConstraintRigid.py
@@ -36,8 +36,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintTangent.py b/src/SketchPlugin/Test/TestConstraintTangent.py
index a64b8a3a8c3db4293fa4bdbf982901ec5feaf90a..225447d3e308b50644dc17e06804fae0d1d38537 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintTangent.py
+++ b/src/SketchPlugin/Test/TestConstraintTangent.py
@@ -25,13 +25,11 @@ aDocument = aSession.moduleDocument()
 #=========================================================================
 aSession.startOperation()
 aSketchCommonFeature = aDocument.addFeature("Sketch")
-aSketchFeature = modelAPI_CompositeFeature(aSketchCommonFeature)
+aSketchFeature = featureToCompositeFeature(aSketchCommonFeature)
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestConstraintVertical.py b/src/SketchPlugin/Test/TestConstraintVertical.py
index 9272b21ec1384559cc4890505d1c75b7e9eebc16..3a03d1d0e750dee73e0ce9be150f80cb50765145 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintVertical.py
+++ b/src/SketchPlugin/Test/TestConstraintVertical.py
@@ -22,13 +22,11 @@ aDocument = aSession.moduleDocument()
 #=========================================================================
 aSession.startOperation()
 aSketchCommonFeature = aDocument.addFeature("Sketch")
-aSketchFeature = modelAPI_CompositeFeature(aSketchCommonFeature)
+aSketchFeature = featureToCompositeFeature(aSketchCommonFeature)
 origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestHighload.py b/src/SketchPlugin/Test/TestHighload.py
index 819cb00a566eff2a53d1b522a4c1445ba2691612..f745cdfa56eb1d48da1d8f93b3922f57973c84f7 100644 (file)
--- a/src/SketchPlugin/Test/TestHighload.py
+++ b/src/SketchPlugin/Test/TestHighload.py
@@ -95,8 +95,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestSketchArcCircle.py b/src/SketchPlugin/Test/TestSketchArcCircle.py
index 9927598a6882632ae357d43412826b4bb6bf6eca..9ab1394e0b587a817150b2c8880ef2fce8872444 100644 (file)
--- a/src/SketchPlugin/Test/TestSketchArcCircle.py
+++ b/src/SketchPlugin/Test/TestSketchArcCircle.py
@@ -37,8 +37,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()

diff --git a/src/SketchPlugin/Test/TestSketchPointLine.py b/src/SketchPlugin/Test/TestSketchPointLine.py
index cbf0d05bf40f07f4d0f3fd332aac5eb178e70335..b37b0f61dd8ed40904ef4567ce0cf431ce7b2909 100644 (file)
--- a/src/SketchPlugin/Test/TestSketchPointLine.py
+++ b/src/SketchPlugin/Test/TestSketchPointLine.py
@@ -19,8 +19,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 aSession.finishOperation()
@@ -33,10 +31,6 @@ dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 assert (dirx.x() == 1)
 assert (dirx.y() == 0)
 assert (dirx.z() == 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-assert (diry.x() == 0)
-assert (diry.y() == 1)
-assert (diry.z() == 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 assert (norm.x() == 0)
 assert (norm.y() == 0)

diff --git a/src/SketchPlugin/Test/TestSnowflake.py b/src/SketchPlugin/Test/TestSnowflake.py
index 4a0a31e53c0c8df2ca94a0fcdb0c5e8df1e380f1..e324fd2dab9d03fcfcca604eafa30a58b31f8974 100644 (file)
--- a/src/SketchPlugin/Test/TestSnowflake.py
+++ b/src/SketchPlugin/Test/TestSnowflake.py
@@ -109,8 +109,6 @@ origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
 origin.setValue(0, 0, 0)
 dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
-diry = geomDataAPI_Dir(aSketchFeature.attribute("DirY"))
-diry.setValue(0, 1, 0)
 norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 #=========================================================================