From: spo <sergey.pokhodenko@opencascade.com>
Date: Fri, 14 Aug 2015 06:25:05 +0000 (+0300)
Subject: Update SQUISH tests.
X-Git-Tag: V_1.4.0_beta4~381
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f75a905cbc805a40b32c1da1076495404874455;p=modules%2Fshaper.git

Update SQUISH tests.
---

diff --git a/test.squish/suite_ISSUES/suite.conf b/test.squish/suite_ISSUES/suite.conf
index 95a875b46..af25ede87 100644
--- a/test.squish/suite_ISSUES/suite.conf
+++ b/test.squish/suite_ISSUES/suite.conf
@@ -1,5 +1,5 @@
-AUT=
-CWD=<CWD_of_Server>
+AUT=linux_run.sh
+CWD=<AUT_path>
 ENVVARS=envvars
 HOOK_SUB_PROCESSES=true
 IMPLICITAUTSTART=0
diff --git a/test.squish/suite_ISSUES/tst_818/test.py b/test.squish/suite_ISSUES/tst_818/test.py
index 8fa2fabdd..24bda7798 100644
--- a/test.squish/suite_ISSUES/tst_818/test.py
+++ b/test.squish/suite_ISSUES/tst_818/test.py
@@ -17,6 +17,6 @@ def main():
     activateItem(waitForObjectItem(":_QMenu", "Delete"))
     
     waitFor("object.exists(':Delete features.Label_QLabel')", 20000)
-    test.compare(str(findObject(":Delete features.Label_QLabel").text), "Selected features are used in the following features: SketchLine_1.These features will be deleted.\nAlso these features will be deleted: Sketch_1.\nWould you like to continue?")
+    test.compare(str(findObject(":Delete features.Label_QLabel").text), "Selected features are used in the following features: SketchLine_1. These features will be deleted.\nAlso these features will be deleted: Sketch_1.\nWould you like to continue?")
 
     clickButton(waitForObject(":Delete features.Yes_QPushButton"))
diff --git a/test.squish/suite_ISSUES/tst_c/test.py b/test.squish/suite_ISSUES/tst_c/test.py
index 2cb0d4f56..82038e533 100644
--- a/test.squish/suite_ISSUES/tst_c/test.py
+++ b/test.squish/suite_ISSUES/tst_c/test.py
@@ -1,7 +1,7 @@
 def main():
     source(findFile("scripts", "common.py"))
     
-    startApplication("GeomApp")
+    startApplication("linux_run.sh")
     set_defaults()
     
     clickButton(waitForObject(":Operations.New part_AppElements_Button"))
diff --git a/test.squish/suite_ISSUES/tst_common_1/test.py b/test.squish/suite_ISSUES/tst_common_1/test.py
index 1f194a797..417432ff5 100644
--- a/test.squish/suite_ISSUES/tst_common_1/test.py
+++ b/test.squish/suite_ISSUES/tst_common_1/test.py
@@ -28,7 +28,7 @@ def sketch_1():
     radius_create((282, 203), (299, 177), 15)
     radius_create((456, 174), (402, 157), 15)
     radius_create((284, 454), (304, 438), 15)
-    radius_create((483, 459), (472, 486), 15)
+    radius_create((467, 484), (472, 486), 15)
     
     distance_create((269, 191), (463,198), (433, 101), 170)
     distance_create((265, 463), (445, 404), (328, 545), 170)
@@ -56,7 +56,7 @@ def sketch_2():
 def main():
     source(findFile("scripts", "common.py"))
     
-    startApplication("GeomApp")
+    startApplication("linux_run.sh")
     set_defaults()
     
     part_create()
diff --git a/test.squish/suite_ISSUES_SALOME/tst_474/test.py b/test.squish/suite_ISSUES_SALOME/tst_474/test.py
index 38ad1ce45..44c00a441 100644
--- a/test.squish/suite_ISSUES_SALOME/tst_474/test.py
+++ b/test.squish/suite_ISSUES_SALOME/tst_474/test.py
@@ -20,7 +20,7 @@ def main():
     openItemContextMenu(waitForObject(":Object browser_XGUI_DataTree"), "Parameters (1).aa = 4", 10, 10, 0)
     activateItem(waitForObjectItem(":_QMenu", "Delete"))
     waitFor("object.exists(':Delete features._QLabel')", 20000)
-    test.compare(str(findObject(":Delete features._QLabel").text), "Selected features are used in the following features: bb.These features will be deleted.\nWould you like to continue?")
+    test.compare(str(findObject(":Delete features._QLabel").text), "Selected features are used in the following features: bb. These features will be deleted.\nWould you like to continue?")
     clickButton(waitForObject(":Delete features.No_QPushButton"))
     
     close_application()