Update SALOME tests

[modules/shaper.git] / test.squish / suite_ISSUES_SALOME / tst_sketch_007 / test.py

diff --git a/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py b/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py
index b2f609c35c9769f6d1059cb0e2fa838d3d12420f..af2dddfe3da9c1f26df9ada032f8c3eec066e7eb 100644 (file)
--- a/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py
+++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py
@@ -20,18 +20,18 @@ def main():
     open(DATA_PATH + "/for_sketch_007.hdf")
     
     #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME 7.6.0.NewGeom_QToolButton"))
+    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
     
     #[step] Activate Part_1
-    waitForObjectItem(":Object browser_XGUI_DataTree_2", "Part\\_1")
-    clickItem(":Object browser_XGUI_DataTree_2", "Part\\_1", 51, 7, 0, Qt.LeftButton)
-    openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree_2"), "Part\\_1", 51, 7, 0)
+    waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1")
+    clickItem(":Object browser_XGUI_DataTree", "Part\\_1", 51, 7, 0, Qt.LeftButton)
+    openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1", 51, 7, 0)
     activateItem(waitForObjectItem(":_QMenu", "Activate"))
     
     #[step] Edit Sketch_1
-    waitForObjectItem(":Object browser_XGUI_DataTree_2", "Part\\_1.Sketch\\_1")
-    clickItem(":Object browser_XGUI_DataTree_2", "Part\\_1.Sketch\\_1", 54, 11, 0, Qt.LeftButton)
-    openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree_2"), "Part\\_1.Sketch\\_1", 54, 11, 0)
+    waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1.Sketch\\_1")
+    clickItem(":Object browser_XGUI_DataTree", "Part\\_1.Sketch\\_1", 54, 11, 0, Qt.LeftButton)
+    openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1.Sketch\\_1", 54, 11, 0)
     activateItem(waitForObjectItem(":_QMenu", "Edit..."))
     
     #[step] Click '+OZ' view button
@@ -58,11 +58,11 @@ def main():
     clickButton(waitForObject(":Perpendicular.property_panel_ok_QToolButton"))
     
     #[step] Confirm edition of the sketch
-    clickButton(waitForObject(":Sketch.property_panel_ok_QToolButton_2"))
+    clickButton(waitForObject(":Sketch.property_panel_ok_QToolButton"))
     
     #[step] Close application
     clickButton(waitForObject(":SALOME*.Close_QToolButton"))
     clickButton(waitForObject(":Close active study.Close w/o saving_QPushButton"))
-    sendEvent("QCloseEvent", waitForObject(":SALOME 7.6.0_STD_TabDesktop"))
+    sendEvent("QCloseEvent", waitForObject(":SALOME*_STD_TabDesktop"))
     clickButton(waitForObject(":Exit.Ok_QPushButton"))
         
\ No newline at end of file