From d6570b152e89dfc276d7d38796a414b86dd2c60b Mon Sep 17 00:00:00 2001 From: Andrea Zoitl Date: Thu, 5 Sep 2024 23:36:26 +0200 Subject: [PATCH] Renamed helper class NatTableHelper for SWTBot UI Tests #377 Rename class NatTabletHelper to SWTBotNatTable to be consistent with the other supporting Bot classes for UI tests. Addresses https://github.com/eclipse-4diac/4diac-ide/issues/377 --- .../test/ui/fbtype/AttributesTabTests.java | 7 ++-- .../ide/test/ui/fbtype/ConstantsTabTests.java | 3 +- .../test/ui/fbtype/DataTypeEditorTests.java | 3 +- .../ui/fbtype/EventInOutputsTabTests.java | 3 +- .../ui/fbtype/FunctionBlocksTabTests.java | 7 ++-- .../NatTableWithEditorBehaviorTests.java | 33 ++++++++++--------- .../NatTableWithoutEditorBehaviorTests.java | 31 ++++++++--------- .../ui/fbtype/VarInAndOutputsTabTests.java | 11 ++++--- .../test/ui/fbtype/VarInternalsTabTests.java | 5 +-- .../SWTBotNatTable.java} | 31 +++++++++-------- 10 files changed, 71 insertions(+), 63 deletions(-) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{fbtype/NatTableHelper.java => helpers/SWTBotNatTable.java} (85%) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/AttributesTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/AttributesTabTests.java index b1ff42fe14..cd56d454fe 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/AttributesTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/AttributesTabTests.java @@ -15,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; @@ -50,7 +51,7 @@ public void operationsInitialization() { SWTBotPropertySheet.selectPropertyTabItem(UITestNamesHelper.ATTRIBUTES, propertiesBot); natTable = propertiesBot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), 0); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } @Override @@ -61,13 +62,13 @@ public void changeVariableNameWithButton() { @Override public void tryToSetInValidName() { // Here Name column has same behavior as Data Type column or Invalid value - NatTableHelper.setInvalidDataType(natTableBot, 1, 1, UITestNamesHelper.IF); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 1, UITestNamesHelper.IF); } @Override public void tryToChangeNameOfVariableWithExistingName() { // Here Name column has same behavior as Data Type column or Invalid value - NatTableHelper.setInvalidDataType(natTableBot, 1, 1, UITestNamesHelper.IF); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 1, UITestNamesHelper.IF); } } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/ConstantsTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/ConstantsTabTests.java index 805f857f24..05a975c8c0 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/ConstantsTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/ConstantsTabTests.java @@ -16,6 +16,7 @@ import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.NatTable; @@ -42,6 +43,6 @@ public void operationsInitialization() { SWTBotPropertySheet.selectPropertyTabItem(UITestNamesHelper.CONSTANTS, propertiesBot); natTable = propertiesBot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), 0); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/DataTypeEditorTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/DataTypeEditorTests.java index d17462465e..1c6e28b8c4 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/DataTypeEditorTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/DataTypeEditorTests.java @@ -14,6 +14,7 @@ package org.eclipse.fordiac.ide.test.ui.fbtype; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.NatTable; @@ -38,6 +39,6 @@ public void operationsInitialization() { final Composite tableComposite = (Composite) bot.editorByTitle(UITestNamesHelper.FBT_TEST_PROJECT2).getWidget(); natTable = bot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), tableComposite); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } } \ No newline at end of file diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java index 232409c304..b435a09d25 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java @@ -18,6 +18,7 @@ import org.eclipse.fordiac.ide.test.ui.helpers.UITestPinHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefEditor; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; @@ -48,7 +49,7 @@ public void operationsInitialization() { natTableBot = new SWTBot4diacNatTable(natTable); editor = (SWTBot4diacGefEditor) bot.gefEditor(UITestNamesHelper.FBT_TEST_PROJECT2); assertNotNull(editor); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } @Override diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/FunctionBlocksTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/FunctionBlocksTabTests.java index 1a6a5d4cef..bb38ea3ad7 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/FunctionBlocksTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/FunctionBlocksTabTests.java @@ -17,6 +17,7 @@ import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.NatTable; @@ -46,7 +47,7 @@ public void operationsInitialization() { SWTBotPropertySheet.selectPropertyTabItem(UITestNamesHelper.FUNCTIONAL__BLOCKS, propertiesBot); natTable = propertiesBot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), 0); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } @Override @@ -61,7 +62,7 @@ public void tryToSetInValidInitialValue() { @Override public void changeDataTypeOfVariable() { - NatTableHelper.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); + SWTBotNatTable.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); natTableBot.doubleclick(1, 2); bot.button(UITestNamesHelper.DOT_BUTTON).click(); @@ -80,7 +81,7 @@ public void changeDataTypeOfVariable() { @Override public void tryToSetInValidDataType() { - NatTableHelper.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); } } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java index f9e4297e20..8cea8599ec 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java @@ -17,6 +17,7 @@ import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefEditor; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; @@ -54,7 +55,7 @@ public void operationsInitialization() { final Composite tableComposite = (Composite) bot.editorByTitle(UITestNamesHelper.FBT_TEST_PROJECT2).getWidget(); natTable = bot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), tableComposite); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } /** @@ -79,7 +80,7 @@ public void resetEnvironment() { @SuppressWarnings("static-method") @Test public void createEvent() { - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); assertNotNull(editor.getEditPart(TESTVAR1)); } @@ -92,7 +93,7 @@ public void createEvent() { @SuppressWarnings("static-method") @Test public void removeEvent() { - NatTableHelper.deleteVariable(natTableBot, 3); + SWTBotNatTable.deleteVariable(natTableBot, 3); assertNull(editor.getEditPart(TESTVAR1)); } @@ -107,7 +108,7 @@ public void removeEvent() { @Test public void changeEventName() { assertNotNull(editor.getEditPart(TESTVAR1)); - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TESTVAR, 3, 1); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TESTVAR, 3, 1); assertNull(editor.getEditPart(TESTVAR1)); assertNotNull(editor.getEditPart(UITestNamesHelper.TESTVAR)); } @@ -122,7 +123,7 @@ public void changeEventName() { @Test public void changeEventNameFromRenameButtom() { assertNotNull(editor.getEditPart(TESTVAR1)); - NatTableHelper.changeVariableNameWithButtonTool(natTableBot, 3, UITestNamesHelper.TESTVAR); + SWTBotNatTable.changeVariableNameWithButtonTool(natTableBot, 3, UITestNamesHelper.TESTVAR); assertNull(editor.getEditPart(TESTVAR1)); assertNotNull(editor.getEditPart(UITestNamesHelper.TESTVAR)); } @@ -136,7 +137,7 @@ public void changeEventNameFromRenameButtom() { @SuppressWarnings("static-method") @Test public void changeDataTypeOfVariable() { - NatTableHelper.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); + SWTBotNatTable.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); } /** @@ -148,7 +149,7 @@ public void changeDataTypeOfVariable() { @SuppressWarnings("static-method") @Test public void tryToSetInValidDataType() { - NatTableHelper.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); } /** @@ -162,7 +163,7 @@ public void tryToSetInValidDataType() { public void changeEventComment() { assertNotNull(editor.getEditPart(TESTVAR1)); assertNull(editor.getEditPart(UITestNamesHelper.TESTVAR)); - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TEST_COMMENT, 3, 3); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TEST_COMMENT, 3, 3); } /** @@ -174,10 +175,10 @@ public void changeEventComment() { @SuppressWarnings("static-method") @Test public void moveEventUpDown() { - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); - NatTableHelper.moveElementUp(natTableBot, 5); - NatTableHelper.moveElementDown(natTableBot, 3); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.moveElementUp(natTableBot, 5); + SWTBotNatTable.moveElementDown(natTableBot, 3); } /** @@ -189,10 +190,10 @@ public void moveEventUpDown() { @SuppressWarnings("static-method") @Test public void tryToChangeEventNameWithExistingName() { - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); assertNotNull(editor.getEditPart(TESTVAR1)); assertNotNull(editor.getEditPart(TESTVAR2)); - NatTableHelper.changeNameWithExistingName(natTableBot, 4, TESTVAR1, TESTVAR2); + SWTBotNatTable.changeNameWithExistingName(natTableBot, 4, TESTVAR1, TESTVAR2); assertNotNull(editor.getEditPart(TESTVAR1)); assertNotNull(editor.getEditPart(TESTVAR2)); } @@ -206,9 +207,9 @@ public void tryToChangeEventNameWithExistingName() { @SuppressWarnings("static-method") @Test public void tryToSetInvalidName() { - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); assertNotNull(editor.getEditPart(TESTVAR1)); - NatTableHelper.setInvalidName(natTableBot, 3, UITestNamesHelper.IF, TESTVAR1); + SWTBotNatTable.setInvalidName(natTableBot, 3, UITestNamesHelper.IF, TESTVAR1); assertNull(editor.getEditPart(UITestNamesHelper.IF)); assertNotNull(editor.getEditPart(TESTVAR2)); } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithoutEditorBehaviorTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithoutEditorBehaviorTests.java index 958160d675..400e4e038a 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithoutEditorBehaviorTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithoutEditorBehaviorTests.java @@ -14,6 +14,7 @@ import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.NatTable; @@ -49,7 +50,7 @@ public void operationsInitialization() { final Composite inputComposite = (Composite) bot.editorByTitle(UITestNamesHelper.FBT_TEST_PROJECT2).getWidget(); natTable = bot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), inputComposite); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } /** @@ -77,7 +78,7 @@ public void resetEnvironment() { @SuppressWarnings("static-method") @Test public void renameVariable() { - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TESTVAR, 1, 1); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TESTVAR, 1, 1); } /** @@ -93,7 +94,7 @@ public void renameVariable() { @SuppressWarnings("static-method") @Test public void changeVariableNameWithButton() { - NatTableHelper.changeVariableNameWithButtonTool(natTableBot, 1, UITestNamesHelper.TESTVAR); + SWTBotNatTable.changeVariableNameWithButtonTool(natTableBot, 1, UITestNamesHelper.TESTVAR); } /** @@ -107,7 +108,7 @@ public void changeVariableNameWithButton() { @SuppressWarnings("static-method") @Test public void tryToChangeNameOfVariableWithExistingName() { - NatTableHelper.changeNameWithExistingName(natTableBot, 2, TESTVAR1, TESTVAR2); + SWTBotNatTable.changeNameWithExistingName(natTableBot, 2, TESTVAR1, TESTVAR2); } /** @@ -120,7 +121,7 @@ public void tryToChangeNameOfVariableWithExistingName() { @SuppressWarnings("static-method") @Test public void tryToSetInValidName() { - NatTableHelper.setInvalidName(natTableBot, 1, UITestNamesHelper.IF, TESTVAR1); + SWTBotNatTable.setInvalidName(natTableBot, 1, UITestNamesHelper.IF, TESTVAR1); } /** @@ -135,10 +136,10 @@ public void tryToSetInValidName() { @SuppressWarnings("static-method") @Test public void reorderVariable() { - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); - NatTableHelper.moveElementUp(natTableBot, 3); - NatTableHelper.moveElementDown(natTableBot, 1); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.moveElementUp(natTableBot, 3); + SWTBotNatTable.moveElementDown(natTableBot, 1); } /** @@ -151,7 +152,7 @@ public void reorderVariable() { @SuppressWarnings("static-method") @Test public void changeDataTypeOfVariable() { - NatTableHelper.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); + SWTBotNatTable.changeDataType(natTableBot, 1, UITestNamesHelper.INT_SMALL); } /** @@ -165,7 +166,7 @@ public void changeDataTypeOfVariable() { @SuppressWarnings("static-method") @Test public void tryToSetInValidDataType() { - NatTableHelper.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 2, UITestNamesHelper.TESTVAR); } /** @@ -177,7 +178,7 @@ public void tryToSetInValidDataType() { @SuppressWarnings("static-method") @Test public void changeCommentOfVariable() { - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TEST_COMMENT, 1, 3); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TEST_COMMENT, 1, 3); } /** @@ -189,8 +190,8 @@ public void changeCommentOfVariable() { @SuppressWarnings("static-method") @Test public void changeInitialValueOfVariable() { - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TRUE, 1, 4); - NatTableHelper.changeCellValueInNatTbale(natTableBot, "1", 1, 4); //$NON-NLS-1$ + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TRUE, 1, 4); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, "1", 1, 4); //$NON-NLS-1$ } /** @@ -204,6 +205,6 @@ public void changeInitialValueOfVariable() { @SuppressWarnings("static-method") @Test public void tryToSetInValidInitialValue() { - NatTableHelper.setInvalidDataType(natTableBot, 1, 4, UITestNamesHelper.TESTVAR); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 4, UITestNamesHelper.TESTVAR); } } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java index 37088b72a5..9a7851f4d5 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java @@ -19,6 +19,7 @@ import org.eclipse.fordiac.ide.test.ui.helpers.UITestPinHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefEditor; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; @@ -49,7 +50,7 @@ public void operationsInitialization() { natTableBot = new SWTBot4diacNatTable(natTable); editor = (SWTBot4diacGefEditor) bot.gefEditor(UITestNamesHelper.FBT_TEST_PROJECT2); assertNotNull(editor); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } /** @@ -61,8 +62,8 @@ public void operationsInitialization() { @SuppressWarnings("static-method") @Test public void changeInitialValueOfVariable() { - NatTableHelper.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TRUE, 1, 4); - NatTableHelper.changeCellValueInNatTbale(natTableBot, "1", 1, 4); //$NON-NLS-1$ + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, UITestNamesHelper.TRUE, 1, 4); + SWTBotNatTable.changeCellValueInNatTbale(natTableBot, "1", 1, 4); //$NON-NLS-1$ } /** @@ -75,7 +76,7 @@ public void changeInitialValueOfVariable() { @SuppressWarnings("static-method") @Test public void tryToSetInValidInitialValue() { - NatTableHelper.setInvalidDataType(natTableBot, 1, 4, UITestNamesHelper.TESTVAR); + SWTBotNatTable.setInvalidDataType(natTableBot, 1, 4, UITestNamesHelper.TESTVAR); } /** @@ -116,6 +117,6 @@ public void toggleVarVisibility() { @SuppressWarnings("static-method") @Test public void changeRetainTag() { - NatTableHelper.setRetainValue(natTableBot, 1, 7, RetainTag.RETAIN); + SWTBotNatTable.setRetainValue(natTableBot, 1, 7, RetainTag.RETAIN); } } diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInternalsTabTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInternalsTabTests.java index 59427f1e38..f5dac770ed 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInternalsTabTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInternalsTabTests.java @@ -17,6 +17,7 @@ import org.eclipse.fordiac.ide.model.datatype.helper.RetainHelper.RetainTag; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotPropertySheet; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFBType; +import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotNatTable; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.NatTable; @@ -44,7 +45,7 @@ public void operationsInitialization() { SWTBotPropertySheet.selectPropertyTabItem(UITestNamesHelper.VAR_INTERNALS, propertiesBot); natTable = propertiesBot.widget(WidgetMatcherFactory.widgetOfType(NatTable.class), 0); natTableBot = new SWTBot4diacNatTable(natTable); - NatTableHelper.createNewVariableInDataTypeEditor(natTableBot); + SWTBotNatTable.createNewVariableInDataTypeEditor(natTableBot); } /** @@ -57,7 +58,7 @@ public void operationsInitialization() { @SuppressWarnings("static-method") @Test public void changeRetainTag() { - NatTableHelper.setRetainValue(natTableBot, 1, 5, RetainTag.RETAIN); + SWTBotNatTable.setRetainValue(natTableBot, 1, 5, RetainTag.RETAIN); } } \ No newline at end of file diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableHelper.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotNatTable.java similarity index 85% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableHelper.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotNatTable.java index 03d0901916..dcec91114a 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableHelper.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotNatTable.java @@ -10,7 +10,7 @@ * Contributors: * Prashantkumar Khatri - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui.fbtype; +package org.eclipse.fordiac.ide.test.ui.helpers; import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,19 +21,18 @@ import org.eclipse.fordiac.ide.model.datatype.helper.RetainHelper.RetainTag; import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; -import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacNatTable; import org.eclipse.nebula.widgets.nattable.util.GUIHelper; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -public class NatTableHelper extends Abstract4diacUITests { +public class SWTBotNatTable extends Abstract4diacUITests { /** * Creates a new variable in the Data Type Editor. * * @param natTableBot NatTable in which the variable needs to be created. */ - protected static void createNewVariableInDataTypeEditor(final SWTBot4diacNatTable natTableBot) { + public static void createNewVariableInDataTypeEditor(final SWTBot4diacNatTable natTableBot) { final int rowCount = natTableBot.rowCount(); bot.button(0).click(); assertEquals(natTableBot.rowCount(), rowCount + 1); @@ -47,7 +46,7 @@ protected static void createNewVariableInDataTypeEditor(final SWTBot4diacNatTabl * @param row The row number of the cell. * @param col The column number of the cell. */ - protected static void changeCellValueInNatTbale(final SWTBot4diacNatTable dataTypeTableBot, final String newValue, + public static void changeCellValueInNatTbale(final SWTBot4diacNatTable dataTypeTableBot, final String newValue, final int row, final int col) { dataTypeTableBot.doubleclick(row, col); dataTypeTableBot.setCellDataValueByPosition(row, col, newValue); @@ -61,7 +60,7 @@ protected static void changeCellValueInNatTbale(final SWTBot4diacNatTable dataTy * @param natTableBot NatTable from which the variable has to be deleted. * @param srNo The serial number of the variable to be deleted. */ - protected static void deleteVariable(final SWTBot4diacNatTable natTableBot, final int srNo) { + public static void deleteVariable(final SWTBot4diacNatTable natTableBot, final int srNo) { final int rowCount = natTableBot.rowCount(); natTableBot.click(srNo, 0); bot.button(1).click(); @@ -75,7 +74,7 @@ protected static void deleteVariable(final SWTBot4diacNatTable natTableBot, fina * @param srNo The serial number of the variable. * @param newName The new name for the variable. */ - protected static void changeVariableNameWithButtonTool(final SWTBot4diacNatTable natTableBot, final int srNo, + public static void changeVariableNameWithButtonTool(final SWTBot4diacNatTable natTableBot, final int srNo, final String newName) { natTableBot.click(srNo, 1); bot.toolbarButtonWithTooltip(UITestNamesHelper.RENAME_ELEMENT).click(); @@ -104,7 +103,7 @@ protected static void changeVariableNameWithButtonTool(final SWTBot4diacNatTable * @param curentName The current name of the variable, expected to remain * unchanged. */ - protected static void changeNameWithExistingName(final SWTBot4diacNatTable natTableBot, final int srNo, + public static void changeNameWithExistingName(final SWTBot4diacNatTable natTableBot, final int srNo, final String existingName, final String curentName) { createNewVariableInDataTypeEditor(natTableBot); natTableBot.doubleclick(srNo, 1); @@ -124,8 +123,8 @@ protected static void changeNameWithExistingName(final SWTBot4diacNatTable natTa * @param curentName The current name of the variable, expected to remain * unchanged. */ - protected static void setInvalidName(final SWTBot4diacNatTable natTableBot, final int srNo, - final String invalidName, final String curentName) { + public static void setInvalidName(final SWTBot4diacNatTable natTableBot, final int srNo, final String invalidName, + final String curentName) { natTableBot.doubleclick(srNo, 1); natTableBot.setCellDataValueByPosition(srNo, 1, invalidName); natTableBot.doubleclick(srNo, 1); @@ -141,7 +140,7 @@ protected static void setInvalidName(final SWTBot4diacNatTable natTableBot, fina * @param srNo The serial number of the variable. * @param dataType The new data type to set for the variable. */ - protected static void changeDataType(final SWTBot4diacNatTable natTableBot, final int srNo, final String dataType) { + public static void changeDataType(final SWTBot4diacNatTable natTableBot, final int srNo, final String dataType) { natTableBot.doubleclick(1, 2); // Assign the value, e.g., "int" @@ -162,7 +161,7 @@ protected static void changeDataType(final SWTBot4diacNatTable natTableBot, fina * @param dataTypeColumnNo The column number of the data type. * @param invalidDataType The invalid data type to set. */ - protected static void setInvalidDataType(final SWTBot4diacNatTable natTableBot, final int srNo, + public static void setInvalidDataType(final SWTBot4diacNatTable natTableBot, final int srNo, final int dataTypeColumnNo, final String invalidDataType) { natTableBot.doubleclick(srNo, dataTypeColumnNo); natTableBot.setCellDataValueByPosition(srNo, dataTypeColumnNo, invalidDataType); @@ -182,7 +181,7 @@ protected static void setInvalidDataType(final SWTBot4diacNatTable natTableBot, * @param initialValueColumnNo The column number of the initial value. * @param invalidInitialValue The invalid initial value to set. */ - protected static void setInvalidInitialValue(final SWTBot4diacNatTable natTableBot, final int srNo, + public static void setInvalidInitialValue(final SWTBot4diacNatTable natTableBot, final int srNo, final int initialValueColumnNo, final String invalidInitialValue) { setInvalidDataType(natTableBot, srNo, initialValueColumnNo, invalidInitialValue); } @@ -193,7 +192,7 @@ protected static void setInvalidInitialValue(final SWTBot4diacNatTable natTableB * @param natTableBot NatTable containing the variable. * @param srNo The serial number of the variable. */ - protected static void moveElementUp(final SWTBot4diacNatTable natTableBot, final int srNo) { + public static void moveElementUp(final SWTBot4diacNatTable natTableBot, final int srNo) { final String upperRowName = natTableBot.getCellDataValueByPosition(srNo - 1, 1); final String currentRowName = natTableBot.getCellDataValueByPosition(srNo, 1); natTableBot.click(srNo, 0); @@ -210,7 +209,7 @@ protected static void moveElementUp(final SWTBot4diacNatTable natTableBot, final * @param natTableBot NatTable containing the variable. * @param srNo The serial number of the variable. */ - protected static void moveElementDown(final SWTBot4diacNatTable natTableBot, final int srNo) { + public static void moveElementDown(final SWTBot4diacNatTable natTableBot, final int srNo) { final String lowerRowName = natTableBot.getCellDataValueByPosition(srNo + 1, 1); final String currentRowName = natTableBot.getCellDataValueByPosition(srNo, 1); natTableBot.click(srNo, 0); @@ -232,7 +231,7 @@ protected static void moveElementDown(final SWTBot4diacNatTable natTableBot, fin * @param retainValue The RetainTag value (RETAIN, NO_RETAIN, NOTHING) to be set * for the variable. */ - protected static void setRetainValue(final SWTBot4diacNatTable natTableBot, final int srNo, final int retainCol, + public static void setRetainValue(final SWTBot4diacNatTable natTableBot, final int srNo, final int retainCol, final RetainTag retainValue) { natTableBot.doubleclick(srNo, retainCol); bot.table().select(retainValue.toString());