[squish] removed prefix, cleaned up

Task-number: AUTOSUITE-662
Change-Id: Iaf8387af190f17d657a9478025532c1ff1708504
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>

8 files changed, 25 insertions, 37 deletions

diff --git a/squishtests/suite_neptune3/.gitignore b/squishtests/suite_neptune3/.gitignore
new file mode 100644
index 00000000..c9bb6621
--- /dev/null
+++ b/squishtests/suite_neptune3/.gitignore
@@ -0,0 +1,3 @@
+# the folder should be directly loadable by squish IDE,
+# so exclude this for now, since it uses direct (user) paths
+envvars
diff --git a/squishtests/suite_neptune3/shared/objects.map b/squishtests/suite_neptune3/shared/objects.map
index 84cbc52f..91573655 100644
--- a/squishtests/suite_neptune3/shared/objects.map
+++ b/squishtests/suite_neptune3/shared/objects.map
@@ -1,5 +1,4 @@
 :Neptune UI - Center Console.grid_GridView	{container=':Neptune UI - Center Console_QQuickWindowQmlImpl' id='grid' type='GridView' unnamed='1' visible='true'}
-:Neptune UI - Center Console.instrumentClusterWindowLoader_Loader	{container=':Neptune UI - Center Console_QQuickWindowQmlImpl' id='instrumentClusterWindowLoader' type='Loader' unnamed='1' visible='true'}
 :Neptune UI - Center Console.leftIcon_ToolButton	{checkable='false' container=':Neptune UI - Center Console_QQuickWindowQmlImpl' id='leftIcon' type='ToolButton' unnamed='1' visible='true'}
 :Neptune UI - Center Console.leftTempSlider_TemperatureSlider	{container=':Neptune UI - Center Console_QQuickWindowQmlImpl' id='leftTempSlider' type='TemperatureSlider' unnamed='1' visible='true'}
 :Neptune UI - Center Console.rightTempSlider_TemperatureSlider	{container=':Neptune UI - Center Console_QQuickWindowQmlImpl' id='rightTempSlider' type='TemperatureSlider' unnamed='1' visible='true'}
diff --git a/squishtests/suite_neptune3/shared/scripts/names.py b/squishtests/suite_neptune3/shared/scripts/names.py
index d3a7dc22..9e1f6cbd 100644
--- a/squishtests/suite_neptune3/shared/scripts/names.py
+++ b/squishtests/suite_neptune3/shared/scripts/names.py
@@ -33,38 +33,24 @@
 
 from objectmaphelper import *
 
+o_QVariant = {"type": "QVariant"}
 neptune_UI_Center_Console = {"title": "Neptune 3 UI - Center Console", "type": "QQuickWindowQmlImpl", "unnamed": 1, "visible": True}
 neptune_UI_Center_Console_grid_GridView = {"container": neptune_UI_Center_Console, "id": "grid", "type": "GridView", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_instrumentClusterWindowLoader_Loader = {"container": neptune_UI_Center_Console, "id": "instrumentClusterWindowLoader", "type": "Loader", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_leftIcon_ToolButton = {"checkable": False, "container": neptune_UI_Center_Console, "id": "leftIcon", "type": "ToolButton", "unnamed": 1, "visible": True}
 neptune_UI_Center_Console_leftTempSlider_TemperatureSlider = {"container": neptune_UI_Center_Console, "id": "leftTempSlider", "type": "TemperatureSlider", "unnamed": 1, "visible": True}
 neptune_UI_Center_Console_rightTempSlider_TemperatureSlider = {"container": neptune_UI_Center_Console, "id": "rightTempSlider", "type": "TemperatureSlider", "unnamed": 1, "visible": True}
-o_QVariant = {"type": "QVariant"}
 neptune_UI_Instrument_Cluster_QQuickWindowQmlImpl = {"title": "Neptune 3 UI - Instrument Cluster", "type": "QQuickWindowQmlImpl", "unnamed": 1, "visible": True, "window": o_QVariant}
-grid_Item = {"container": neptune_UI_Center_Console_grid_GridView, "type": "Item", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_rightTempSlider_TemperatureSlider_2 = {"container": ":Neptune UI - Center Console_QQuickWindowQmlImpl", "id": "rightTempSlider", "type": "TemperatureSlider", "unnamed": 1, "visible": True}
 neptune_UI_Center_Console_widgetListview_ListView = {"container": neptune_UI_Center_Console, "id": "widgetListview", "type": "ListView", "unnamed": 1, "visible": True}
-widgetListview_Maps_ListItem = {"checkable": False, "container": neptune_UI_Center_Console_widgetListview_ListView, "text": "Maps", "type": "ListItem", "unnamed": 1, "visible": True}
-maps_Maps_Label = {"container": widgetListview_Maps_ListItem, "text": "Maps", "type": "Label", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_appWidget_ApplicationWidget = {"container": neptune_UI_Center_Console, "id": "appWidget", "type": "ApplicationWidget", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_grid_GridView_2 = {"container": ":Neptune UI - Center Console_QQuickWindowQmlImpl", "id": "grid", "type": "GridView", "unnamed": 1, "visible": True}
-grid_delegateRoot_MouseArea = {"container": neptune_UI_Center_Console_grid_GridView_2, "id": "delegateRoot", "index": 0, "type": "MouseArea", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_root_AddWidgetPopup = {"container": neptune_UI_Center_Console, "id": "root", "type": "AddWidgetPopup", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_homeButton_ToolButton = {"checkable": True, "container": neptune_UI_Center_Console, "id": "homeButton", "type": "ToolButton", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_root_PrimaryWindow = {"container": neptune_UI_Center_Console, "id": "root", "type": "PrimaryWindow", "unnamed": 1, "visible": True}
-neptune_UI_Center_Console_squish_on_toolbutton_ToolButton = {"container": neptune_UI_Center_Console, "id": "squish_close_button", "objectName": "squish_on_toolbutton", "type": "ToolButton", "visible": True}
-neptune_3_UI_Center_Console_squish_volumePopupButton_ToolButton = {"container": neptune_UI_Center_Console, "objectName": "squish_volumePopupButton", "type": "ToolButton", "visible": True}
-neptune_3_UI_Center_Console_squish_volumePopupItem_VolumePopup = {"container": neptune_UI_Center_Console, "objectName": "squish_volumePopupItem", "type": "VolumePopup", "visible": True}
-neptune_3_UI_Center_Console_squish_popupClose_ToolButton = {"checkable": False, "container": neptune_UI_Center_Console, "objectName": "squish_popupClose", "type": "ToolButton", "visible": True}
-neptune_3_UI_Center_Console_squish_volumeSlider_Slider = {"container": neptune_UI_Center_Console, "objectName": "squish_volumeSlider", "type": "Slider", "visible": True}
+neptune_3_UI_Center_Console_volumePopupButton_ToolButton = {"container": neptune_UI_Center_Console, "objectName": "volumePopupButton", "type": "ToolButton", "visible": True}
+neptune_3_UI_Center_Console_volumePopupItem_VolumePopup = {"container": neptune_UI_Center_Console, "objectName": "volumePopupItem", "type": "VolumePopup", "visible": True}
+neptune_3_UI_Center_Console_popupClose_ToolButton = {"checkable": False, "container": neptune_UI_Center_Console, "objectName": "popupClose", "type": "ToolButton", "visible": True}
+neptune_3_UI_Center_Console_volumeSlider_Slider = {"container": neptune_UI_Center_Console, "objectName": "volumeSlider", "type": "Slider", "visible": True}
 neptune_3_UI_Center_Console_centerConsole_CenterConsole = {"container": neptune_UI_Center_Console, "id": "centerConsole", "type": "CenterConsole", "visible": True}
-neptune_3_UI_Center_Console_squish_addWidgetButton_ToolButton = {"checkable": False, "container": neptune_UI_Center_Console, "objectName": "squish_addWidgetButton", "type": "ToolButton", "visible": True}
-neptune_3_UI_Center_Console_squish_addWidgetPopupItem_AddWidgetPopup = {"container": neptune_UI_Center_Console, "objectName": "squish_addWidgetPopupItem", "type": "AddWidgetPopup", "visible": True}
-widgetList_AddWidgets_Maps = {"checkable": False, "container": neptune_UI_Center_Console_widgetListview_ListView, "objectName": "squish_itemAddWidget_com.pelagicore.map", "text": "Maps", "type": "ListItem", "visible": True}
-neptune_3_UI_Center_Console_squish_homeWidget_Maps_Column = {"container": neptune_UI_Center_Console, "objectName": "squish_homeWidget_com.pelagicore.map", "type": "Column", "visible": True}
-good_appMainMenu_WidgetClose_Map_MouseArea = {"container": neptune_UI_Center_Console, "objectName": "squish_appWidgetClose_com.pelagicore.map", "type": "MouseArea", "visible": True}
-maps_Maps_Label_2 = {"container": widgetList_AddWidgets_Maps, "text": "Maps", "type": "Label", "unnamed": 1, "visible": True}
-neptune_3_UI_Center_Console_squish_launcherCenterConsole_Launcher = {"container": neptune_UI_Center_Console, "objectName": "squish_launcher", "type": "Launcher", "visible": True}
-neptune_3_UI_Center_Console_squish_gridButton_ToolButton = {"checkable": True, "container": neptune_UI_Center_Console, "objectName": "squish_gridButton", "type": "ToolButton", "visible": True}
-neptune_3_UI_Center_Console_squish_climateBarMouseArea_MouseArea = {"container": neptune_UI_Center_Console, "objectName": "squish_climateBarMouseArea", "type": "MouseArea", "visible": True}
-neptune_3_UI_Center_Console_squish_editableLauncher_EditableGridView = {"container": neptune_UI_Center_Console, "objectName": "squish_editableLauncher", "type": "EditableGridView", "visible": True}
+neptune_3_UI_Center_Console_addWidgetButton_ToolButton = {"checkable": False, "container": neptune_UI_Center_Console, "objectName": "addWidgetButton", "type": "ToolButton", "visible": True}
+neptune_3_UI_Center_Console_addWidgetPopupItem_AddWidgetPopup = {"container": neptune_UI_Center_Console, "objectName": "addWidgetPopupItem", "type": "AddWidgetPopup", "visible": True}
+widgetList_AddWidgets_Maps = {"checkable": False, "container": neptune_UI_Center_Console_widgetListview_ListView, "objectName": "itemAddWidget_com.pelagicore.map", "text": "Maps", "type": "ListItem", "visible": True}
+neptune_3_UI_Center_Console_homeWidget_Maps_Column = {"container": neptune_UI_Center_Console, "objectName": "homeWidget_com.pelagicore.map", "type": "Column", "visible": True}
+good_appMainMenu_WidgetClose_Map_MouseArea = {"container": neptune_UI_Center_Console, "objectName": "appWidgetClose_com.pelagicore.map", "type": "MouseArea", "visible": True}
+neptune_3_UI_Center_Console_launcherCenterConsole_Launcher = {"container": neptune_UI_Center_Console, "objectName": "launcher", "type": "Launcher", "visible": True}
+neptune_3_UI_Center_Console_gridButton_ToolButton = {"checkable": True, "container": neptune_UI_Center_Console, "objectName": "gridButton", "type": "ToolButton", "visible": True}
+neptune_3_UI_Center_Console_climateBarMouseArea_MouseArea = {"container": neptune_UI_Center_Console, "objectName": "climateBarMouseArea", "type": "MouseArea", "visible": True}
+neptune_3_UI_Center_Console_editableLauncher_EditableGridView = {"container": neptune_UI_Center_Console, "objectName": "editableLauncher", "type": "EditableGridView", "visible": True}
diff --git a/squishtests/suite_neptune3/shared/steps/essential.py b/squishtests/suite_neptune3/shared/steps/essential.py
index 8d3fcb1f..27099f13 100644
--- a/squishtests/suite_neptune3/shared/steps/essential.py
+++ b/squishtests/suite_neptune3/shared/steps/essential.py
@@ -115,7 +115,7 @@ def step(context,seconds):
 # --------------------- specific not yet clear, where to put it
 @When("the popup close button is clicked")
 def step(context):
-    popup_close_button = waitForObject(names.neptune_3_UI_Center_Console_squish_popupClose_ToolButton)
+    popup_close_button = waitForObject(names.neptune_3_UI_Center_Console_popupClose_ToolButton)
     mouseClick(popup_close_button)
 
 def is_squish_object_there(squish_object,seconds):
diff --git a/squishtests/suite_neptune3/suite.conf b/squishtests/suite_neptune3/suite.conf
index 46d64ca9..beb85675 100644
--- a/squishtests/suite_neptune3/suite.conf
+++ b/squishtests/suite_neptune3/suite.conf
@@ -1,4 +1,4 @@
-AUT=neptune3-ui -c am-config.yaml --start-session-dbus -platform eglfs -plugin evdevkeyboard:grab=1 --logging-rule *=true --logging-rule Qt3D.*.debug=false --logging-rule=""qt.*.debug=false
+AUT=
 CWD=<AUT_path>
 ENVVARS=envvars
 HOOK_SUB_PROCESSES=false
diff --git a/squishtests/suite_neptune3/tst_launch_bar/steps/launch_bar.py b/squishtests/suite_neptune3/tst_launch_bar/steps/launch_bar.py
index a0225afd..36dadb2c 100644
--- a/squishtests/suite_neptune3/tst_launch_bar/steps/launch_bar.py
+++ b/squishtests/suite_neptune3/tst_launch_bar/steps/launch_bar.py
@@ -40,15 +40,15 @@ def hook(context):
 
 @Given("the launch bar is shown")
 def step(context):
-    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_squish_launcherCenterConsole_Launcher).enabled, True)
-    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_squish_launcherCenterConsole_Launcher).visible, True)
+    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_launcherCenterConsole_Launcher).enabled, True)
+    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_launcherCenterConsole_Launcher).visible, True)
 
 @When("the grid icon is clicked")
 def step(context):
-    grid_button = waitForObject(names.neptune_3_UI_Center_Console_squish_gridButton_ToolButton)
+    grid_button = waitForObject(names.neptune_3_UI_Center_Console_gridButton_ToolButton)
     mouseClick(grid_button)
 
 @Then("the grid should be '|word|'")
 def step(context,string_open):
     open_status = string_open == 'opened'
-    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_squish_editableLauncher_EditableGridView).gridOpen, open_status)
+    test.compare(waitForObjectExists(names.neptune_3_UI_Center_Console_editableLauncher_EditableGridView).gridOpen, open_status)
diff --git a/squishtests/suite_neptune3/tst_main_menu_widgets/steps/widget_operations.py b/squishtests/suite_neptune3/tst_main_menu_widgets/steps/widget_operations.py
index 95119e0b..ac2c2b0e 100644
--- a/squishtests/suite_neptune3/tst_main_menu_widgets/steps/widget_operations.py
+++ b/squishtests/suite_neptune3/tst_main_menu_widgets/steps/widget_operations.py
@@ -77,7 +77,7 @@ def step(context):
 
 @Then("the maps widget disappeared in the home screen after '|integer|' seconds of animation")
 def step(context,seconds):
-    exists = is_object_there(names.neptune_3_UI_Center_Console_homeWidget_Maps_Column,seconds)
+    exists = is_squish_object_there(names.neptune_3_UI_Center_Console_homeWidget_Maps_Column,seconds)
     if exists:
         test.compare(True,False," volume popup is still there!")
     else:
diff --git a/squishtests/suite_neptune3/tst_popup_climate/steps/popup_climate.py b/squishtests/suite_neptune3/tst_popup_climate/steps/popup_climate.py
index 82a5541e..4a65d4f3 100644
--- a/squishtests/suite_neptune3/tst_popup_climate/steps/popup_climate.py
+++ b/squishtests/suite_neptune3/tst_popup_climate/steps/popup_climate.py
@@ -49,7 +49,7 @@ def get_right_temperature_slider_Value():
 
 @Given("the climate area is tapped")
 def step(context):
-    climateMouseArea = waitForObjectExists(names.neptune_3_UI_Center_Console_squish_climateBarMouseArea_MouseArea)
+    climateMouseArea = waitForObjectExists(names.neptune_3_UI_Center_Console_climateBarMouseArea_MouseArea)
     tapObject(climateMouseArea)