From: spo <sergey.pokhodenko@opencascade.com>
Date: Thu, 26 Nov 2015 12:35:29 +0000 (+0300)
Subject: Fix SQUISH tests
X-Git-Tag: V_2.1.0~230
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3cd382f1c89077d73b712975a277a9fb21732fd9;p=modules%2Fshaper.git

Fix SQUISH tests
---

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
index 84f362072..72d36e339 100644
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
@@ -19,10 +19,10 @@ def main():
     test.compare(str(findObject(":Parameter_QFrame").toolTip), "Model_FeatureValidator: Attribute \"expression\" is not initialized.")
     #[step] Check that name tooltip is: Errors:\nvariable - Parameters_VariableValidator: Incorrect variable name.
     waitFor("object.exists(':Parameter_QLineEdit')", 20000)
-    test.compare(str(findObject(":Parameter_QLineEdit").toolTip), "Errors:\nvariable - Parameters_VariableValidator: Incorrect variable name.")
+    test.compare(str(findObject(":Parameter_QLineEdit").toolTip), 'Errors:\nvariable - Parameters_VariableValidator: Attribute "variable" value is empty.')
     #[step] Check that expression tooltip is: Errors:\nexpression - Parameters_ExpressionValidator: Expression is empty.
     waitFor("object.exists(':Parameter_ExpressionEditor')", 20000)
-    test.compare(str(findObject(":Parameter_ExpressionEditor").toolTip), "Errors:\nexpression - Parameters_ExpressionValidator: Expression is empty.")
+    test.compare(str(findObject(":Parameter_ExpressionEditor").toolTip), 'Errors:\nexpression - Parameters_ExpressionValidator: Attribute "expression" is not initialized.')
 
     #[step] Enter variable name 'a'    
     type(waitForObject(":Parameter_QLineEdit"), "a")
@@ -34,16 +34,16 @@ def main():
     
     #[step] Check that expression tooltip is: Errors:\nexpression - Parameters_ExpressionValidator: name 'b' is not defined
     waitFor("object.exists(':Parameter_ExpressionEditor')", 20000)
-    test.compare(str(findObject(":Parameter_ExpressionEditor").toolTip), "Errors:\nexpression - Parameters_ExpressionValidator: name 'b' is not defined")
+    test.compare(str(findObject(":Parameter_ExpressionEditor").toolTip), "Errors:\nexpression - Parameters_ExpressionValidator: Result is empty.")
     #[step] Check that result message is: Error: unexpected EOF while parsing (<string>, line 0)
     waitFor("object.exists(':Parameter.Result_QLabel')", 20000)
     test.compare(str(findObject(":Parameter.Result_QLabel").text), "Error: name 'b' is not defined")
 
     #[step] Check that feature ToolTip is: expression - Parameters_ExpressionValidator: name 'b' is not defined
     waitFor("object.exists(':Parameter_QFrame')", 20000)
-    test.compare(str(findObject(":Parameter_QFrame").toolTip), "expression - Parameters_ExpressionValidator: name 'b' is not defined")
+    test.compare(str(findObject(":Parameter_QFrame").toolTip), "expression - Parameters_ExpressionValidator: Result is empty.")
 
-    #[step] Check that apply button is red [vp VP_APPLY_RED]
-    test.vp("VP_APPLY_RED")
+    #[step] Check that apply button is grey [vp VP_APPLY_GREY]
+    test.vp("VP_APPLY_GREY")
 
     close_application()
diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_903/verificationPoints/VP_APPLY_GREY b/test.squish/suite_FEATURE_PARAMETERS/tst_903/verificationPoints/VP_APPLY_GREY
new file mode 100644
index 000000000..05b383094
--- /dev/null
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_903/verificationPoints/VP_APPLY_GREY
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<VerificationPoint type="Screenshot" version="4">
+<Description/>
+<Verification object=":Parameter.property_panel_ok_QToolButton" type="PNG">iVBORw0KGgoAAAANSUhEUgAAABcAAAAWCAYAAAArdgcFAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAeFJREFUOI3V1c2PGXEcx/H3GJRiUyJWL2ZkxzqMC+r/v3ST7qFbYVPJqtL10BLsJDMMmaceJAQVm8Wh39tk5veazy/f34Mw+D3wuFD5LgVfHPefMtjzPBqNBqJPJHebw+fbznpS8sf6I57nIfgE7j7f7b1/Mz6bz3jRXojH40SjUWzHPh/+8PWBbDYLwHw25yp2dR681+0Ri8UQRRGAbrdLsVQ8ji+XSyzLOgi7rsvTjydSqRQAw+GQG+Vmr5mws1pqtRqGYWDbNrIsk8lk9gZUq1WkjASA4zgYukGxuJ96L/lkMkGWZRRFodftMZ1Otz7WdZ3FYkE4HAag3W5T+lQ6OMst3C/68dzVaSBnZeq1OqZpblJ/26TWdZ34hziR95HX4eVymdbP1vpZURTuv9zjOA6tVotEIoHgEwDo9/qoBfUgDCDsHlzj8Zhms4kkrRJalsXzr2dc1yV3m1vB/T6SJK2beqj2tn8ymWQ+mzP8M+Q6fU0gECD9MU0wGFz/zHbsozAcWOcZKUPwXRBN0wCIRCIEAgEAOp0O5VL5KHwQB1BVFcMwMOebhmqaRjq9mcWbcYBKpcJgMMA0TSzLYjQakc/nXwXDPxq6W67r0vjewFyaFNQCoVDofPgp9f9ec38BgXXGishDpjEAAAAASUVORK5CYII=<Mask/>
+</Verification>
+</VerificationPoint>