Simplified initialization of tests from NatWithEditorBehavoirTests ec…

…lipse-4diac#377 For better readability and maintainability, the test variables from the method operationsInitialzation() with Annotation @beforeeach have been moved to a constructor. Addresses eclipse-4diac#377
Andrearium · Sep 16, 2024 · bd72b8a · bd72b8a
1 parent a6f51b8
commit bd72b8a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 30 deletions.
diff --git a/...ordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java b/...ordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/EventInOutputsTabTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Prashantkumar Khatri
+ * Copyright (c) 2024 Prashantkumar Khatri, Andrea Zoitl
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *   Prashantkumar Khatri - initial API and implementation and/or initial documentation
+ *   Andrea Zoitl - Creation of a fluid API design for UI SWTBot testing
  *******************************************************************************/
 package org.eclipse.fordiac.ide.test.ui.fbtype;
 
@@ -30,12 +31,13 @@
 
 public class EventInOutputsTabTests extends NatTableWithEditorBehaviorTests {
 
+	public EventInOutputsTabTests() {
+		super(UITestPinHelper.EI1, UITestPinHelper.EI2, UITestPinHelper.EI3);
+	}
+
 	@Override
 	@BeforeEach
 	public void operationsInitialization() {
-		testvar1 = UITestPinHelper.EI1;
-		testvar2 = UITestPinHelper.EI2;
-		testvar3 = UITestPinHelper.EI3;
 		final SWTBotFBType fbTypeBot = new SWTBotFBType(bot);
 		fbTypeBot.createFBType(UITestNamesHelper.PROJECT_NAME, UITestNamesHelper.FBT_TEST_PROJECT2,
 				UITestNamesHelper.ADAPTER);

diff --git a/...e.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java b/...e.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/NatTableWithEditorBehaviorTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Prashantkumar Khatri
+ * Copyright (c) 2024 Prashantkumar Khatri, Andrea Zoitl
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *   Prashantkumar Khatri - initial API and implementation and/or initial documentation
+ *   Andrea Zoitl - Creation of a fluid API design for UI SWTBot testing
  *******************************************************************************/
 package org.eclipse.fordiac.ide.test.ui.fbtype;
 
@@ -33,9 +34,19 @@ public abstract class NatTableWithEditorBehaviorTests extends Abstract4diacUITes
 	protected NatTable natTable;
 	protected SWTBot4diacGefEditor editor;
 
-	protected String testvar1 = "TESTVAR1"; //$NON-NLS-1$
-	protected String testvar2 = "TESTVAR2"; //$NON-NLS-1$
-	protected String testvar3 = "TESTVAR3"; //$NON-NLS-1$
+	private final String testVar1;
+	private final String testVar2;
+	private final String testVar3;
+
+	protected NatTableWithEditorBehaviorTests() {
+		this("TESTVAR1", "TESTVAR2", "TESTVAR3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+
+	protected NatTableWithEditorBehaviorTests(final String testVar1, final String testVar2, final String testVar3) {
+		this.testVar1 = testVar1;
+		this.testVar2 = testVar2;
+		this.testVar3 = testVar3;
+	}
 
 	/**
 	 * Initializes the environment for testing operations on the DataType Editor
@@ -79,7 +90,7 @@ public void resetEnvironment() {
 	@Test
 	public void createEvent() {
 		new SWTBotNatTable(bot, swt4diacNatTable).createNewVariableInDataTypeEditor();
-		assertNotNull(editor.getEditPart(testvar1));
+		assertNotNull(editor.getEditPart(testVar1));
 	}
 
 	/**
@@ -91,7 +102,7 @@ public void createEvent() {
 	@Test
 	public void removeEvent() {
 		new SWTBotNatTable(bot, swt4diacNatTable).deleteVariable(3);
-		assertNull(editor.getEditPart(testvar1));
+		assertNull(editor.getEditPart(testVar1));
 	}
 
 	/**
@@ -103,9 +114,9 @@ public void removeEvent() {
 	 */
 	@Test
 	public void changeEventName() {
-		assertNotNull(editor.getEditPart(testvar1));
+		assertNotNull(editor.getEditPart(testVar1));
 		new SWTBotNatTable(bot, swt4diacNatTable).changeCellValueInNatTbale(UITestNamesHelper.TESTVAR, 3, 1);
-		assertNull(editor.getEditPart(testvar1));
+		assertNull(editor.getEditPart(testVar1));
 		assertNotNull(editor.getEditPart(UITestNamesHelper.TESTVAR));
 	}
 
@@ -117,9 +128,9 @@ public void changeEventName() {
 	 */
 	@Test
 	public void changeEventNameFromRenameButtom() {
-		assertNotNull(editor.getEditPart(testvar1));
+		assertNotNull(editor.getEditPart(testVar1));
 		new SWTBotNatTable(bot, swt4diacNatTable).changeVariableNameWithButtonTool(3, UITestNamesHelper.TESTVAR);
-		assertNull(editor.getEditPart(testvar1));
+		assertNull(editor.getEditPart(testVar1));
 		assertNotNull(editor.getEditPart(UITestNamesHelper.TESTVAR));
 	}
 
@@ -129,7 +140,6 @@ public void changeEventNameFromRenameButtom() {
 	 * This method checks whether the data type of a variable can be changed and
 	 * verifies the successful application of the new data type.
 	 */
-	@SuppressWarnings("static-method")
 	@Test
 	public void changeDataTypeOfVariable() {
 		new SWTBotNatTable(bot, swt4diacNatTable).changeDataType(1, UITestNamesHelper.INT_SMALL);
@@ -141,7 +151,6 @@ public void changeDataTypeOfVariable() {
 	 * This method attempts to assign an invalid data type to a variable and
 	 * verifies the behavior of the editor when an invalid data type is applied.
 	 */
-	@SuppressWarnings("static-method")
 	@Test
 	public void tryToSetInValidDataType() {
 		new SWTBotNatTable(bot, swt4diacNatTable).setInvalidDataType(1, 2, UITestNamesHelper.TESTVAR);
@@ -155,7 +164,7 @@ public void tryToSetInValidDataType() {
 	 */
 	@Test
 	public void changeEventComment() {
-		assertNotNull(editor.getEditPart(testvar1));
+		assertNotNull(editor.getEditPart(testVar1));
 		assertNull(editor.getEditPart(UITestNamesHelper.TESTVAR));
 		new SWTBotNatTable(bot, swt4diacNatTable).changeCellValueInNatTbale(UITestNamesHelper.TEST_COMMENT, 3, 3);
 	}
@@ -166,7 +175,6 @@ public void changeEventComment() {
 	 * This method verifies the functionality of moving an event's position within
 	 * the table and checks for correct ordering of events after the operation.
 	 */
-	@SuppressWarnings("static-method")
 	@Test
 	public void moveEventUpDown() {
 		final SWTBotNatTable swtBotNatTable = new SWTBotNatTable(bot, swt4diacNatTable);
@@ -186,11 +194,11 @@ public void moveEventUpDown() {
 	public void tryToChangeEventNameWithExistingName() {
 		final SWTBotNatTable swtBotNatTable = new SWTBotNatTable(bot, swt4diacNatTable);
 		swtBotNatTable.createNewVariableInDataTypeEditor();
-		assertNotNull(editor.getEditPart(testvar1));
-		assertNotNull(editor.getEditPart(testvar2));
-		swtBotNatTable.changeNameWithExistingName(4, testvar1, testvar2);
-		assertNotNull(editor.getEditPart(testvar1));
-		assertNotNull(editor.getEditPart(testvar2));
+		assertNotNull(editor.getEditPart(testVar1));
+		assertNotNull(editor.getEditPart(testVar2));
+		swtBotNatTable.changeNameWithExistingName(4, testVar1, testVar2);
+		assertNotNull(editor.getEditPart(testVar1));
+		assertNotNull(editor.getEditPart(testVar2));
 	}
 
 	/**
@@ -203,10 +211,10 @@ public void tryToChangeEventNameWithExistingName() {
 	public void tryToSetInvalidName() {
 		final SWTBotNatTable swtBotNatTable = new SWTBotNatTable(bot, swt4diacNatTable);
 		swtBotNatTable.createNewVariableInDataTypeEditor();
-		assertNotNull(editor.getEditPart(testvar1));
-		swtBotNatTable.setInvalidName(3, UITestNamesHelper.IF, testvar1);
+		assertNotNull(editor.getEditPart(testVar1));
+		swtBotNatTable.setInvalidName(3, UITestNamesHelper.IF, testVar1);
 		assertNull(editor.getEditPart(UITestNamesHelper.IF));
-		assertNotNull(editor.getEditPart(testvar2));
+		assertNotNull(editor.getEditPart(testVar2));
 	}
 
 }
diff --git a/...rdiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java b/...rdiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/fbtype/VarInAndOutputsTabTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Prashantkumar Khatri
+ * Copyright (c) 2024 Prashantkumar Khatri, Andrea Zoitl
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *   Prashantkumar Khatri - initial API and implementation and/or initial documentation
+ *   Andrea Zoitl - Creation of a fluid API design for UI SWTBot testing
  *******************************************************************************/
 package org.eclipse.fordiac.ide.test.ui.fbtype;
 
@@ -31,12 +32,13 @@
 
 public class VarInAndOutputsTabTests extends NatTableWithEditorBehaviorTests {
 
+	public VarInAndOutputsTabTests() {
+		super(UITestPinHelper.DI1, UITestPinHelper.DI2, UITestPinHelper.DI3);
+	}
+
 	@Override
 	@BeforeEach
 	public void operationsInitialization() {
-		testvar1 = UITestPinHelper.DI1;
-		testvar2 = UITestPinHelper.DI2;
-		testvar3 = UITestPinHelper.DI3;
 		final SWTBotFBType fbTypeBot = new SWTBotFBType(bot);
 		fbTypeBot.createFBType(UITestNamesHelper.PROJECT_NAME, UITestNamesHelper.FBT_TEST_PROJECT2,
 				UITestNamesHelper.ADAPTER);