Adopted files in model/runtime/custom and the related test from Michal.

d3scomp · Nov 6, 2013 · d9b4063 · d9b4063
1 parent 3b4201c
commit d9b4063
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 53 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
@@ -3,9 +3,12 @@
  */
 package cz.cuni.mff.d3s.deeco.model.runtime.custom;
 
-import org.eclipse.emf.ecore.util.EcoreUtil;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
+import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNode;
 import cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl;
 
 /**
@@ -27,9 +30,15 @@ public KnowledgePathExt() {
 	@Override
 	public boolean equals(Object that) {
 		if (that instanceof KnowledgePath) {
-			return EcoreUtil.equals(this, (KnowledgePath)that);
+			List<PathNode> thatNodes = new LinkedList<>(((KnowledgePath) that).getNodes());
+			List<PathNode> thisNodes = new LinkedList<>(nodes);
+			return thisNodes.equals(thatNodes);
 		}
-
 		return false;
 	}
+
+	@Override
+	public int hashCode() {
+		return nodes.toString().hashCode();
+	}
 }
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
@@ -0,0 +1,38 @@
+package cz.cuni.mff.d3s.deeco.model.runtime.custom;
+
+import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;
+import cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl;
+
+/**
+ * @author Michal Kit <kit@d3s.mff.cuni.cz>
+ * 
+ */
+public class PathNodeFieldExt extends PathNodeFieldImpl {
+
+	public PathNodeFieldExt() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object that) {
+		if (that != null && that instanceof PathNodeField) {
+			return ((PathNodeField) that).getName().equals(this.name);
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
@@ -4,6 +4,7 @@
 package cz.cuni.mff.d3s.deeco.model.runtime.custom;
 
 import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
+import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;
 import cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataFactoryImpl;
 
 /**
@@ -32,5 +33,10 @@ public KnowledgePath createKnowledgePath() {
 		return new KnowledgePathExt();
 	}
 
+	@Override
+	public PathNodeField createPathNodeField() {
+		return new PathNodeFieldExt();
+	}
+
 	// TODO: We might have also toString() method implemented for the KnowledgePath
 }
diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java
@@ -18,14 +18,15 @@
 import cz.cuni.mff.d3s.deeco.model.runtime.api.ComponentInstance;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.ComponentProcess;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
+import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNode;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.RuntimeMetadata;
 import cz.cuni.mff.d3s.deeco.model.runtime.custom.RuntimeMetadataFactoryExt;
 import cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataFactory;
 
 /**
  * @author Tomas Bures <bures@d3s.mff.cuni.cz>
- *
+ * 
  */
 public class RuntimeModelTest {
 
@@ -38,76 +39,109 @@ private KnowledgePath createSamplePathInstance() {
 
 		PathNodeField pn;
 		KnowledgePath p = factory.createKnowledgePath();
-		
+
 		pn = factory.createPathNodeField();
 		pn.setName(new String("level1"));
 		p.getNodes().add(pn);
-		
+
 		pn = factory.createPathNodeField();
 		pn.setName(new String("level2"));
 		p.getNodes().add(pn);
-		
+
 		return p;
 	}
-
+
+	private PathNode createPathNodeInstance(String name) {
+		RuntimeMetadataFactory factory = RuntimeMetadataFactory.eINSTANCE;
+		PathNodeField pn = factory.createPathNodeField();
+		pn.setName(new String(name));
+		return pn;
+	}
+
+	@Test
+	public void testEqualsWorksWithPathNodes() {
+		// WHEN two instance of PathNode designate the same path node
+		PathNode pn1 = createPathNodeInstance("test");
+		PathNode pn2 = createPathNodeInstance("test");
+		// THEN the two instances of PathNode are equal w.r.t equals method
+		assertEquals(pn1, pn2);
+	}
+
+	@Test
+	public void testHashCodeWorksWithPathNodes() {
+		// WHEN two instance of PathNode designate the same path node
+		PathNode pn1 = createPathNodeInstance("test");
+		PathNode pn2 = createPathNodeInstance("test");
+		// THEN the two instances of PathNode are equal w.r.t hashCode method
+		assertEquals(pn1.hashCode(), pn2.hashCode());
+	}
+
 	@Test
 	public void testEqualsWorksWithKnowledgePath() {
-
 		// WHEN two instance of KnowledgePath designate the same path
 		KnowledgePath p1 = createSamplePathInstance();
 		KnowledgePath p2 = createSamplePathInstance();
-		// THEN they should be equal using equals method
+		 // THEN they should be equal using equals method
 		assertEquals(p1, p2);
 	}
 
+	@Test
+	public void testHashCodeWorksWithKnowledgePath() {
+		// WHEN two instance of KnowledgePath designate the same path
+		KnowledgePath p1 = createSamplePathInstance();
+		KnowledgePath p2 = createSamplePathInstance();
+		// WHEN the two instance of KnowledgePath are equal w.r.t hashCode methods
+		assertEquals(p1.hashCode(), p2.hashCode());
+	}
+
 	@Test
 	public void testExtensions() {
 		// WHEN a RuntimeMetadataFactory is obtained
-		RuntimeMetadataFactory factory = RuntimeMetadataFactory.eINSTANCE; 
-		// THEN RuntimeMetadataFactory is an instance of RuntimeMetadataFactoryExt (i.e. our custom class)
+		RuntimeMetadataFactory factory = RuntimeMetadataFactory.eINSTANCE;
+		// THEN RuntimeMetadataFactory is an instance of
+		// RuntimeMetadataFactoryExt (i.e. our custom class)
 		assertTrue(factory instanceof RuntimeMetadataFactoryExt);
 	}
-	
+
 	public static void dummyMethodThatStandsForAComponentProcess() {
 	}
+	 @Test
+     @Ignore
+     public void testSaveAndLoad() throws Exception {
+             // WHEN a RuntimeMetadata instance, which contains a method (within an Invocable)
+             // and contains a knowledge manager with some knowledge is created
+             SampleRuntimeModel oModel = new SampleRuntimeModel();
+
+             // THEN the instance can be saved
+             ResourceSet resourceSet = new ResourceSetImpl();
 
-	@Test
-	@Ignore
-	public void testSaveAndLoad() throws Exception {
-		// WHEN a RuntimeMetadata instance, which contains a method (within an Invocable)
-		// and contains a knowledge manager with some knowledge is created
-		SampleRuntimeModel oModel = new SampleRuntimeModel();
-
-		// THEN the instance can be saved
-		ResourceSet resourceSet = new ResourceSetImpl();
-
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
-
-		File testXMIFile = new File("test-temp/test.xmi");
-		URI fileURI = URI.createFileURI(testXMIFile.getAbsolutePath());
-		Resource resource = resourceSet.createResource(fileURI);
-		resource.getContents().add(oModel.model);
-		resource.save(Collections.EMPTY_MAP);
-		assertTrue(testXMIFile.exists());
-
-		// WHEN a RuntimeMetadata instance with a method is loaded
-		resourceSet = new ResourceSetImpl();
-
-		// This needs to be uncommented, but for that it needs a dependency on XMI
-		// resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
-
-		RuntimeMetadata nModel = (RuntimeMetadata)resourceSet.getResource(fileURI, true).getContents().get(0);
-
-		// THEN it has the same values
-		// AND refers to the same method within the same class as before
-		// AND contains the same knowledge as before
-		ComponentInstance nComponentInstance = nModel.getComponentInstances().get(0);
-		ComponentProcess nComponentProcess = nComponentInstance.getComponentProcesses().get(0);
-
-		assertEquals(oModel.componentInstance.getName(), nComponentInstance.getName());
-		assertEquals(oModel.process.getName(), nComponentProcess.getName());
-		assertEquals(oModel.process.getMethod(), nComponentProcess.getMethod());
-		// TODO: Compare the triggers and process params
-		// TODO: Compare the data stored in the knowledge manager
-	}
-}
+             resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+
+             File testXMIFile = new File("test-temp/test.xmi");
+             URI fileURI = URI.createFileURI(testXMIFile.getAbsolutePath());
+             Resource resource = resourceSet.createResource(fileURI);
+             resource.getContents().add(oModel.model);
+             resource.save(Collections.EMPTY_MAP);
+             assertTrue(testXMIFile.exists());
+
+             // WHEN a RuntimeMetadata instance with a method is loaded
+             resourceSet = new ResourceSetImpl();
+
+             // This needs to be uncommented, but for that it needs a dependency on XMI
+             // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+
+             RuntimeMetadata nModel = (RuntimeMetadata)resourceSet.getResource(fileURI, true).getContents().get(0);
+
+             // THEN it has the same values
+             // AND refers to the same method within the same class as before
+             // AND contains the same knowledge as before
+             ComponentInstance nComponentInstance = nModel.getComponentInstances().get(0);
+             ComponentProcess nComponentProcess = nComponentInstance.getComponentProcesses().get(0);
+
+             assertEquals(oModel.componentInstance.getName(), nComponentInstance.getName());
+             assertEquals(oModel.process.getName(), nComponentProcess.getName());
+             assertEquals(oModel.process.getMethod(), nComponentProcess.getMethod());
+             // TODO: Compare the triggers and process params
+             // TODO: Compare the data stored in the knowledge manager
+     }
+}