From: spo Date: Mon, 12 Oct 2015 07:14:36 +0000 (+0300) Subject: Fix SQUISH tests for new label of unloaded items X-Git-Tag: V_2.0.0_alfa1~103 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c0f8b9cc72cca3bfb9a77275b1bd5f823af5c949;p=modules%2Fshaper.git Fix SQUISH tests for new label of unloaded items --- diff --git a/test.squish/objects.map b/test.squish/objects.map index 958aae64b..5254d424b 100644 --- a/test.squish/objects.map +++ b/test.squish/objects.map @@ -80,6 +80,7 @@ :Features.Boolean_AppElements_MenuGroupPanel {container=':qt_tabwidget_stackedwidget.Features_AppElements_Workbench' name='Boolean' type='AppElements_MenuGroupPanel' visible='1'} :Features.Extrusion_AppElements_MenuGroupPanel {container=':qt_tabwidget_stackedwidget.Features_AppElements_Workbench' name='Extrusion' type='AppElements_MenuGroupPanel' visible='1'} :Features_QScrollArea {container=':qt_tabwidget_stackedwidget.Features_AppElements_Workbench' type='QScrollArea' unnamed='1' visible='1'} +:File_QtxMenu {title='File' type='QtxMenu' unnamed='1' visible='1'} :General.Default_AppElements_MenuGroupPanel {container=':OpenParts*.General_AppElements_DockWidget' name='Default' type='AppElements_MenuGroupPanel' visible='1'} :General.General_AppElementsDockTitleLabel {container=':OpenParts*.General_AppElements_DockWidget' text='General' type='AppElementsDockTitleLabel' unnamed='1' visible='1'} :General.Sketch_QTabWidget {container=':OpenParts*.General_AppElements_DockWidget' leftWidget=':General.Default_AppElements_MenuGroupPanel' text='Sketch' type='QTabWidget' unnamed='1' visible='1'} @@ -101,6 +102,8 @@ :Object browser_QLabel {container=':OpenParts*.Object browser_QDockWidget' type='QLabel' unnamed='1' visible='1'} :Object browser_QLineEdit {container=':OpenParts*.Object browser_QDockWidget' type='QLineEdit' unnamed='1' visible='1'} :Object browser_XGUI_DataTree {container=':OpenParts*.Object browser_QDockWidget' type='XGUI_DataTree' unnamed='1' visible='1'} +:Open File.File name:_QLabel {name='fileNameLabel' text='File name:' type='QLabel' visible='1' window=':Open File_SUIT_FileDlg'} +:Open File_SUIT_FileDlg {name='QFileDialog' type='SUIT_FileDlg' visible='1' windowTitle='Open File'} :OpenParts*.Back_QToolButton {text='Back' type='QToolButton' unnamed='1' visible='1' window=':OpenParts*_AppElements_MainWindow'} :OpenParts*.Bottom_QToolButton {text='Bottom' type='QToolButton' unnamed='1' visible='1' window=':OpenParts*_AppElements_MainWindow'} :OpenParts*.Circle_XGUI_PropertyPanel {name='property_panel_dock' type='XGUI_PropertyPanel' visible='1' window=':OpenParts*_AppElements_MainWindow' windowTitle='Circle'} @@ -170,6 +173,8 @@ :Point.property_panel_ok_QToolButton {container=':OpenParts*.Point_XGUI_PropertyPanel' name='property_panel_ok' type='QToolButton' visible='1'} :Point.qt_spinbox_lineedit_QLineEdit {container=':Point.Point_QGroupBox' name='qt_spinbox_lineedit' type='QLineEdit' visible='1'} :Point.qt_spinbox_lineedit_QLineEdit_2 {container=':Point.Point_QGroupBox' name='qt_spinbox_lineedit' occurrence='2' type='QLineEdit' visible='1'} +:PoseidonGUI v1.6.4_LUIDesktop_TabDesktop {type='LUIDesktop_TabDesktop' unnamed='1' visible='1' windowTitle='PoseidonGUI v1.6.4'} +:PoseidonGUI v1.6.4_QMenuBar {type='QMenuBar' unnamed='1' visible='1' window=':PoseidonGUI v1.6.4_LUIDesktop_TabDesktop'} :Save current file.Discard_QPushButton {text~='Close without Saving|Discard' type='QPushButton' unnamed='1' visible='1' window=':Save current file_QMessageBox'} :Save current file_QMessageBox {type='QMessageBox' unnamed='1' visible='1' windowTitle='Save current file'} :Sketch.Basic_AppElements_MenuGroupPanel {container=':qt_tabwidget_stackedwidget.Sketch_AppElements_Workbench' name='Basic' type='AppElements_MenuGroupPanel' visible='1'} @@ -194,6 +199,7 @@ :_ModuleBase_ParamSpinBox {type='ModuleBase_ParamSpinBox' unnamed='1' visible='1' window=':_QDialog'} :_QDialog {type='QDialog' unnamed='1' visible='1'} :_QMenu {type='QMenu' unnamed='1' visible='1'} +:fileNameEdit_QLineEdit {buddy=':Open File.File name:_QLabel' name='fileNameEdit' type='QLineEdit' visible='1'} :qt_tabwidget_stackedwidget.Construction_AppElements_Workbench {container=':General.qt_tabwidget_stackedwidget_QStackedWidget' name='Construction' type='AppElements_Workbench' visible='1'} :qt_tabwidget_stackedwidget.Features_AppElements_Workbench {container=':General.qt_tabwidget_stackedwidget_QStackedWidget' name='Features' type='AppElements_Workbench' visible='1'} :qt_tabwidget_stackedwidget.Part_AppElements_Workbench {container=':General.qt_tabwidget_stackedwidget_QStackedWidget' name='Part' type='AppElements_Workbench' visible='1'} diff --git a/test.squish/suite_ISSUES_SALOME/tst_boolean_001/test.py b/test.squish/suite_ISSUES_SALOME/tst_boolean_001/test.py index 4326bdb0a..d627e9345 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_boolean_001/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_boolean_001/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 48, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 48, 10, 0) + 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] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_boolean_002/test.py b/test.squish/suite_ISSUES_SALOME/tst_boolean_002/test.py index e04f20eab..9851a3163 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_boolean_002/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_boolean_002/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 48, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 48, 10, 0) + 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] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_boolean_003/test.py b/test.squish/suite_ISSUES_SALOME/tst_boolean_003/test.py index dbc20836a..fa7fdef94 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_boolean_003/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_boolean_003/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 48, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 48, 10, 0) + 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] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_construction_001/test.py b/test.squish/suite_ISSUES_SALOME/tst_construction_001/test.py index 23abdf37c..ef471e42f 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_construction_001/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_construction_001/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Create plane basing on upper face of the box diff --git a/test.squish/suite_ISSUES_SALOME/tst_extrusion_001/test.py b/test.squish/suite_ISSUES_SALOME/tst_extrusion_001/test.py index c90e7db69..806e50696 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_extrusion_001/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_extrusion_001/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 48, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 48, 10, 0) + 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 diff --git a/test.squish/suite_ISSUES_SALOME/tst_extrusion_002/test.py b/test.squish/suite_ISSUES_SALOME/tst_extrusion_002/test.py index 50f938cb6..cee54e433 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_extrusion_002/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_extrusion_002/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 48, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 48, 10, 0) + 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] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_extrusion_003/test.py b/test.squish/suite_ISSUES_SALOME/tst_extrusion_003/test.py index 05a7790e3..ab81568d7 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_extrusion_003/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_extrusion_003/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_extrusion_004/test.py b/test.squish/suite_ISSUES_SALOME/tst_extrusion_004/test.py index 4bb91f0fb..5dbbd53b6 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_extrusion_004/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_extrusion_004/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_extrusion_006/test.py b/test.squish/suite_ISSUES_SALOME/tst_extrusion_006/test.py index 11dd15559..ee3ce87f3 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_extrusion_006/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_extrusion_006/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_partition_001/test.py b/test.squish/suite_ISSUES_SALOME/tst_partition_001/test.py index eb6121968..2460f40da 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_partition_001/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_partition_001/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_revolution_001/test.py b/test.squish/suite_ISSUES_SALOME/tst_revolution_001/test.py index 7588571cb..342586b77 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_revolution_001/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_revolution_001/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) diff --git a/test.squish/suite_ISSUES_SALOME/tst_revolution_003/test.py b/test.squish/suite_ISSUES_SALOME/tst_revolution_003/test.py index 058d4b3df..df204d791 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_revolution_003/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_revolution_003/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_revolution_004/test.py b/test.squish/suite_ISSUES_SALOME/tst_revolution_004/test.py index 0b738fdce..d52b00deb 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_revolution_004/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_revolution_004/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_revolution_005/test.py b/test.squish/suite_ISSUES_SALOME/tst_revolution_005/test.py index 3f3f69f84..5af7756c5 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_revolution_005/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_revolution_005/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_revolution_006/test.py b/test.squish/suite_ISSUES_SALOME/tst_revolution_006/test.py index a783197a1..8df2f16ef 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_revolution_006/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_revolution_006/test.py @@ -22,9 +22,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) # [step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 71, 10, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 70, 9, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 71, 10, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 70, 9, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Fit all diff --git a/test.squish/suite_ISSUES_SALOME/tst_sketch_003/test.py b/test.squish/suite_ISSUES_SALOME/tst_sketch_003/test.py index e8016b263..fbdc2614c 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_sketch_003/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_003/test.py @@ -56,9 +56,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - waitForObjectItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1") - clickItem(":Object browser_XGUI_DataTree", "Not loaded Part\\_1", 50, 11, 0, Qt.LeftButton) - openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Not loaded Part\\_1", 50, 11, 0) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 50, 11, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 50, 11, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[check] Check that file was loaded correct diff --git a/test.squish/suite_ISSUES_SALOME/tst_sketch_004/test.py b/test.squish/suite_ISSUES_SALOME/tst_sketch_004/test.py index 14bc1f465..c315e713f 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_sketch_004/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_004/test.py @@ -24,9 +24,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - 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) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 51, 7, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 51, 7, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Edit Sketch_1 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 0158750bf..6cc68e639 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_006/test.py @@ -23,9 +23,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - 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) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 51, 7, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 51, 7, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Edit Sketch_1 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 bf567466f..7d0092fe9 100644 --- a/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py +++ b/test.squish/suite_ISSUES_SALOME/tst_sketch_007/test.py @@ -23,9 +23,9 @@ def main(): clickButton(waitForObject(":SALOME*.NewGeom_QToolButton")) #[step] Activate Part_1 - 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) + waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)") + clickItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)", 51, 7, 0, Qt.LeftButton) + openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Part\\_1 (Not loaded)", 51, 7, 0) activateItem(waitForObjectItem(":_QMenu", "Activate")) #[step] Edit Sketch_1