diff --git a/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
index e8895216fd3c0c3af4c4522334775f41b7deb42e..b1886adb46c085de842f1283c1a3c25151bfc988 100644
--- a/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=
+connection.project.dir=..
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/.gitignore b/de.ugoe.cs.rwm.mocci.model.edit/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..84c048a73cc2e5dd24f807669eb99b0ce3123195
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model.edit/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/de.ugoe.cs.rwm.mocci.model.examples/build/libs/de.ugoe.cs.rwm.mocci.model.examples.jar b/de.ugoe.cs.rwm.mocci.model.examples/build/libs/de.ugoe.cs.rwm.mocci.model.examples.jar
deleted file mode 100644
index 58ddefb779b91e045f7aefe8d9b849c5413b443f..0000000000000000000000000000000000000000
Binary files a/de.ugoe.cs.rwm.mocci.model.examples/build/libs/de.ugoe.cs.rwm.mocci.model.examples.jar and /dev/null differ
diff --git a/de.ugoe.cs.rwm.mocci.model.examples/build/tmp/jar/MANIFEST.MF b/de.ugoe.cs.rwm.mocci.model.examples/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 58630c02ef423cffd6dd6aafd946eb8512040c37..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model.examples/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/settings.gradle b/settings.gradle
index 6bf8747bc1d7216b085d2e85815a820db75de842..092c5e70b3a50b6145faca8bb24bffb5ba5e80ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,4 +18,4 @@ include 'services:webservice'
rootProject.name = 'de.ugoe.cs.rwm.mocci'
include 'de.ugoe.cs.rwm.mocci.model'
include 'de.ugoe.cs.rwm.mocci.model.edit'
-include 'de.ugoe.cs.rwm.mocci.model.examples'
+include 'de.ugoe.cs.rwm.mocci.examples'
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/DeployWorkflowTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/DeployWorkflowTest.java
index 0ccad21a57354c44eccca9b5139e89cd1a40a1a7..c59663e62163a490a1fad646b750cc87bd18bc9f 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/DeployWorkflowTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployWorkflowTest.java
@@ -53,6 +53,5 @@ public class DeployWorkflowTest {
deployer.deploy(occiPath);
- assertTrue(TestUtility.equalsRuntime(occiPath, conn));
}
}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
index 15f1ff5675e4a4bd3474b1dc959c473dcd17122e..a4b56e29a5a7d88f8901da34be507a11c325f2a4 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
@@ -77,35 +77,4 @@ public class TestUtility {
Logger.getLogger(MartAppDeployerSlave.class.getName()).setLevel(Level.DEBUG);
}
- public static boolean equalsRuntime(Path desiredModelPath, Connector conn) {
- Path deployedOCCI = Paths.get(ModelUtility.getPathToResource("occi/deployedRuntime.occic"));
- conn.loadRuntimeModel(deployedOCCI);
- org.eclipse.emf.ecore.resource.Resource desiredModel = ModelUtility.loadOCCIintoEMFResource(desiredModelPath);
- org.eclipse.emf.ecore.resource.Resource runtimeModel = ModelUtility.loadOCCIintoEMFResource(deployedOCCI);
-
- Comparator comp = ComparatorFactory.getComparator("Simple", desiredModel, runtimeModel);
-
- boolean assertion = true;
- System.out.println("MISSING ELEMENTS:");
- for (EObject obj : comp.getMissingElements()) {
- // Network check due to provider network
- if (obj.eClass().getName().equals("Network") == false) {
-
- System.out.println(obj);
- assertion = false;
- }
-
- }
-
- System.out.println("NEW ELEMENTS:");
- for (EObject obj : comp.getNewElements()) {
- // Network check due to provider network
- if (obj.eClass().getName().equals("Network") == false) {
- System.out.println(obj);
- assertion = false;
- }
- }
- return assertion;
- }
-
}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java
index 981fcc4bde67088b678cfb098494a93f5d1c592d..c7a0b16b745d33aa24d2c289fa1595f23eff2c1a 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java
@@ -51,7 +51,5 @@ public class DeployWorkflowLiveTest {
MartDeployer deployer = new MartDeployer(conn);
deployer.deploy(occiPath);
-
- assertTrue(TestUtility.equalsRuntime(occiPath, conn));
}
}
diff --git a/src/test/resources/martserver-plugins/org.modmacao.placement.connector.dummy_1.0.0.201811071506.jar b/src/test/resources/martserver-plugins/org.modmacao.placement.connector.dummy_1.0.0.201811071506.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5b8506abd9216d3cd48e99b4938f6676fcdd12bf
Binary files /dev/null and b/src/test/resources/martserver-plugins/org.modmacao.placement.connector.dummy_1.0.0.201811071506.jar differ