From a088e90ea750e7eecbb5345ad36114398bd3c176 Mon Sep 17 00:00:00 2001 From: spo Date: Mon, 16 Nov 2015 16:03:28 +0300 Subject: [PATCH] Update SQUISH tests --- env_squish.sh | 2 +- test.squish/objects_salome.map | 1 + test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py | 5 ++++- test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py | 4 +++- test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py | 1 + test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py | 1 + .../suite_OBJECT_BROWSER/tst_ACTIVE_DOC_MANAGEMENT/test.py | 4 ++-- 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/env_squish.sh b/env_squish.sh index 0d714838b..a321cccc0 100644 --- 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 2fb371b13..dee5c2083 100644 --- 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 b186d752a..a02ffb488 100644 --- 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"), "") clickButton(waitForObject(":Parameter.property_panel_ok_QToolButton")) clickButton(waitForObject(":SALOME*.ConstructionPoint_QToolButton")) type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "") type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "a") + type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "") + 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"), "") type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "b") + type(waitForObject(":Point.x_ModuleBase_ParamSpinBox"), "") 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 181b7f495..94da0d06b 100644 --- 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"), "") 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"), "") 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 6d375a471..b913649f0 100644 --- 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"), "") 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 f7178ff08..84f362072 100644 --- 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"), "") #[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 2382e05d7..41dda7783 100644 --- 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 -- 2.39.2