From d02a4187b50a5416490c15a377406421fdc303de Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 1 Mar 2016 08:22:54 +0300 Subject: [PATCH] NewGeom is renamed to SHAPER --- test.squish/objects_salome.map | 2 +- test.squish/shared/scripts/common.py | 6 +++--- test.squish/suite_ERROR_NOTIFICATION/tst_679/test.py | 2 +- .../suite_FEATURE_BOOLEAN/tst_boolean_001/test.py | 6 +++--- .../suite_FEATURE_BOOLEAN/tst_boolean_002/test.py | 6 +++--- .../suite_FEATURE_BOOLEAN/tst_boolean_003/test.py | 6 +++--- .../tst_construction_001/test.py | 6 +++--- .../suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py | 6 +++--- .../suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py | 6 +++--- .../suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py | 6 +++--- .../suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py | 6 +++--- .../suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py | 6 +++--- .../suite_FEATURE_PARAMETERS/shared/steps/steps.py | 2 +- test.squish/suite_FEATURE_PARAMETERS/tst_474/test.py | 2 +- test.squish/suite_FEATURE_PARAMETERS/tst_576/test.py | 2 +- test.squish/suite_FEATURE_PARAMETERS/tst_903/test.py | 2 +- .../suite_FEATURE_PARTITION/tst_partition_001/test.py | 6 +++--- .../tst_revolution_001/test.py | 6 +++--- .../tst_revolution_003/test.py | 6 +++--- .../tst_revolution_004/test.py | 6 +++--- .../tst_revolution_005/test.py | 6 +++--- .../tst_revolution_006/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_001/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_002/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_003/test.py | 10 +++++----- .../suite_FEATURE_SKETCH/tst_sketch_004/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_005/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_006/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_007/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_008/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_009/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_010/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_011/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_012/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_013/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_014/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_015/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_016/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_017/test.py | 6 +++--- .../suite_FEATURE_SKETCH/tst_sketch_018/test.py | 6 +++--- test.squish/suite_ISSUES_SALOME/tst_532/test.py | 2 +- .../tst_ACTIVE_DOC_MANAGEMENT/test.py | 2 +- test.squish/suite_PYTHONAPI_SALOME/tst_Platine/test.py | 4 ++-- 43 files changed, 114 insertions(+), 114 deletions(-) diff --git a/test.squish/objects_salome.map b/test.squish/objects_salome.map index 9b1b13447..9a81c80f2 100644 --- 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 2c06c5eed..e100a1dd4 100644 --- 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 a02ffb488..e4dfa054c 100644 --- 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 fc36b2af0..33360b031 100644 --- 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 d0b3bb9ad..2752b6c4b 100644 --- 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 3e107038d..610a12557 100644 --- 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 4f8db40d7..376942795 100644 --- 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 cb694f2f2..ab17fec13 100644 --- 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 fce63c6b1..3788f6fd5 100644 --- 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 6856a28bd..9a42e1b8d 100644 --- 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 7079c8f7f..a2bbf63f1 100644 --- 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 2d54903f3..39796a801 100644 --- 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 3f72cb302..e65974ab1 100644 --- 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 94da0d06b..5c794deeb 100644 --- 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 b913649f0..fe77a9b13 100644 --- 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 72d36e339..af3273c6b 100644 --- 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 381b6a82c..08343d7aa 100644 --- 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 97a0c2f07..64222b58e 100644 --- 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 ce2c6e5c1..4d13455b4 100644 --- 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 fd92a627c..340a95255 100644 --- 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 1c11b2f61..9b593873f 100644 --- 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 144e2918d..dbf56a7ec 100644 --- 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 ab92f1bc0..bdb6cd0a5 100644 --- 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 a44160a88..bebb08cf8 100644 --- 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 fbdc2614c..1298d0115 100644 --- 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 c315e713f..25fee0641 100644 --- 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 24dde5dd5..33af0f425 100644 --- 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 6cc68e639..9afcbde3f 100644 --- 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 7d0092fe9..84f08c3ab 100644 --- 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 1a0bc15ac..bc54e74cb 100644 --- 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 f47f89714..0bb5feb6e 100644 --- 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 9d6f746c0..c6c28ea9b 100644 --- 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 e67e1e52b..fadfc027e 100644 --- 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 533bd586e..18ddd081b 100644 --- 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 f3cfa1c6c..c4486342a 100644 --- 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 b227005c4..cacf4197d 100644 --- 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 892965a40..0c310c565 100644 --- 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 046f61ed9..80e1f8ab4 100644 --- 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 4be40b90c..ac2ce0834 100644 --- 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 ece99f73d..a1183e833 100644 --- 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 831e98e97..dc2625990 100644 --- 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 41dda7783..3ff7857ef 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 @@ -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 91bf14dc3..8b836c50b 100644 --- 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") -- 2.39.2