X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test.squish%2Fsuite_FEATURE_EXTRUSION%2Ftst_extrusion_001%2Ftest.py;h=ab17fec13364416e874019553c46394cdf8ecf59;hb=d02a4187b50a5416490c15a377406421fdc303de;hp=ef54799396fc0f967e9fe99fe37aa499730e4ede;hpb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;p=modules%2Fshaper.git

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
index ef5479939..ab17fec13 100644
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
@@ -1,33 +1,37 @@
 def main():
-    #[project] NewGEOM
-    #[Scenario] Extrusion_001
-    #[Topic] 'Extrusion from size to size' functionality
-    #[Tested functionality] 
-    #[Summary description]
-    #[Expected results]
-    #[General comments]
-    
+    # [project] SHAPER
+    # [Scenario] Extrusion_001
+    # [Topic] 'Extrusion from size to size' functionality
+    # [Tested functionality]
+    # [Summary description]
+    # [Expected results]
+    # [General comments]
+
     source(findFile("scripts", "common.py"))
-    
-    #[section] Application start
-    #[step] Launch SALOME
+
+    # [section] Application start
+    # [step] Launch SALOME
     startApplication("salome_run.sh")
 
     set_defaults()
-    
-    #[step] Open 'for_extrusion_001.hdf'
+
+    # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_extrusion_001.hdf")
-    
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
-    
-    #[step] Activate Part_1
+
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+
+    # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
     clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 48, 10, 0, Qt.LeftButton)
     openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 48, 10, 0)
     activateItem(waitForObjectItem(":_QMenu", "Activate"))
-    
-    #[step] Execute extrusion for sketch_1
+
+    # [step] Fit all
+    fit_all()
+    test.vp("INIT")
+
+    # [step] Execute extrusion for sketch_1
     mouseClick(waitForObjectItem(":SALOME*_QMenuBar", "Features"))
     mouseClick(waitForObjectItem(":_QMenu", "Extrusion"))
     mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 347, 228, 0, Qt.LeftButton)
@@ -37,13 +41,15 @@ def main():
 
     type(waitForObject(getSpinBoxRealName("from_size")), "<Ctrl+A>")
     type(waitForObject(getSpinBoxRealName("from_size")), 10)
-    
-    #[check] Check that preview is updated
-    test.vp("VP3")
+
+    # [check] Check that preview is updated [vp PREVIEW]
+    fit_all()
+    test.vp("PREVIEW")
     clickButton(waitForObject(":Extrusion.property_panel_ok_QToolButton"))
-    
-    #[check] Check that extrusion has been implemented
-    test.vp("VP4")
-    
+
+    # [check] Check that extrusion has been implemented [vp EXTRUSION]
+    fit_all()
+    test.vp("EXTRUSION")
+
     # [step] Close application without saving
     close_application()