From: dbv <dbv@opencascade.com>
Date: Mon, 27 Jun 2016 13:51:52 +0000 (+0300)
Subject: Enabled test for Pipe
X-Git-Tag: V_2.5.0~250
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aa39f07f78aad0e54ebfb60670d356f4ad72f537;p=modules%2Fshaper.git

Enabled test for Pipe
---

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 451b9c002..a14f2832b 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -127,4 +127,5 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestGroup.py
                TestIntersection.py
                TestUnion.py
-               TestRemoveSubShapes.py)
+               TestRemoveSubShapes.py
+               TestPipe.py)
diff --git a/src/FeaturesPlugin/Test/TestPipe.py b/src/FeaturesPlugin/Test/TestPipe.py
index 811ee33a4..5623aa594 100644
--- a/src/FeaturesPlugin/Test/TestPipe.py
+++ b/src/FeaturesPlugin/Test/TestPipe.py
@@ -100,66 +100,66 @@ aSession.finishOperation()
 
 # Test results
 assert (len(aPipeFeature.results()) > 0)
-# aSession.undo()
-#
-# # Create pipe with bi-normal
-# aSession.startOperation()
-# aPipeFeature = aPart.addFeature("Pipe")
-# aBaseObjectsList = aPipeFeature.selectionList("base_objects")
-# aBaseObjectsList.append(aFaceResult1, None)
-# aPathObjectSelection = aPipeFeature.selection("path_object")
-# aPathObjectSelection.setValue(aWireResult, None)
-# aPipeFeature.string("creation_method").setValue("binormal")
-# aBinormalObjectSelection = aPipeFeature.selection("binormal")
-# aShapeExplorer = GeomAPI_ShapeExplorer(aSketchShape, GeomAPI_Shape.EDGE)
-# aBinormalObjectSelection.setValue(aSketchResult, aShapeExplorer.current())
-# aSession.finishOperation()
-#
-# # Test results
-# assert (len(aPipeFeature.results()) > 0)
-# aSession.undo()
-#
-# # Create pipe with locations
-# # Create a sketch with circle for pipe profile
-# aSession.startOperation()
-# aSketchFeature = featureToCompositeFeature(aPart.addFeature("Sketch"))
-# origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
-# origin.setValue(0, 0, 200)
-# dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
-# dirx.setValue(1, 0, 0)
-# norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
-# norm.setValue(0, 0, 1)
-#
-# # Create circle
-# aSketchCircleFeature = aSketchFeature.addFeature("SketchCircle")
-# anCircleCentr = geomDataAPI_Point2D(aSketchCircleFeature.attribute("CircleCenter"))
-# aCircleRadius = aSketchCircleFeature.real("CircleRadius")
-# anCircleCentr.setValue(0, 0)
-# aCircleRadius.setValue(20)
-# aSession.finishOperation()
-# aSketchResult = aSketchFeature.firstResult()
-# aSketchShape = aSketchResult.shape()
-#
-# # Create face
-# aSession.startOperation()
-# aFaceFeature = aPart.addFeature("Face")
-# aBaseObjectsList = aFaceFeature.selectionList("base_objects")
-# aShapeExplorer = GeomAPI_ShapeExplorer(aSketchShape, GeomAPI_Shape.EDGE)
-# while aShapeExplorer.more():
-#     aBaseObjectsList.append(aSketchResult, aShapeExplorer.current())
-#     aShapeExplorer.next()
-# aSession.finishOperation()
-# aFaceResult2 = aFaceFeature.firstResult()
-#
-# aSession.startOperation()
-# aPipeFeature = aPart.addFeature("Pipe")
-# aBaseObjectsList = aPipeFeature.selectionList("base_objects")
-# aBaseObjectsList.append(aFaceResult1, None)
-# aBaseObjectsList.append(aFaceResult2, None)
-# aPathObjectSelection = aPipeFeature.selection("path_object")
-# aPathObjectSelection.setValue(aWireResult, None)
-# aPipeFeature.string("creation_method").setValue("locations")
-# aSession.finishOperation()
-#
-# # Test results
-# assert (len(aPipeFeature.results()) > 0)
+aSession.undo()
+
+# Create pipe with bi-normal
+aSession.startOperation()
+aPipeFeature = aPart.addFeature("Pipe")
+aBaseObjectsList = aPipeFeature.selectionList("base_objects")
+aBaseObjectsList.append(aFaceResult1, None)
+aPathObjectSelection = aPipeFeature.selection("path_object")
+aPathObjectSelection.setValue(aWireResult, None)
+aPipeFeature.string("creation_method").setValue("binormal")
+aBinormalObjectSelection = aPipeFeature.selection("binormal")
+aShapeExplorer = GeomAPI_ShapeExplorer(aSketchShape, GeomAPI_Shape.EDGE)
+aBinormalObjectSelection.setValue(aSketchResult, aShapeExplorer.current())
+aSession.finishOperation()
+
+# Test results
+assert (len(aPipeFeature.results()) > 0)
+aSession.undo()
+
+# Create pipe with locations
+# Create a sketch with circle for pipe profile
+aSession.startOperation()
+aSketchFeature = featureToCompositeFeature(aPart.addFeature("Sketch"))
+origin = geomDataAPI_Point(aSketchFeature.attribute("Origin"))
+origin.setValue(0, 0, 200)
+dirx = geomDataAPI_Dir(aSketchFeature.attribute("DirX"))
+dirx.setValue(1, 0, 0)
+norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
+norm.setValue(0, 0, 1)
+
+# Create circle
+aSketchCircleFeature = aSketchFeature.addFeature("SketchCircle")
+anCircleCentr = geomDataAPI_Point2D(aSketchCircleFeature.attribute("CircleCenter"))
+aCircleRadius = aSketchCircleFeature.real("CircleRadius")
+anCircleCentr.setValue(0, 0)
+aCircleRadius.setValue(20)
+aSession.finishOperation()
+aSketchResult = aSketchFeature.firstResult()
+aSketchShape = aSketchResult.shape()
+
+# Create face
+aSession.startOperation()
+aFaceFeature = aPart.addFeature("Face")
+aBaseObjectsList = aFaceFeature.selectionList("base_objects")
+aShapeExplorer = GeomAPI_ShapeExplorer(aSketchShape, GeomAPI_Shape.EDGE)
+while aShapeExplorer.more():
+    aBaseObjectsList.append(aSketchResult, aShapeExplorer.current())
+    aShapeExplorer.next()
+aSession.finishOperation()
+aFaceResult2 = aFaceFeature.firstResult()
+
+aSession.startOperation()
+aPipeFeature = aPart.addFeature("Pipe")
+aBaseObjectsList = aPipeFeature.selectionList("base_objects")
+aBaseObjectsList.append(aFaceResult1, None)
+aBaseObjectsList.append(aFaceResult2, None)
+aPathObjectSelection = aPipeFeature.selection("path_object")
+aPathObjectSelection.setValue(aWireResult, None)
+aPipeFeature.string("creation_method").setValue("locations")
+aSession.finishOperation()
+
+# Test results
+assert (len(aPipeFeature.results()) > 0)