Adjusted initial commit

de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs

-connection.project.dir=
+connection.project.dir=..
 eclipse.preferences.version=1

de.ugoe.cs.rwm.mocci.model.edit/.gitignore

+/build/

de.ugoe.cs.rwm.mocci.model.examples/build/tmp/jar/MANIFEST.MF

-Manifest-Version: 1.0
-

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'

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));
 	}
 }

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;
-	}
-
 }

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));
 	}
 }