Reenable test case and remove additional domains from VsumTest

vitruv-tools · Feb 23, 2021 · 92f1501 · 92f1501
1 parent 92256d6
commit 92f1501
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/tests/framework/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF b/tests/framework/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: tools.vitruv.framework.tests.vsum
 Require-Bundle: org.apache.log4j,
  tools.vitruv.testutils,
- tools.vitruv.testutils.metamodels,
+ tools.vitruv.testutils.domains,
+ org.eclipse.core.expressions,
  org.apache.commons.lang,
  org.eclipse.xtend.lib,
  org.eclipse.uml2.uml,

diff --git a/...ols.vitruv.framework.vsum.tests/src/tools/vitruv/framework/tests/vsum/SimpleVsumTest.java b/...ols.vitruv.framework.vsum.tests/src/tools/vitruv/framework/tests/vsum/SimpleVsumTest.java
@@ -34,7 +34,6 @@ public void testAll() {
         createDefaultVirtualModel();
     }
 
-    @Disabled
     @Test
     public void testVsumAddGetChangeAndSaveModel() {
         // create VSUM
@@ -77,7 +76,7 @@ public Void call() {
         assertNotNull(mi.getResource(), "Resource of model instance is null");
     }
 
-    @Disabled // Only because Travis-CI cannot handle this
+    @Disabled
     @Test
     public void testVUMResourceIsChangedExternally() throws IOException {
         // same as above

diff --git a/...ork/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/tests/vsum/VsumTest.java b/...ork/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/tests/vsum/VsumTest.java
@@ -14,8 +14,6 @@
 import pcm_mockup.Pcm_mockupFactory;
 import pcm_mockup.Pcm_mockupPackage;
 import pcm_mockup.Repository;
-import tools.vitruv.framework.domains.AbstractVitruvDomain;
-import tools.vitruv.framework.domains.VitruvDomain;
 import tools.vitruv.framework.userinteraction.UserInteractionFactory;
 import tools.vitruv.framework.util.bridges.EMFBridge;
 import tools.vitruv.framework.util.datatypes.ModelInstance;
@@ -26,6 +24,8 @@
 import tools.vitruv.testutils.TestLogging;
 import tools.vitruv.testutils.TestProject;
 import tools.vitruv.testutils.TestProjectManager;
+import tools.vitruv.testutils.domains.PcmMockupDomainProvider;
+import tools.vitruv.testutils.domains.UmlMockupDomainProvider;
 import uml_mockup.UClass;
 import uml_mockup.UPackage;
 import uml_mockup.Uml_mockupFactory;
@@ -48,12 +48,6 @@ void acquireTestProjectFolder(@TestProject final Path testProjectFolder) {
 		this.testProjectFolder = testProjectFolder;
 	}
 
-	private static final VitruvDomain UmlDomain = new AbstractVitruvDomain("UML", Uml_mockupPackage.eINSTANCE,
-		UML_FILE_EXT) {};
-
-	private static final VitruvDomain PcmDomain = new AbstractVitruvDomain("PCM", Pcm_mockupPackage.eINSTANCE,
-		PCM_FILE_EXT) {};
-
 	protected Path getCurrentProjectFolder() {
 		return this.testProjectFolder;
 	}
@@ -145,7 +139,7 @@ protected InternalVirtualModel createVirtualModel(final String vsumName) {
 		return new VirtualModelBuilder()
 			.withStorageFolder(testProjectFolder.resolve(vsumName))
 			.withUserInteractorForResultProvider(UserInteractionFactory.instance.createPredefinedInteractionResultProvider(null))
-			.withDomains(UmlDomain, PcmDomain)
+			.withDomains(new UmlMockupDomainProvider().getDomain(), new PcmMockupDomainProvider().getDomain())
 			.buildAndInitialize();
 	}