Fix SQUISH tests

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

diff --git a/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py b/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py
index 1f84c1b7b9ed0cfa317b775c800de48556752f5c..0158750bf8ffe413bc57932ea7f5bfbee808deb5 100644 (file)
--- a/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py
+++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py
@@ -20,18 +20,18 @@ def main():
     open(DATA_PATH + "/for_sketch_006.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", "Not loaded Part\\_1")
+    clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 51, 7, 0, Qt.LeftButton)
+    openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded 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
@@ -44,15 +44,15 @@ def main():
     #[step] Select 'Parallel' icon near the line
     mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 103, 255, 0, Qt.LeftButton)
     #[check] Check that Input panel 'Parallel' appears, there are the names of lines in text boxes
-    test.vp("VP2")
+    waitFor("object.exists(':Parallel.First line_QLineEdit')", 20000)
+    test.compare(str(findObject(":Parallel.First line_QLineEdit").text), "SketchLine_1")
+    waitFor("object.exists(':Parallel.Second line_QLineEdit')", 20000)
+    test.compare(str(findObject(":Parallel.Second line_QLineEdit").text), "SketchLine_2")
     #[check] Check that lines are selected and highlighted in viewer
     test.vp("VP3")
     #[step] Confirm 'Parallel' operation
     clickButton(waitForObject(":Parallel.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"))
-    clickButton(waitForObject(":Exit.Ok_QPushButton"))
+    close_application()