Fix SQUISH tests for new label of unloaded items

diff --git a/test.squish/objects.map b/test.squish/objects.map
index 958aae64b4bf4c9daaf249893587fdafad34ef32..5254d424bcfe4af4a1d3863f14fc5c7075c02a94 100644 (file)
--- 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 4326bdb0aa0a601d913ed7d776982cde6eedf393..d627e9345b954c8721291f78dbf84590d0f80292 100644 (file)
--- 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 e04f20eab96b4025d33126cdc0a3bc577c451ea4..9851a3163ac658c0bfdbeb947a3d6101ccdbdfe9 100644 (file)
--- 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 dbc20836a58c345237d3facdbe8e9d2794ff7100..fa7fdef94b601e9206f981e14ee0f576c5bb78ed 100644 (file)
--- 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 23abdf37c98bf9ef2c82a4907cb1036320673300..ef471e42f6982ad7a1b8b87f05291af30f631b93 100644 (file)
--- 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 c90e7db696d49a283e12c2d7e44cd558c6b89bd0..806e50696a45e8bb63799bb942e645833c689cdd 100644 (file)
--- 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 50f938cb6f8bf4acc59fb65a132f26c6cd934317..cee54e43342da6616d94b5b846456bb7b2ed0adf 100644 (file)
--- 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 05a7790e3727c4ec3bcfb842d91b731712ee4f87..ab81568d72fe758d800bc0fab53df7110b6014fa 100644 (file)
--- 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 4bb91f0fb143c8e51150c56a7ec1f2150395354f..5dbbd53b67f15d89eb14c31896ca52c9cebedb52 100644 (file)
--- 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 11dd15559058b34fb9172366be5d9a4b389645e6..ee3ce87f35121ed9f6e8e1e5cbe8619fcee3839d 100644 (file)
--- 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 eb6121968dff0edeca61d54e0db27a51a6eeed2d..2460f40da16a334ec27fe1c24d3a9f6eda626f3d 100644 (file)
--- 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 7588571cbd66017d729ce7be4f8902cbf65e3a43..342586b772b7e0e95e971d6b3675f086dbf74b41 100644 (file)
--- 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 058d4b3dfba71583bb95a0f6a1fae67cd51b2fb5..df204d791f0468ab1fcee52fc098dc28b0cca7cc 100644 (file)
--- 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 0b738fdcead6f4c55cf5b460fc9a408775ed329d..d52b00deb8e2a2766fdd4241fb830a6a74771692 100644 (file)
--- 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 3f3f69f845c5ecd7a360cf360fb6912f3d298281..5af7756c5fe5ad1055457a436c64340f322f28d5 100644 (file)
--- 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 a783197a19cb71c6b0229ad2ea48f3ad8abdbdd7..8df2f16ef83f87d71c4b09bb157c12be3245c572 100644 (file)
--- 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 e8016b263e11f90f52e95633e96a242ff6e07fa5..fbdc2614c4484efee4a572a49b0eca0a6b6be716 100644 (file)
--- 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 14bc1f46590b86659e9fcb37c6e36fcddf096feb..c315e713fcf30fe34d9f8f4c49fc0ffededc9183 100644 (file)
--- 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 0158750bf8ffe413bc57932ea7f5bfbee808deb5..6cc68e6391b685bdd70d866b5e505262ebd75ed1 100644 (file)
--- 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 bf567466f5955eb990ff18e0b44fd66c0c3421a9..7d0092fe9049d8c06503dc4c777eef54ee485bd6 100644 (file)
--- 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