Update Split feature and corresponding unit test

[modules/shaper.git] / src / SketchPlugin / Test / TestSplit.py

diff --git a/src/SketchPlugin/Test/TestSplit.py b/src/SketchPlugin/Test/TestSplit.py
index 6cc31d3a0583a1d0d4b4f7d19b3477ded90918b4..5215e628e85eece36985a85d57255880807423a1 100644 (file)
--- a/src/SketchPlugin/Test/TestSplit.py
+++ b/src/SketchPlugin/Test/TestSplit.py
@@ -59,8 +59,8 @@ Sketch_3 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
 SketchCircle_3_1 = Sketch_3.addCircle(50, 50, 50)
 SketchPoint_3_1 = Sketch_3.addPoint(50, 0)
 SketchPoint_3_2 = Sketch_3.addPoint(50, 100)
-SketchConstraintCoincidence_3_1 = Sketch_3.setCoincident(SketchPoint_3_1.coordinates(), SketchCircle_3_1.result()[0])
-SketchConstraintCoincidence_3_2 = Sketch_3.setCoincident(SketchPoint_3_2.coordinates(), SketchCircle_3_1.result()[0])
+SketchConstraintCoincidence_3_1 = Sketch_3.setCoincident(SketchPoint_3_1.coordinates(), SketchCircle_3_1.result()[1])
+SketchConstraintCoincidence_3_2 = Sketch_3.setCoincident(SketchPoint_3_2.coordinates(), SketchCircle_3_1.result()[1])
 Sketch_3.addSplit(SketchCircle_3_1, SketchPoint_3_1.coordinates(), SketchPoint_3_2.coordinates())
 model.do()
 
@@ -77,12 +77,12 @@ assert(idList.count(SketchConstraintTangentId) == 1)
 
 # Test split on arc with one point
 Sketch_4 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
-SketchArc_4_1 = Sketch_4.addArc(50, 50, 0, 50, 100, 50, True)
+SketchArc_4_1 = Sketch_4.addArc(50, 50, 50, 0, 0, 50, False)
 Sketch_4.setFixed(SketchArc_4_1.startPoint())
 Sketch_4.setFixed(SketchArc_4_1.endPoint())
 Sketch_4.setRadius(SketchArc_4_1, 50)
 SketchPoint_4_1 = Sketch_4.addPoint(50, 100)
-SketchConstraintCoincidence_4_1 = Sketch_4.setCoincident(SketchPoint_4_1.coordinates(), SketchArc_4_1.result()[0])
+SketchConstraintCoincidence_4_1 = Sketch_4.setCoincident(SketchPoint_4_1.coordinates(), SketchArc_4_1.result()[1])
 Sketch_4.addSplit(SketchArc_4_1, SketchPoint_4_1.coordinates(), SketchArc_4_1.endPoint())
 model.do()
 
@@ -100,15 +100,17 @@ assert(idList.count(SketchConstraintTangentId) == 1)
 
 # Test split on arc with two points
 Sketch_5 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
-SketchArc_5_1 = Sketch_5.addArc(50, 50, 0, 50, 100, 50, True)
+#SketchArc_5_1 = Sketch_5.addArc(50, 50, 6.69872981078, 75, 93.30127018922, 75, True)
+SketchArc_5_1 = Sketch_5.addArc(50, 50, 0, 50, 93.30127018922, 75, True)
 Sketch_5.setFixed(SketchArc_5_1.startPoint())
 Sketch_5.setFixed(SketchArc_5_1.endPoint())
 Sketch_5.setRadius(SketchArc_5_1, 50)
-SketchPoint_5_1 = Sketch_5.addPoint(25, 93.301270189222)
-SketchPoint_5_2 = Sketch_5.addPoint(75, 93.301270189222)
-SketchConstraintCoincidence_5_1 = Sketch_5.setCoincident(SketchPoint_5_1.coordinates(), SketchArc_5_1.result()[0])
-SketchConstraintCoincidence_5_1 = Sketch_5.setCoincident(SketchPoint_5_2.coordinates(), SketchArc_5_1.result()[0])
-Sketch_5.addSplit(SketchArc_5_1, SketchPoint_5_1.coordinates(), SketchPoint_5_2.coordinates())
+SketchLine_5_1 = Sketch_5.addLine(25, 93.301270189222, 75, 93.301270189222)
+SketchConstraintCoincidence_5_1 = Sketch_5.setCoincident(SketchLine_5_1.startPoint(), SketchArc_5_1.result()[1])
+SketchConstraintCoincidence_5_2 = Sketch_5.setCoincident(SketchLine_5_1.endPoint(), SketchArc_5_1.result()[1])
+SketchConstraintHorizontal_5_1 = Sketch_5.setHorizontal(SketchLine_5_1.result()[0])
+SketchConstraintLength_5_1 = Sketch_5.setLength(SketchLine_5_1.result()[0], 50)
+Sketch_5.addSplit(SketchArc_5_1, SketchLine_5_1.startPoint(), SketchLine_5_1.endPoint())
 model.do()
 
 Sketch_5_feature = featureToCompositeFeature(Sketch_5.feature())
@@ -117,7 +119,7 @@ for index in range(Sketch_5_feature.numberOfSubs()):
   idList.append(Sketch_5_feature.subFeature(index).getKind())
 
 assert(idList.count(SketchArcId) == 3)
-assert(idList.count(SketchPointId) == 2)
+assert(idList.count(SketchPointId) == 0)
 assert(idList.count(SketchConstraintCoincidenceId) == 4)
 assert(idList.count(SketchConstraintEqualId) == 2)
 assert(idList.count(SketchConstraintTangentId) == 2)