From c9c03e7c97e074809fe279b519ba698d99c33e9c Mon Sep 17 00:00:00 2001 From: Natalia Ermolaeva Date: Thu, 3 Mar 2016 13:08:35 +0300 Subject: [PATCH] squish tests correction: suite_FEATURE_PARAMETERS --- test.squish/shared/testdata/SalomeApp.xml | 9 +++------ .../suite_FEATURE_PARAMETERS/shared/steps/steps.py | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test.squish/shared/testdata/SalomeApp.xml b/test.squish/shared/testdata/SalomeApp.xml index 5d8bee668..aeac49ce8 100644 --- a/test.squish/shared/testdata/SalomeApp.xml +++ b/test.squish/shared/testdata/SalomeApp.xml @@ -94,7 +94,7 @@ Changes made in this file can be lost!
- +
@@ -116,16 +116,14 @@ Changes made in this file can be lost! -
+ + - - -
@@ -134,7 +132,6 @@ Changes made in this file can be lost! -
diff --git a/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py b/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py index b15728982..5ab36e412 100644 --- a/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py +++ b/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py @@ -77,7 +77,8 @@ def step(context): @Then("Check that Point does not allow using expressions") def step(context): - clickButton(waitForObject(":SALOME*.SketchPoint_QToolButton")) + activateItem(waitForObjectItem(":SALOME*_QMenuBar", "Sketch")) + activateItem(waitForObjectItem(":Sketch_QMenu", "Point")) mouseClick(waitForObject(":Point.qt_spinbox_lineedit_QLineEdit"), 41, 6, 0, Qt.LeftButton) type(waitForObject(":Point.X _ModuleBase_ParamSpinBox"), "") type(waitForObject(":Point.X _ModuleBase_ParamSpinBox"), "a") @@ -181,7 +182,7 @@ def step(context): mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 131, 282, 0, Qt.LeftButton) mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 209, 98, 0, Qt.LeftButton) mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 283, 275, 0, Qt.LeftButton) - clickButton(waitForObject(":Line.property_panel_cancel_QToolButton")) + #TODO_1 clickButton(waitForObject(":Line.property_panel_cancel_QToolButton")) activateItem(waitForObjectItem(":SALOME*_QMenuBar", "Sketch")) activateItem(waitForObjectItem(":Sketch_QMenu", "Fillet")) mouseClick(waitForObject(":SALOME*.3D View Operations_OCCViewer_ViewPort3d"), 211, 99, 0, Qt.LeftButton) -- 2.39.2