Update SQUISH tests

diff --git a/env_squish.sh b/env_squish.sh
index 0d714838b060ccdf4326433ba0433a8e6565303c..a321cccc0f84a490504ba9c7d14f17fe2a7a47f3 100644 (file)
--- a/env_squish.sh
+++ b/env_squish.sh
@@ -2,7 +2,7 @@
 
 export SQUISH_GRABWINDOW_CLASSES=AppElements_ViewPort,OCCViewer_ViewPort3d
 
-SQUISH_DIR=/dn23/NEWGEOM/NEWGEOM_JENKINS_BUILD_AREA/tools/squish-5.1.1-qt48x-linux64
+SQUISH_DIR=/dn23/NEWGEOM/NEWGEOM_JENKINS_BUILD_AREA/tools/squish-6.0.0-qt48x-linux64
 export PATH=${SQUISH_DIR}/bin:${PATH}
 
 export SQUISH_LICENSEKEY_DIR=/dn23/NEWGEOM/NEWGEOM_JENKINS_BUILD_AREA/tools

diff --git a/test.squish/objects_salome.map b/test.squish/objects_salome.map
index 2fb371b1328d6a624bf9fe8e60a40dfb45a7bef1..dee5c2083b723c46e63631553bdd096e1f0f4b57 100644 (file)
--- a/test.squish/objects_salome.map
+++ b/test.squish/objects_salome.map
@@ -126,6 +126,7 @@
 :Mirror.Segments:_QListWidget  {aboveWidget=':Mirror.Segments:_QLabel' container=':SALOME*.Mirror_XGUI_PropertyPanel' type='QListWidget' unnamed='1' visible='1'}
 :Mirror.property_panel_ok_QToolButton  {container=':SALOME*.Mirror_XGUI_PropertyPanel' name='property_panel_ok' type='QToolButton' visible='1'}
 :OK_QPushButton        {container=':Object browser_XGUI_DataTree' text='OK' type='QPushButton' unnamed='1' visible='1'}
+:Object browser.Part set_XGUI_ActiveDocLbl     {container=':SALOME*.Object browser_QDockWidget' text='Part set' type='XGUI_ActiveDocLbl' unnamed='1' visible='1'}
 :Object browser.qt_dockwidget_closebutton_QDockWidgetTitleButton       {container=':SALOME*.Object browser_QDockWidget' name='qt_dockwidget_closebutton' type='QDockWidgetTitleButton' visible='1'}
 :Object browser.qt_dockwidget_floatbutton_QDockWidgetTitleButton       {container=':SALOME*.Object browser_QDockWidget' name='qt_dockwidget_floatbutton' type='QDockWidgetTitleButton' visible='1'}
 :Object browser.qt_dockwidget_floatbutton_XGUI_ObjectsBrowser  {aboveWidget=':Object browser.qt_dockwidget_floatbutton_QDockWidgetTitleButton' container=':SALOME*.Object browser_QDockWidget' type='XGUI_ObjectsBrowser' unnamed='1' visible='1'}

diff --git a/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py b/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
index b186d752abed104335bf8a5b0fd1ba88cfa18d62..a02ffb488142981e2f3f970a2580bb81265c1638 100644 (file)
--- a/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
+++ b/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
@@ -10,19 +10,22 @@ def main():
     clickButton(waitForObject(":SALOME*.Parameter_QToolButton"))
     type(waitForObject(":Parameter_QLineEdit"), "a")
     type(waitForObject(":Parameter_ExpressionEditor"), "3")
+    type(waitForObject(":Parameter_ExpressionEditor"), "<Return>")
     clickButton(waitForObject(":Parameter.property_panel_ok_QToolButton"))
     
     clickButton(waitForObject(":SALOME*.ConstructionPoint_QToolButton"))
     type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "<Ctrl+A>")
     type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "a")
+    type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "<Return>")
+
     waitFor("object.exists(':Point.x_ModuleBase_ParamSpinBox')", 20000)
     test.compare(str(findObject(":Point.x_ModuleBase_ParamSpinBox").toolTip), "X coordinate")
 
     type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "<Ctrl+A>")
     type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "b")
+    type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "<Return>")
 
     waitFor("object.exists(':Point_QFrame')", 20000)
-    
     test.compare(str(findObject(":Point_QFrame").toolTip), "ModelAPI_StateInvalidArgument")
     
     waitFor("object.exists(':Point.x_ModuleBase_ParamSpinBox')", 20000)

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
index 181b7f49585bf74d54789cb091b0b2aacbc65185..94da0d06b37e7bb489fab69c493358265ff790c7 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
@@ -12,6 +12,7 @@ def main():
     activateItem(waitForObjectItem(":Part_QMenu", "Parameter"))
     type(waitForObject(":Parameter_QLineEdit"), "aa")
     type(waitForObject(":Parameter_ExpressionEditor"), "4")
+    type(waitForObject(":Parameter_ExpressionEditor"), "<Return>")
     clickButton(waitForObject(":Parameter.property_panel_ok_QToolButton"))
 
     # check the new parameter
@@ -23,12 +24,13 @@ def main():
     activateItem(waitForObjectItem(":Part_QMenu", "Parameter"))
     type(waitForObject(":Parameter_QLineEdit"), "bb")
     type(waitForObject(":Parameter_ExpressionEditor"), "aa+1")
+    type(waitForObject(":Parameter_ExpressionEditor"), "<Return>")
     clickButton(waitForObject(":Parameter.property_panel_ok_QToolButton"))
 
     # check the new parameter
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1.Parameters (1).bb = 5")
 
-    openContextMenu(waitForObject(":Object browser_QLineEdit"), 10, 10, 0)
+    openContextMenu(waitForObject(":Object browser.Part set_XGUI_ActiveDocLbl"), 10, 10, 0)
     activateItem(waitForObjectItem(":_QMenu", "Activate"))
     
     openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Parameters (1).aa = 4", 10, 10, 0)

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
index 6d375a47175bd4564323b8ac1bb3ce53571a34f6..b913649f0e4101d9f189bfd534b632280d05bc6e 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
@@ -10,6 +10,7 @@ def main():
     clickButton(waitForObject(":SALOME*.Parameter_QToolButton"))
     type(waitForObject(":Parameter_QLineEdit"), "a")
     type(waitForObject(":Parameter_ExpressionEditor"), "3")
+    type(waitForObject(":Parameter_ExpressionEditor"), "<Return>")
     clickButton(waitForObject(":Parameter.property_panel_ok_QToolButton"))
     
     openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Parameters (1).a = 3", 10, 10, 0)

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
index f7178ff0874ad1615d5db168976c8f074ecd0b90..84f3620724e6449c4c32256c9b7d67cb1c60942f 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
@@ -30,6 +30,7 @@ def main():
     
     #[step] Enter variable expression '100+b'
     type(waitForObject(":Parameter_ExpressionEditor"), "100+b")
+    type(waitForObject(":Parameter_ExpressionEditor"), "<Return>")
     
     #[step] Check that expression tooltip is: Errors:\nexpression - Parameters_ExpressionValidator: name 'b' is not defined
     waitFor("object.exists(':Parameter_ExpressionEditor')", 20000)

diff --git a/test.squish/suite_OBJECT_BROWSER/tst_ACTIVE_DOC_MANAGEMENT/test.py b/test.squish/suite_OBJECT_BROWSER/tst_ACTIVE_DOC_MANAGEMENT/test.py
index 2382e05d723a0029e2191ae98c3b20cb13b70add..41dda7783cca112d69ac5f439cc177c1351c282d 100644 (file)
--- a/test.squish/suite_OBJECT_BROWSER/tst_ACTIVE_DOC_MANAGEMENT/test.py
+++ b/test.squish/suite_OBJECT_BROWSER/tst_ACTIVE_DOC_MANAGEMENT/test.py
@@ -96,13 +96,13 @@ def main():
     test.compare(False, findMenuItem(waitForObject(":_QMenu"), "Activate").enabled, "Activate is disabled on active Part")
 
     #[step] Deactivate part by context menu on PartSet 
-    openContextMenu(waitForObject(":Object browser_QLineEdit"), 10, 10, 0)
+    openContextMenu(waitForObject(":Object browser.Part set_XGUI_ActiveDocLbl"), 10, 10, 0)
     activateItem(waitForObjectItem(":_QMenu", "Activate"))
     
     checkPartDeactivatedState("Part deactivation by context menu on PartSet")
 
     #[step] Check that Activate is disabled in PartSet context menu  
-    openContextMenu(waitForObject(":Object browser_QLineEdit"), 10, 10, 0)
+    openContextMenu(waitForObject(":Object browser.Part set_XGUI_ActiveDocLbl"), 10, 10, 0)
     test.compare(False, findMenuItem(waitForObject(":_QMenu"), "Activate").enabled, "Activate is disabled on active PartSet")
 
     #[step] Activate part by context menu on Part