NewGeom is renamed to SHAPER

diff --git a/test.squish/objects_salome.map b/test.squish/objects_salome.map
index 9b1b13447097d697a022a0376684406149a52922..9a81c80f26a2d0ef20b661b335eef60f626f4e8c 100644 (file)
--- a/test.squish/objects_salome.map
+++ b/test.squish/objects_salome.map
@@ -313,7 +313,7 @@
 :SALOME*.Mirror_XGUI_PropertyPanel     {name='property_panel_dock' type='XGUI_PropertyPanel' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='Mirror'}
 :SALOME*.Modules_QtxToolBar    {name='SalomeModules' type='QtxToolBar' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='Modules'}
 :SALOME*.New part_QToolButton  {text='New part' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
-:SALOME*.NewGeom_QToolButton   {text='NewGeom' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
+:SALOME*.SHAPER_QToolButton    {text='SHAPER' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
 :SALOME*.New_QToolButton       {text='New' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
 :SALOME*.OCC scene:1 - viewer:1 - 3D_SOCC_ViewWindow   {type='SOCC_ViewWindow' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='OCC scene:1 - viewer:1 - 3D'}
 :SALOME*.OCC scene:1 - viewer:1_OCCViewer_ViewFrame    {type='OCCViewer_ViewFrame' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='OCC scene:1 - viewer:1'}

diff --git a/test.squish/shared/scripts/common.py b/test.squish/shared/scripts/common.py
index 2c06c5eed618be6108b944ff70ed498bd7af290d..e100a1dd48c3581c09af66428eeee64cd065f987 100644 (file)
--- a/test.squish/shared/scripts/common.py
+++ b/test.squish/shared/scripts/common.py
@@ -2,7 +2,7 @@ import os
 
 testSettings.logScreenshotOnError = True
 testSettings.logScreenshotOnFail = True
-# RESULTS_PATH = "/dn48/newgeom/eso/sources/test.squish/shared/testresults/"
+# RESULTS_PATH = "/dn48/SHAPER/eso/sources/test.squish/shared/testresults/"
 DATA_PATH = os.getenv('TEST_DATA_DIR')
 
 g_points = {"XY_plane": (332, 250), "XZ_plane": (355, 207)}  # one of the construction planes
@@ -29,8 +29,8 @@ def getSpinBoxRealName(name):
 def set_defaults():
     waitForObject(":SALOME*_STD_TabDesktop").resize(1024, 768)
 
-def activate_newgeom():
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+def activate_SHAPER():
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     clickButton(waitForObject(":Activate module.New_QPushButton"))
 
 def close_application():

diff --git a/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py b/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
index a02ffb488142981e2f3f970a2580bb81265c1638..e4dfa054c49dee78054e1f52c108859fc457b125 100644 (file)
--- a/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
+++ b/test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py
@@ -5,7 +5,7 @@ def main():
     
     startApplication("salome_run.sh")
     
-    activate_newgeom()
+    activate_SHAPER()
     
     clickButton(waitForObject(":SALOME*.Parameter_QToolButton"))
     type(waitForObject(":Parameter_QLineEdit"), "a")

diff --git a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_001/test.py b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_001/test.py
index fc36b2af00728af948964c11268a4c4a40859e17..33360b03147933c27515e06ebb737544d01a9d4a 100644 (file)
--- a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_001/test.py
+++ b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_001/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Boolean_001
     # [Topic] 'Boolean cut' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_boolean_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_002/test.py b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_002/test.py
index d0b3bb9ad10449522a9e485f69a0a5958552115a..2752b6c4b49e3738aa1f2a06a4dbab6fdd3faf1f 100644 (file)
--- a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_002/test.py
+++ b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_002/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Boolean_002
     # [Topic] 'Boolean fuse' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_boolean_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_003/test.py b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_003/test.py
index 3e107038d314ea3d613a28345c4cb7534f6fadd6..610a12557a338df80de86f57ef02aae1c2572492 100644 (file)
--- a/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_003/test.py
+++ b/test.squish/suite_FEATURE_BOOLEAN/tst_boolean_003/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Boolean_003
     # [Topic] 'Boolean common' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_boolean_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_CONSTRUCTION/tst_construction_001/test.py b/test.squish/suite_FEATURE_CONSTRUCTION/tst_construction_001/test.py
index 4f8db40d71d71b2010921429a93ef72ce117b922..3769427954522d53d6682c0e82bb9d9f8c22f429 100644 (file)
--- a/test.squish/suite_FEATURE_CONSTRUCTION/tst_construction_001/test.py
+++ b/test.squish/suite_FEATURE_CONSTRUCTION/tst_construction_001/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Construction_001
     # [Topic] 'Construction of point, axis and plane' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_construction_001.hdf'
     open(DATA_PATH + "/for_construction_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
index cb694f2f2d1a7db5c83aa75e30ad7bef4fad2dad..ab17fec13364416e874019553c46394cdf8ecf59 100644 (file)
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Extrusion_001
     # [Topic] 'Extrusion from size to size' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_extrusion_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py
index fce63c6b12115050530f779ea9eb487ac0ebc5e4..3788f6fd5177c9dbb11d0434491637c8b86bfc53 100644 (file)
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Extrusion_002
     # [Topic] 'Extrusion by boarding planes and offsets' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_extrusion_002.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py
index 6856a28bd947c6d29a515c08782237a3e5cf7f25..9a42e1b8d02fc994a1fbedf5496a8d52eccc8272 100644 (file)
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Extrusion_003
     # [Topic] 'Extrusion_cut' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_001.hdf'
     open(DATA_PATH + "/for_extrusion_003.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py
index 7079c8f7fdb987bda0bc65c4352c9e08a175485a..a2bbf63f1d5d8c4324de69cb890b4512d502c05f 100644 (file)
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Extrusion_004
     # [Topic] 'Extrusion_Fuse by sizes' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_003.hdf'
     open(DATA_PATH + "/for_extrusion_003.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py
index 2d54903f3391987901518128173b8b744748878b..39796a8011f57cfde9f863c19795db4f1a976a22 100644 (file)
--- a/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py
+++ b/test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Extrusion_006
     # [Topic] 'Extrusion_cut by planes' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_extrusion_006.hdf'
     open(DATA_PATH + "/for_extrusion_006.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py b/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py
index 3f72cb302243fab72a0f159177666738713f7dd7..e65974ab17c94eb551b1bbd140f2128f69947e1c 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py
@@ -33,7 +33,7 @@ import __builtin__
 @Given("Launch application in salome mode")
 def step(context):
     startApplication("salome_run.sh")
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     clickButton(waitForObject(":Activate module.New_QPushButton"))
 
 @When("Create parameter a=30")

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
index 94da0d06b37e7bb489fab69c493358265ff790c7..5c794deeb8f0a946dcfae3f3a990b4dc5f373cd3 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py
@@ -5,7 +5,7 @@ def main():
     
     startApplication("salome_run.sh")
     
-    activate_newgeom()
+    activate_SHAPER()
     
     #[step] Create parameter 'aa = 4'
     activateItem(waitForObjectItem(":SALOME*_QMenuBar", "Part"))

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
index b913649f0e4101d9f189bfd534b632280d05bc6e..fe77a9b135db9a0c72d6f26c2d0320fbea982983 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py
@@ -5,7 +5,7 @@ def main():
     
     startApplication("salome_run.sh")
    
-    activate_newgeom()
+    activate_SHAPER()
     
     clickButton(waitForObject(":SALOME*.Parameter_QToolButton"))
     type(waitForObject(":Parameter_QLineEdit"), "a")

diff --git a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
index 72d36e3392bd80ce88e2c6b2759da5cd86c120aa..af3273c6b341e5b760af686b789523ac8b9963c5 100644 (file)
--- a/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
+++ b/test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py
@@ -8,7 +8,7 @@ def main():
     
     startApplication("salome_run.sh")
    
-    activate_newgeom()
+    activate_SHAPER()
 
     #[step] Click menu Part->Parameter    
     activateItem(waitForObjectItem(":SALOME*_QMenuBar", "Part"))

diff --git a/test.squish/suite_FEATURE_PARTITION/tst_partition_001/test.py b/test.squish/suite_FEATURE_PARTITION/tst_partition_001/test.py
index 381b6a82c6b6d03704c3d477b384a77484e396dc..08343d7aab183c0756c5bce1b0d0045824bc3d03 100644 (file)
--- a/test.squish/suite_FEATURE_PARTITION/tst_partition_001/test.py
+++ b/test.squish/suite_FEATURE_PARTITION/tst_partition_001/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Partition_001
     # [Topic] 'Partition' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_partition_001.hdf'
     open(DATA_PATH + "/for_partition_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_001/test.py b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_001/test.py
index 97a0c2f07e591410cd43bab8f3fd38076f535a83..64222b58e6e82c87be47a83f2e17b662562820c0 100644 (file)
--- a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_001/test.py
+++ b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_001/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Revolution_001
     # [Topic] 'Revolution by angles' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_revolution_001.hdf'
     open(DATA_PATH + "/for_revolution_001.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_003/test.py b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_003/test.py
index ce2c6e5c152f0f3bf7cd8dd0fb254d6957cf7b29..4d13455b4a5e3acaaeb48c558c6b738af0e9aebc 100644 (file)
--- a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_003/test.py
+++ b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_003/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Revolution_003
     # [Topic] 'RevolutionCut by angles' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_revolution_003.hdf'
     open(DATA_PATH + "/for_revolution_003.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_004/test.py b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_004/test.py
index fd92a627c0ffedf5e85595e72ad20cfe59dfc8a3..340a95255ff204c6a2e33b35ab243dac5b9605a8 100644 (file)
--- a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_004/test.py
+++ b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_004/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Revolution_004
     # [Topic] 'RevolutionFuse by angles' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_revolution_004.hdf'
     open(DATA_PATH + "/for_revolution_004.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_005/test.py b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_005/test.py
index 1c11b2f614f8233a9b48295d4899c5efb3eb684f..9b593873fc58fd37cdcb91d0f3ba07046f6ebe87 100644 (file)
--- a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_005/test.py
+++ b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_005/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Revolution_005
     # [Topic] 'RevolutionFuse by planes and offsets' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_revolution_005.hdf'
     open(DATA_PATH + "/for_revolution_005.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_006/test.py b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_006/test.py
index 144e2918d34d53491cc16689a43465cc10352cae..dbf56a7ecc3433f261b3c7d30db200697f191edb 100644 (file)
--- a/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_006/test.py
+++ b/test.squish/suite_FEATURE_REVOLUTION/tst_revolution_006/test.py
@@ -1,5 +1,5 @@
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Revolution_006
     # [Topic] 'RevolutionCut by planes and offsets' functionality
     # [Tested functionality]
@@ -18,8 +18,8 @@ def main():
     # [step] Open 'for_revolution_003.hdf'
     open(DATA_PATH + "/for_revolution_003.hdf")
 
-    # [step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    # [step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_001/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_001/test.py
index ab92f1bc0e56c273ded4333decbc47fa9af2f586..bdb6cd0a56b3f4546cee86b1c3aa027c2b35a687 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_001/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_001/test.py
@@ -59,7 +59,7 @@ def sketch():
 def main():
     source(findFile("scripts", "common.py"))
     
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Sketch_001
     #[Topic] Creation of objects in sketch
     #[Tested functionality] Creation of objects during sketching by 2 ways: direct input of coordinates and clicking in viewer. Creation of auxiliary objects 
@@ -72,9 +72,9 @@ def main():
 
     set_defaults()
     
-    #[step] Activate NewGeom
+    #[step] Activate SHAPER
     #[step]Click 'New' button
-    activate_newgeom()
+    activate_SHAPER()
     
     #[section] Creation of sketch and objects inside it
     #[step] Part - New part

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_002/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_002/test.py
index a44160a881056137ed2226f24afd51abdeafff36..bebb08cf805567a7ffa9eff363ac62434c7e87de 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_002/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_002/test.py
@@ -24,7 +24,7 @@ def sketch():
     test.vp("VP2")
 
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     #[Scenario] Sketch_002
     #[Topic] Parallel objects
     #[Tested functionality]Parallelism between main lines
@@ -37,9 +37,9 @@ def main():
 
     set_defaults()
     
-    #[step] Activate NewGeom
+    #[step] Activate SHAPER
     #[step]Click 'New' button
-    activate_newgeom()
+    activate_SHAPER()
     #[section] Creation of main lines and make them parallel
     
     sketch_create(help_points("XY_plane"), lambda: sketch())

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_003/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_003/test.py
index fbdc2614c4484efee4a572a49b0eca0a6b6be716..1298d0115162c59e00d51253fc5bd6166627a759 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_003/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_003/test.py
@@ -2,7 +2,7 @@ def sketch():
     circle_create_in_view((302, 221), (436, 287))
     
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_003
     #[Topic]
     #[Tested functionality] Saving and opening studies
@@ -18,10 +18,10 @@ def main():
 
     set_defaults()
     #[section] Creation of 3D model
-    #[step] Activate NewGeom
+    #[step] Activate SHAPER
     #[step]Click 'New' button
     
-    activate_newgeom()
+    activate_SHAPER()
     #[step] Create new part
     part_create()
     #[step] Create sketch, consisting from one circle
@@ -52,8 +52,8 @@ def main():
     #[step] File - Open 
     #[step} Open just saved file  
     open("RESULTS_PATH + sketch_003.hdf")
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_004/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_004/test.py
index c315e713fcf30fe34d9f8f4c49fc0ffededc9183..25fee064141cecf0df4a2970d1c094da28812938 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_004/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_004/test.py
@@ -1,7 +1,7 @@
 import os
     
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_004
     #[Topic] 'Distance' constraint
     #[Tested functionality]
@@ -20,8 +20,8 @@ def main():
     #[step] Open 'for_sketch_004.hdf'
     open(os.path.join(DATA_PATH, "for_sketch_004.hdf"))
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_005/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_005/test.py
index 24dde5dd5196b5e6ed88a19d2d58e36f235ea9e5..33af0f4251299ccdc9b87d21dd378fa0c048af8d 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_005/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_005/test.py
@@ -27,7 +27,7 @@ def sketch():
 
 def main():
     
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Sketch_005
     #[Topic] Fixed point
     #[Tested functionality] 
@@ -41,9 +41,9 @@ def main():
 
     set_defaults()
     
-    #[step] Activate NewGeom
+    #[step] Activate SHAPER
     #[step]Click 'New' button
-    activate_newgeom()
+    activate_SHAPER()
     
     #[section] Creation of sketch and objects inside it
     #[step] Part - New part

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_006/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_006/test.py
index 6cc68e6391b685bdd70d866b5e505262ebd75ed1..9afcbde3f6058fcd661ffb9fa96d3cc62c1a1984 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_006/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_006/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_006
     #[Topic] Parallel lines
     #[Tested functionality] 'Parallel' constraint
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_006.hdf'
     open(DATA_PATH + "/for_sketch_006.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_007/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_007/test.py
index 7d0092fe9049d8c06503dc4c777eef54ee485bd6..84f08c3ab9b12f96f3ca286be547cd5db63bb75f 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_007/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_007/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_007
     #[Topic] Perpendicular lines
     #[Tested functionality] 'Perpendicular' constraint
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_006.hdf'
     open(DATA_PATH + "/for_sketch_007.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_008/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_008/test.py
index 1a0bc15ac3b762da4b6a8ea9ef9ff92bba458ecc..bc54e74cbbfe4a017e6d78317901fa27f925cb4a 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_008/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_008/test.py
@@ -16,7 +16,7 @@ def sketch():
 
 def main():
     
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] Sketch_008
     #[Topic] 'Coincident' functionality
     #[Tested functionality] 
@@ -30,9 +30,9 @@ def main():
 
     set_defaults()
     
-    #[step] Activate NewGeom
+    #[step] Activate SHAPER
     #[step]Click 'New' button
-    activate_newgeom()
+    activate_SHAPER()
     
     #[section] Creation of sketch and objects inside it
     #[step] Part - New part

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_009/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_009/test.py
index f47f89714219145e4758b0dc07faff2012c6976c..0bb5feb6ed3ecebfe87bdc4bb81701e7d1b648ce 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_009/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_009/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_009
     #[Topic] 'Equal' functionality 
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_006.hdf'
     open(DATA_PATH + "/for_sketch_009.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_010/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_010/test.py
index 9d6f746c0a298127ceb9703888d1e32d6d3e6a62..c6c28ea9b8f5c32a496cedfdf176d9035f36f815 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_010/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_010/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_010
     #[Topic] 'Vertical' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_006.hdf'
     open(DATA_PATH + "/for_sketch_010.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_011/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_011/test.py
index e67e1e52ba4a98e4d117f6c850e3966b308477a1..fadfc027e7a673feb76a011826099571f6b6e5d7 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_011/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_011/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_010
     #[Topic] 'Horizontal' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_006.hdf'
     open(DATA_PATH + "/for_sketch_010.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_012/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_012/test.py
index 533bd586e8dc1b368713e955db395d6982c8cf81..18ddd081bfd4b57ada6746f8d8a3fef76e7ddf6c 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_012/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_012/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_012
     #[Topic] 'Length' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_012.hdf'
     open(DATA_PATH + "/for_sketch_012.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_013/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_013/test.py
index f3cfa1c6cceab055d15f4fc74ece307b5f162b65..c4486342a04421633233224df3b86362cc6f6660 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_013/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_013/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_013
     #[Topic] 'Radius' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_013.hdf'
     open(DATA_PATH + "/for_sketch_013.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_014/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_014/test.py
index b227005c4be2999d22625e46c423e3b2bcf90d9c..cacf4197d5f25eeb695e7649250002956157ad34 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_014/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_014/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_014
     #[Topic] 'Mirror' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_014.hdf'
     open(DATA_PATH + "/for_sketch_014.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_015/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_015/test.py
index 892965a40e344b88319e14524adea9b60f61f225..0c310c565f35773d7b2e17ba6dfe1ece46a46ffc 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_015/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_015/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_015
     #[Topic] 'Fillet' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_015.hdf'
     open(DATA_PATH + "/for_sketch_015.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_016/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_016/test.py
index 046f61ed9a717df415dca185e847eaca04b825a1..80e1f8ab433caeaf420fcd0f66cf8ecc1ccb761e 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_016/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_016/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_016
     #[Topic] 'Translation' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_016.hdf'
     open(DATA_PATH + "/for_sketch_016.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_017/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_017/test.py
index 4be40b90cd32b7640f730f0b15fe9e9865038465..ac2ce083419fb0519d41574f975fe13903ae0deb 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_017/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_017/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_017
     #[Topic] 'Rotation' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_016.hdf'
     open(DATA_PATH + "/for_sketch_016.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_FEATURE_SKETCH/tst_sketch_018/test.py b/test.squish/suite_FEATURE_SKETCH/tst_sketch_018/test.py
index ece99f73d1a214880b00ba3b0a5981946988d191..a1183e833e65b03f016257203565dde465ba4690 100644 (file)
--- a/test.squish/suite_FEATURE_SKETCH/tst_sketch_018/test.py
+++ b/test.squish/suite_FEATURE_SKETCH/tst_sketch_018/test.py
@@ -1,6 +1,6 @@
 
 def main():
-    #[project] NewGEOM
+    #[project] SHAPER
     #[Scenario] Sketch_018
     #[Topic] 'Tangency' functionality
     #[Tested functionality] 
@@ -19,8 +19,8 @@ def main():
     #[step] Open 'for_sketch_018.hdf'
     open(DATA_PATH + "/for_sketch_018.hdf")
     
-    #[step] Activate NewGeom
-    clickButton(waitForObject(":SALOME*.NewGeom_QToolButton"))
+    #[step] Activate SHAPER
+    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")

diff --git a/test.squish/suite_ISSUES_SALOME/tst_532/test.py b/test.squish/suite_ISSUES_SALOME/tst_532/test.py
index 831e98e974703776830c896c93e5a420d59999de..dc2625990231cf45105c080d90558feec9bdffcf 100644 (file)
--- a/test.squish/suite_ISSUES_SALOME/tst_532/test.py
+++ b/test.squish/suite_ISSUES_SALOME/tst_532/test.py
@@ -13,7 +13,7 @@ def main():
     startApplication("salome_run.sh")
     set_defaults()
     
-    activate_newgeom()
+    activate_SHAPER()
 
     sketch_create(help_points("XY_plane"), lambda: sketch_circle())
     sketch_create(help_points("XY_plane"), lambda: sketch_lines())

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 41dda7783cca112d69ac5f439cc177c1351c282d..3ff7857ef756e0bac4a172f89cc4d980808ca536 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
@@ -56,7 +56,7 @@ def main():
     source(findFile("scripts", "common.py"))
     
     startApplication("salome_run.sh")
-    activate_newgeom()
+    activate_SHAPER()
 
     #[step] Check that default elements are enabled: Parameters (0), Constructions (4), Parts (0)
     waitForObjectItem(":Object browser_XGUI_DataTree", "Constructions (4)")

diff --git a/test.squish/suite_PYTHONAPI_SALOME/tst_Platine/test.py b/test.squish/suite_PYTHONAPI_SALOME/tst_Platine/test.py
index 91bf14dc3a3b8c581bbf2efa06383e0f624164d5..8b836c50bf6b764c7ee3042df0bb091ddd8da348 100644 (file)
--- a/test.squish/suite_PYTHONAPI_SALOME/tst_Platine/test.py
+++ b/test.squish/suite_PYTHONAPI_SALOME/tst_Platine/test.py
@@ -8,7 +8,7 @@ def set_parameter_value(name, value):
     clickButton(waitForObject(":Boolean.property_panel_ok_QToolButton"))
 
 def main():
-    # [project] NewGEOM
+    # [project] SHAPER
     # [Scenario] 'Platine' model created by PythonAPI
     # [Topic] PythonAPI functionality
     # [Tested functionality]
@@ -25,7 +25,7 @@ def main():
     set_defaults()
 
     # [step] Activate Shaper module and create new file
-    activate_newgeom()
+    activate_SHAPER()
 
     # [step] In Python console type: import examples.Platine
     type(waitForObject(":Python Console_PyConsole_EnhEditor"), "import examples.Platine")