From 9f8c2bb5f6dcad0f1b45a83c86d4d8b96d4a1aea Mon Sep 17 00:00:00 2001 From: Andrea Zoitl Date: Mon, 2 Sep 2024 15:41:49 +0200 Subject: [PATCH] Created sub-packages for a clearer structure of the UI tests #377 Created several sub-packages in org.eclipse.fordiac.ide.test.ui for a clearer structure of the UI tests. - created sub-package networking.basicfb - created sub-package networking.contextmenu - created sub-package networking.errormarker - created sub-package networking.subapp_composite Furthermore, the thematically matching tests have been moved to the newly created packages. Addresses https://github.com/eclipse-4diac/4diac-ide/issues/377 --- .../ide/test/ui/Abstract4diacUITests.java | 1 + .../eclipse/fordiac/ide/test/ui/FirstTry.java | 49 ------------------- .../test/ui/fbtype/AttributesTabTests.java | 2 +- .../ide/test/ui/fbtype/ConstantsTabTests.java | 2 +- .../ui/fbtype/EventInOutputsTabTests.java | 2 +- .../ui/fbtype/FunctionBlocksTabTests.java | 2 +- .../ui/fbtype/VarInAndOutputsTabTests.java | 2 +- .../test/ui/fbtype/VarInternalsTabTests.java | 2 +- .../ui/{ => helpers}/PropertySheetHelper.java | 2 +- .../ide/test/ui/helpers/SWTBotConnection.java | 1 - .../basicfb}/Basic1FBNetworkEditingTests.java | 3 +- .../basicfb}/Basic2FBNetworkEditingTests.java | 3 +- .../BasicMultipleFBNetworkEditingTests.java | 3 +- .../SWTBotContextMenuUITests.java | 3 +- .../errormarker}/ErrorMarkerTests.java | 3 +- .../CompositeInstanceViewerTests.java | 3 +- .../SubappSystemExplorerTests.java | 3 +- .../subapp_compsite}/SubapplicationTests.java | 3 +- 18 files changed, 24 insertions(+), 65 deletions(-) delete mode 100644 tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/FirstTry.java rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => helpers}/PropertySheetHelper.java (98%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/basicfb}/Basic1FBNetworkEditingTests.java (99%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/basicfb}/Basic2FBNetworkEditingTests.java (99%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/basicfb}/BasicMultipleFBNetworkEditingTests.java (98%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/contextmenu}/SWTBotContextMenuUITests.java (98%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/errormarker}/ErrorMarkerTests.java (95%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/subapp_compsite}/CompositeInstanceViewerTests.java (98%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/subapp_compsite}/SubappSystemExplorerTests.java (97%) rename tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/{ => networkediting/subapp_compsite}/SubapplicationTests.java (98%) diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Abstract4diacUITests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Abstract4diacUITests.java index d65dc491cf..4d27c73701 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Abstract4diacUITests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Abstract4diacUITests.java @@ -27,6 +27,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotSystemExplorer; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWT4diacGefBot; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/FirstTry.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/FirstTry.java deleted file mode 100644 index 0d269f01f0..0000000000 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/FirstTry.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Andrea Zoitl - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - -public class FirstTry { - - private final SWTWorkbenchBot bot = new SWTWorkbenchBot(); - - @Test - public void test() { - assertTrue(true); - } - - @Test - public void executeExit() { - final SWTBotMenu fileMenu = bot.menu("File"); //$NON-NLS-1$ - assertNotNull(fileMenu); - } - - @Test - public void canCreateANewJavaProject() throws Exception { - bot.menu("File").menu("New").menu("4diac IDE Project...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.textWithLabel("Project name:").setText("UiTestProject"); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("Finish").click(); //$NON-NLS-1$ - } - - @AfterEach - public void sleep() { - bot.sleep(2000); - } -} 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 daae97b6ad..1994aa22e4 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 @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; 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 29cc6024df..2185a60b85 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 @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; 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 4a42b7487a..b120bf4e6f 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 @@ -15,8 +15,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; 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 5b73117e1a..0b2200a01e 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 @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; 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 6e6576249e..0d72c88d4e 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 @@ -16,8 +16,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.eclipse.fordiac.ide.model.datatype.helper.RetainHelper.RetainTag; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; 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 d41bb78158..ee1996da5f 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 @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.eclipse.fordiac.ide.model.datatype.helper.RetainHelper.RetainTag; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; +import org.eclipse.fordiac.ide.test.ui.helpers.PropertySheetHelper; 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; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/PropertySheetHelper.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/PropertySheetHelper.java similarity index 98% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/PropertySheetHelper.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/PropertySheetHelper.java index f42d20290d..7883421444 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/PropertySheetHelper.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/PropertySheetHelper.java @@ -13,7 +13,7 @@ * createEvent from * "org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusHelper" */ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.helpers; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotConnection.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotConnection.java index 0d39105bbf..f177c0164e 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotConnection.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/helpers/SWTBotConnection.java @@ -27,7 +27,6 @@ import org.eclipse.draw2d.Label; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; -import org.eclipse.fordiac.ide.test.ui.PropertySheetHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWT4diacGefBot; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefEditor; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefViewer; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic1FBNetworkEditingTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic1FBNetworkEditingTests.java similarity index 99% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic1FBNetworkEditingTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic1FBNetworkEditingTests.java index 672f6b4bb2..b2cda51b79 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic1FBNetworkEditingTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic1FBNetworkEditingTests.java @@ -10,7 +10,7 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.basicfb; import static org.eclipse.swtbot.swt.finder.waits.Conditions.treeItemHasNode; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -28,6 +28,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.fordiac.ide.application.editparts.InstanceNameEditPart; import org.eclipse.fordiac.ide.application.figures.InstanceNameFigure; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotConnection; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic2FBNetworkEditingTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic2FBNetworkEditingTests.java similarity index 99% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic2FBNetworkEditingTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic2FBNetworkEditingTests.java index d82db21193..1190f98bc7 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/Basic2FBNetworkEditingTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/Basic2FBNetworkEditingTests.java @@ -10,7 +10,7 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.basicfb; import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -24,6 +24,7 @@ import org.eclipse.draw2d.PolylineConnection; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotConnection; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/BasicMultipleFBNetworkEditingTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/BasicMultipleFBNetworkEditingTests.java similarity index 98% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/BasicMultipleFBNetworkEditingTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/BasicMultipleFBNetworkEditingTests.java index a1b4a5a009..dd0e4e77cd 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/BasicMultipleFBNetworkEditingTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/basicfb/BasicMultipleFBNetworkEditingTests.java @@ -10,12 +10,13 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.basicfb; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; import org.eclipse.fordiac.ide.test.ui.helpers.UITestNamesHelper; import org.eclipse.fordiac.ide.test.ui.swtbot.SWTBot4diacGefEditor; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SWTBotContextMenuUITests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/contextmenu/SWTBotContextMenuUITests.java similarity index 98% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SWTBotContextMenuUITests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/contextmenu/SWTBotContextMenuUITests.java index e7ce490ee1..f28c41a2d9 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SWTBotContextMenuUITests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/contextmenu/SWTBotContextMenuUITests.java @@ -11,7 +11,7 @@ * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.contextmenu; import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotSubapp; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotSystemExplorer; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/ErrorMarkerTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/errormarker/ErrorMarkerTests.java similarity index 95% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/ErrorMarkerTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/errormarker/ErrorMarkerTests.java index b1ce80dbdf..2b4c218e7a 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/ErrorMarkerTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/errormarker/ErrorMarkerTests.java @@ -10,8 +10,9 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.errormarker; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/CompositeInstanceViewerTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/CompositeInstanceViewerTests.java similarity index 98% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/CompositeInstanceViewerTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/CompositeInstanceViewerTests.java index 5dba89dd54..b4cca644e9 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/CompositeInstanceViewerTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/CompositeInstanceViewerTests.java @@ -10,7 +10,7 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.subapp_compsite; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -26,6 +26,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.fordiac.ide.fbtypeeditor.network.viewer.CompositeInstanceViewer; import org.eclipse.fordiac.ide.model.ui.editors.AbstractBreadCrumbEditor; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotConnection; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubappSystemExplorerTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubappSystemExplorerTests.java similarity index 97% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubappSystemExplorerTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubappSystemExplorerTests.java index 268e3b0f44..2aaaf7a17c 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubappSystemExplorerTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubappSystemExplorerTests.java @@ -10,7 +10,7 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.subapp_compsite; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -18,6 +18,7 @@ import java.util.List; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotSubapp; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotSystemExplorer; diff --git a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubapplicationTests.java b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubapplicationTests.java similarity index 98% rename from tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubapplicationTests.java rename to tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubapplicationTests.java index ee4fa4d45e..d50a75d448 100644 --- a/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/SubapplicationTests.java +++ b/tests/org.eclipse.fordiac.ide.test.ui/src/org/eclipse/fordiac/ide/test/ui/networkediting/subapp_compsite/SubapplicationTests.java @@ -10,7 +10,7 @@ * Contributors: * Andrea Zoitl - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.fordiac.ide.test.ui; +package org.eclipse.fordiac.ide.test.ui.networkediting.subapp_compsite; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.fordiac.ide.model.ui.editors.HandlerHelper; +import org.eclipse.fordiac.ide.test.ui.Abstract4diacUITests; import org.eclipse.fordiac.ide.test.ui.helpers.PinNamesHelper; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotConnection; import org.eclipse.fordiac.ide.test.ui.helpers.SWTBotFB;