From d12d9977b18f49160d41d853b2f28aebe48af703 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Tue, 27 Nov 2018 15:32:31 +0100
Subject: [PATCH] Adjusted initial commit
---
.../org.eclipse.buildship.core.prefs | 2 +-
de.ugoe.cs.rwm.mocci.model.edit/.gitignore | 1 +
.../de.ugoe.cs.rwm.mocci.model.examples.jar | Bin 261 -> 0 bytes
.../build/tmp/jar/MANIFEST.MF | 2 --
settings.gradle | 2 +-
.../ugoe/cs/rwm/mocci/DeployWorkflowTest.java | 1 -
.../de/ugoe/cs/rwm/mocci/TestUtility.java | 31 ------------------
.../mocci/live/DeployWorkflowLiveTest.java | 2 --
...ent.connector.dummy_1.0.0.201811071506.jar | Bin 0 -> 2959 bytes
9 files changed, 3 insertions(+), 38 deletions(-)
create mode 100644 de.ugoe.cs.rwm.mocci.model.edit/.gitignore
delete mode 100644 de.ugoe.cs.rwm.mocci.model.examples/build/libs/de.ugoe.cs.rwm.mocci.model.examples.jar
delete mode 100644 de.ugoe.cs.rwm.mocci.model.examples/build/tmp/jar/MANIFEST.MF
create mode 100644 src/test/resources/martserver-plugins/org.modmacao.placement.connector.dummy_1.0.0.201811071506.jar
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 e889521..b1886ad 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 0000000..84c048a
--- /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
GIT binary patch
literal 0
HcmV?d00001
literal 261
zcmWIWW@h1HVBp|jxKLK@%K!vSAOZ+Df!NnI#8KDN&rP41Apk|;rh2A#(m(~0KrDi+
z(AUw=)6F$FM9<glv+tSHKHj=|7kRyPwa%S6zd6X@it&S|kDf9C4P#^yVa9DQ&_o~*
sV0h~YqT#MU*M{y2kYW&6(x?d};o6Yg6yVLu22#NUgq1+L48&mo0Imr!ivR!s
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 58630c0..0000000
--- 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 6bf8747..092c5e7 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 0ccad21..c59663e 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 15f1ff5..a4b56e2 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 981fcc4..c7a0b16 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
GIT binary patch
literal 2959
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
literal 0
HcmV?d00001
--
GitLab