Tests fix

[modules/shaper.git] / src / FeaturesPlugin / Test / Test2197_1.py

diff --git a/src/FeaturesPlugin/Test/Test2197_1.py b/src/FeaturesPlugin/Test/Test2197_1.py
index e157deb798919c28daec776f562dc463e08e1419..d739407f708b0327d8f8a78f2ab7c2b040a8d6d1 100644 (file)
--- a/src/FeaturesPlugin/Test/Test2197_1.py
+++ b/src/FeaturesPlugin/Test/Test2197_1.py
@@ -18,6 +18,8 @@
 ## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 ##
 
+# -*- coding: utf-8 -*-
+
 from salome.shaper import model
 
 model.begin()
@@ -25,12 +27,15 @@ partSet = model.moduleDocument()
 Part_1 = model.addPart(partSet)
 Part_1_doc = Part_1.document()
 Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ"))
-SketchCircle_1 = Sketch_1.addCircle(-150, 79, -50, 79)
-SketchCircle_2 = Sketch_1.addCircle(-155, 278, -10, 278)
+SketchCircle_1 = Sketch_1.addCircle(-155, 278, 145)
+SketchCircle_2 = Sketch_1.addCircle(-150, 79, 100)
+model.do()
+Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2r-SketchCircle_2_2f-SketchCircle_2_2f")], model.selection("EDGE", "PartSet/OZ"), 360, 0)
+Group_1_objects = [model.selection("EDGE", "([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2])([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2])"), model.selection("EDGE", "([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2])([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2])"), model.selection("EDGE", "([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2])([Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2])")]
+Group_1 = model.addGroup(Part_1_doc, Group_1_objects)
+Group_2_objects = [model.selection("EDGE", "[Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2]"), model.selection("EDGE", "[Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_1_2]"), model.selection("EDGE", "[Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_1][Revolution_1_1/Generated_Face&Sketch_1/SketchCircle_2_2&weak_name_2]")]
+Group_2 = model.addGroup(Part_1_doc, Group_2_objects)
 model.do()
-Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchCircle_1_2f-SketchCircle_2_2f")], model.selection("EDGE", "PartSet/OZ"), 360, 0)
-Group_1 = model.addGroup(Part_1_doc, [model.selection("EDGE", "Revolution_1_1/Base_Edge_1"), model.selection("EDGE", "Revolution_1_1/Base_Edge_2"), model.selection("EDGE", "Revolution_1_1/Base_Edge_3")])
-Group_2 = model.addGroup(Part_1_doc, [model.selection("EDGE", "Revolution_1_1/Lateral_Edge_1"), model.selection("EDGE", "Revolution_1_1/Lateral_Edge_2"), model.selection("EDGE", "Revolution_1_1/Lateral_Edge_3")])
 model.end()
 
 # check that resulting group selection is valid