diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF index bf61e72d19..b5b5f2190f 100644 --- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF @@ -9,20 +9,13 @@ Bundle-ActivationPolicy: lazy Require-Bundle: com.avaloq.tools.ddk.check.core, com.avaloq.tools.ddk.xtext, com.avaloq.tools.ddk.xtext.test.core, - com.avaloq.tools.ddk.check.ui, org.eclipse.xtext, org.eclipse.xtext.xbase, - org.eclipse.xtext.ui, org.eclipse.jdt.core, - org.eclipse.core.resources, - org.eclipse.ui, - org.eclipse.ui.ide, org.eclipse.core.runtime, - org.eclipse.xtext.ui.testing, org.eclipse.xtext.testing, org.mockito.mockito-core, com.avaloq.tools.ddk.check.runtime.core, - org.eclipse.ui.workbench;resolution:=optional, org.apache.commons.lang3, org.eclipse.xtext.xbase.testing, junit-jupiter-api, diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml index f2eb23ebe1..4e7df161c8 100644 --- a/com.avaloq.tools.ddk.check.core.test/pom.xml +++ b/com.avaloq.tools.ddk.check.core.test/pom.xml @@ -10,9 +10,4 @@ com.avaloq.tools.ddk.check.core.test eclipse-test-plugin - - - true - 1 - \ No newline at end of file diff --git a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java deleted file mode 100644 index 58ff25c351..0000000000 --- a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * generated by Xtext - */ -package com.avaloq.tools.ddk.check; - -import org.eclipse.xtext.testing.IInjectorProvider; - -import com.google.inject.Injector; - - -public class CheckUiInjectorProvider implements IInjectorProvider { - - @Override - public Injector getInjector() { - return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check"); - } - -} diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java index 6d5d38ab4b..cc76ffc93a 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java @@ -23,6 +23,8 @@ import java.util.Set; import org.apache.commons.lang3.Validate; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; @@ -44,10 +46,12 @@ /** - * An abstract test class for tests on Check models. Allows creating a project, adding files, and generating and compiling the project. + * An abstract test class for tests which generate and compile Check models in memory. */ @SuppressWarnings("nls") -public class AbstractCheckGenerationTestCase extends AbstractCheckTestCase { +public class AbstractCheckGenerationTestCase { + + protected static final Logger LOGGER = LogManager.getLogger(AbstractCheckGenerationTestCase.class); @Inject private CheckGenerator generator; @@ -94,7 +98,7 @@ public List generateAndCompile(final InputStream sourceStream) { // Run the generator using an in-memory file system access; member injection wires the // IFilePostProcessor so the LF ILineSeparatorInformation binding is actually exercised InMemoryFileSystemAccess fsa = new InMemoryFileSystemAccess(); - getInjector().injectMembers(fsa); + injector.injectMembers(fsa); for (OutputConfiguration output : outputConfigurationProvider.getOutputConfigurations()) { fsa.getOutputConfigurations().put(output.getName(), output); } @@ -131,9 +135,4 @@ public List generateAndCompile(final InputStream sourceStream) { } } - @Override - protected Injector getInjector() { - return injector; - } - } \ No newline at end of file diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java index 4891d7931c..cae36c0a7c 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.avaloq.tools.ddk.check.check.Check; import com.avaloq.tools.ddk.check.check.CheckCatalog; import com.avaloq.tools.ddk.check.check.XIssueExpression; @@ -32,7 +32,7 @@ import com.google.inject.Inject; -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class BasicModelTest { diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830Test.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830Test.java index 61c8a99ca1..2091f53bf4 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830Test.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830Test.java @@ -22,13 +22,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.avaloq.tools.ddk.check.check.CheckCatalog; import com.avaloq.tools.ddk.check.check.XIssueExpression; import com.google.inject.Inject; -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class BugAig830Test { diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.java index 83532eef9c..ef6f293f30 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/formatting/CheckFormattingTest.java @@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.google.inject.Inject; // CHECKSTYLE:CONSTANTS-OFF -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class CheckFormattingTest { diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.java index 1efb22f2d2..324ca6f99d 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.java @@ -18,11 +18,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.avaloq.tools.ddk.check.check.CheckCatalog; import com.google.inject.Inject; -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class CheckApiAccessValidationsTest { diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java index e7cc376e3b..dce83e6fe2 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.google.inject.Inject; @@ -26,7 +26,7 @@ * Tests for com.avaloq.tools.ddk.check.validation.CheckJavaValidatorUtil. */ -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class CheckJavaValidatorUtilTest { diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.java index 9d527a3415..981aa2279c 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.util.RegistryIsolatingCheckInjectorProvider; import com.avaloq.tools.ddk.check.check.CheckCatalog; import com.avaloq.tools.ddk.check.check.CheckPackage; import com.avaloq.tools.ddk.check.core.test.util.CheckModelUtil; @@ -36,7 +36,7 @@ *
  • com.avaloq.tools.ddk.check.validation.ClasspathBasedChecks * */ -@InjectWith(CheckUiInjectorProvider.class) +@InjectWith(RegistryIsolatingCheckInjectorProvider.class) @ExtendWith(InjectionExtension.class) @SuppressWarnings("nls") public class CheckValidationTest { diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF index f465977245..78664f55aa 100644 --- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=t Bundle-ActivationPolicy: lazy Require-Bundle: com.avaloq.tools.ddk.check.runtime.core, com.avaloq.tools.ddk.check.test.runtime, - com.avaloq.tools.ddk.check.core.test, + com.avaloq.tools.ddk.check.ui.test, com.avaloq.tools.ddk.check.test.runtime.ui, org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.java index 439fbe7592..2154eb9802 100644 --- a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.java +++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import com.avaloq.tools.ddk.check.TestLanguageUiInjectorProvider; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.check.ui.test.AbstractCheckTestCase; import com.avaloq.tools.ddk.check.testLanguage.Model; import com.avaloq.tools.ddk.check.testLanguage.TestLanguagePackage; import com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator; diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.java index 03bcb8f9e3..f249f12150 100644 --- a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.java +++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import com.avaloq.tools.ddk.check.TestLanguageUiInjectorProvider; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.check.ui.test.AbstractCheckTestCase; import com.avaloq.tools.ddk.check.testLanguage.Model; import com.avaloq.tools.ddk.check.testLanguage.TestLanguagePackage; import com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator; diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF index 87f7af8772..7e34b2c00f 100644 --- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF @@ -24,7 +24,8 @@ Require-Bundle: com.avaloq.tools.ddk.check.ui, com.avaloq.tools.ddk.xtext.ui, com.avaloq.tools.ddk.check.runtime.core, org.hamcrest -Export-Package: com.avaloq.tools.ddk.check.ui.test.util, +Export-Package: com.avaloq.tools.ddk.check.ui.test, + com.avaloq.tools.ddk.check.ui.test.util, com.avaloq.tools.ddk.check Import-Package: org.hamcrest.core, org.apache.logging.log4j diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/AbstractCheckTestCase.java similarity index 97% rename from com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java rename to com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/AbstractCheckTestCase.java index 4afc9f094d..d5924a74da 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/AbstractCheckTestCase.java @@ -8,7 +8,7 @@ * Contributors: * Avaloq Group AG - initial API and implementation *******************************************************************************/ -package com.avaloq.tools.ddk.check.core.test; +package com.avaloq.tools.ddk.check.ui.test; import static com.google.common.collect.Sets.newHashSet; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -307,11 +307,11 @@ protected String getSourceFolderName() { * created. * * @param clazz - * the clazz + * a class in the package which holds the source files * @param sourceFileNames * the source file names */ - public void addSourcesToWorkspace(final Class clazz, final List sourceFileNames) { + public void addSourcesToWorkspace(final Class clazz, final List sourceFileNames) { try { new WorkspaceModifyOperation() { @Override @@ -359,7 +359,7 @@ protected String getSourceFolderPath() { * @throws IOException * if model could not be read */ - private String getNormalizedContents(final Class clazz, final String modelName) throws IOException { + private String getNormalizedContents(final Class clazz, final String modelName) throws IOException { try (InputStreamReader s = new InputStreamReader(clazz.getResourceAsStream(modelName), StandardCharsets.UTF_8)) { return CharStreams.toString(s); } diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckScopingTest.java similarity index 95% rename from com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.java rename to com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckScopingTest.java index 208f2cf131..7e939da681 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckScopingTest.java @@ -8,7 +8,7 @@ * Contributors: * Avaloq Group AG - initial API and implementation *******************************************************************************/ -package com.avaloq.tools.ddk.check.core.test; +package com.avaloq.tools.ddk.check.ui.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -27,6 +27,7 @@ import com.avaloq.tools.ddk.check.check.CheckCatalog; import com.avaloq.tools.ddk.check.check.Implementation; import com.avaloq.tools.ddk.check.check.XIssueExpression; +import com.avaloq.tools.ddk.check.core.test.BugAig1314Test; import com.avaloq.tools.ddk.check.core.test.util.CheckTestUtil; import com.google.common.collect.Lists; import com.google.inject.Inject; @@ -54,7 +55,7 @@ public List getRequiredSourceFileNames() { public void initializeTestProject() { // sources are copied into the project and then built by the Xtext builder - addSourcesToWorkspace(CheckScopingTest.class, getRequiredSourceFileNames()); + addSourcesToWorkspace(BugAig1314Test.class, getRequiredSourceFileNames()); // wait for build to finish, otherwise included catalog may not be resolvable IResourcesSetupUtil.waitForBuild(); } diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/ProjectBasedTests.java similarity index 95% rename from com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.java rename to com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/ProjectBasedTests.java index 3ed4608fec..6300b53a36 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/ProjectBasedTests.java @@ -9,7 +9,7 @@ * Avaloq Group AG - initial API and implementation *******************************************************************************/ -package com.avaloq.tools.ddk.check.core.test; +package com.avaloq.tools.ddk.check.ui.test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,6 +30,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import com.avaloq.tools.ddk.check.CheckUiInjectorProvider; +import com.avaloq.tools.ddk.check.core.test.BugDsl27Test; import com.google.common.collect.Lists; @SuppressWarnings("nls") @@ -55,7 +56,7 @@ public void initializeTestProject() { if (!initialized) { initialized = true; // sources are copied into the project and then built by the Xtext builder - addSourcesToWorkspace(ProjectBasedTests.class, getRequiredSourceFileNames()); + addSourcesToWorkspace(BugDsl27Test.class, getRequiredSourceFileNames()); // wait for build to finish, otherwise included catalog may not be resolvable IResourcesSetupUtil.waitForBuild(); diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java index b55164ebe2..883d0cabd5 100644 --- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java @@ -26,7 +26,7 @@ import org.eclipse.xtext.ui.testing.ContentAssistProcessorTestBuilder; import org.eclipse.xtext.ui.testing.util.ResourceLoadHelper; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.check.ui.test.AbstractCheckTestCase; import com.avaloq.tools.ddk.xtext.test.PluginTestProjectManager; diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/.classpath b/com.avaloq.tools.ddk.checkcfg.ui.test/.classpath similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/.classpath rename to com.avaloq.tools.ddk.checkcfg.ui.test/.classpath diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/.project b/com.avaloq.tools.ddk.checkcfg.ui.test/.project similarity index 97% rename from com.avaloq.tools.ddk.checkcfg.core.test/.project rename to com.avaloq.tools.ddk.checkcfg.ui.test/.project index 8e61dbb8b8..7e859de027 100644 --- a/com.avaloq.tools.ddk.checkcfg.core.test/.project +++ b/com.avaloq.tools.ddk.checkcfg.ui.test/.project @@ -1,6 +1,6 @@ - com.avaloq.tools.ddk.checkcfg.core.test + com.avaloq.tools.ddk.checkcfg.ui.test diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/.settings/.gitignore b/com.avaloq.tools.ddk.checkcfg.ui.test/.settings/.gitignore similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/.settings/.gitignore rename to com.avaloq.tools.ddk.checkcfg.ui.test/.settings/.gitignore diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF similarity index 81% rename from com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF rename to com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF index f3b509477a..75a6305486 100644 --- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test +Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test Bundle-Vendor: Avaloq Group AG Bundle-Version: 17.3.1.qualifier -Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true +Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: com.avaloq.tools.ddk.test.core, com.avaloq.tools.ddk.check.test.runtime.ui, @@ -27,4 +27,4 @@ Require-Bundle: com.avaloq.tools.ddk.test.core, Import-Package: org.hamcrest.core Export-Package: com.avaloq.tools.ddk.checkcfg.util Bundle-RequiredExecutionEnvironment: JavaSE-21 -Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.core.test +Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.ui.test diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/build.properties b/com.avaloq.tools.ddk.checkcfg.ui.test/build.properties similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/build.properties rename to com.avaloq.tools.ddk.checkcfg.ui.test/build.properties diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml similarity index 91% rename from com.avaloq.tools.ddk.checkcfg.core.test/pom.xml rename to com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml index d87ee60111..1b0dcd4589 100644 --- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml +++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml @@ -8,7 +8,7 @@ 17.3.1-SNAPSHOT - com.avaloq.tools.ddk.checkcfg.core.test + com.avaloq.tools.ddk.checkcfg.ui.test eclipse-test-plugin diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/contentassist/CheckCfgContentAssistTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/contentassist/CheckCfgContentAssistTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/contentassist/CheckCfgContentAssistTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/contentassist/CheckCfgContentAssistTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/scoping/CheckCfgScopeProviderTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/scoping/CheckCfgScopeProviderTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/scoping/CheckCfgScopeProviderTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/scoping/CheckCfgScopeProviderTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgModelUtil.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgModelUtil.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgModelUtil.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgModelUtil.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgTestUtil.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgTestUtil.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgTestUtil.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/util/CheckCfgTestUtil.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgConfiguredParameterValidationsTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgConfiguredParameterValidationsTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgConfiguredParameterValidationsTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgConfiguredParameterValidationsTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithExpectedValues.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithExpectedValues.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithExpectedValues.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithExpectedValues.java diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithOutExpectedValues.java b/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithOutExpectedValues.java similarity index 100% rename from com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithOutExpectedValues.java rename to com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/test/checkcfg/TestPropertySpecificationWithOutExpectedValues.java diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF index 5e0d9965e6..a8a7bd1e6a 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld, org.eclipse.ui.workbench;resolution:=optional, com.avaloq.tools.ddk.check.runtime.core, com.avaloq.tools.ddk.check.runtime.ui, - com.avaloq.tools.ddk.check.core.test, + com.avaloq.tools.ddk.check.ui.test, org.eclipse.xtext.xbase.ui.testing, junit-jupiter-api, junit-jupiter-engine diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java index 657aa26e4d..4f21f9c069 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.check.ui.test.AbstractCheckTestCase; import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage; import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model; import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider; diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java index 86de49605f..801109259f 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.check.ui.test.AbstractCheckTestCase; import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage; import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model; import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider; diff --git a/ddk-configuration/working-set/ddk.wst b/ddk-configuration/working-set/ddk.wst index c9211ab974..e5c6d2d214 100644 --- a/ddk-configuration/working-set/ddk.wst +++ b/ddk-configuration/working-set/ddk.wst @@ -36,7 +36,7 @@ - + diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml index 091c49ec62..56070ce580 100644 --- a/ddk-parent/pom.xml +++ b/ddk-parent/pom.xml @@ -119,8 +119,8 @@ ../com.avaloq.tools.ddk.check.test.runtime.ui ../com.avaloq.tools.ddk.checkcfg.core ../com.avaloq.tools.ddk.checkcfg.ide - ../com.avaloq.tools.ddk.checkcfg.core.test ../com.avaloq.tools.ddk.checkcfg.ui + ../com.avaloq.tools.ddk.checkcfg.ui.test ../com.avaloq.tools.ddk.sample.helloworld ../com.avaloq.tools.ddk.sample.helloworld.ide ../com.avaloq.tools.ddk.sample.helloworld.ui