Merge branch 'newgen' of https://github.com/d3scomp/JDEECo into newgen

d3scomp · Oct 25, 2013 · 8b3e382 · 8b3e382
2 parents 3c6c6ee + 118a696
commit 8b3e382
Show file tree

Hide file tree

Showing 8 changed files with 510 additions and 131 deletions.
diff --git a/jdeeco-architecture/architecture-re.emx b/jdeeco-architecture/architecture-re.emx
diff --git a/jdeeco-core/.project b/jdeeco-core/.project
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cz.cuni.mff.d3s.jdeeco.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cz.cuni.mff.d3s.jdeeco.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/jdeeco-core/pom.xml b/jdeeco-core/pom.xml
@@ -16,6 +16,7 @@
 		<lib>${dist}/lib</lib>
 		<clonerJar>cloner.jar</clonerJar>
 		<objenesisJar>objenesis.jar</objenesisJar>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<build>
 		<sourceDirectory>src</sourceDirectory>

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
@@ -1,7 +1,7 @@
-package cz.cuni.mff.d3s.deeco.executor;
-
-import cz.cuni.mff.d3s.deeco.task.Task;
-
-public interface ExecutionListener {
-	public void executionCompleted( Task task );
-}
+package cz.cuni.mff.d3s.deeco.executor;
+
+import cz.cuni.mff.d3s.deeco.task.Task;
+
+public interface ExecutionListener {
+	public void executionCompleted( Task task );
+}
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeReference.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeReference.java
@@ -1,6 +1,6 @@
-package cz.cuni.mff.d3s.deeco.knowledge;
-
-// FIXME TB: I would make this a class, but I suppose you have it on your list.
-public interface KnowledgeReference {
-
-}
+package cz.cuni.mff.d3s.deeco.knowledge;
+
+// FIXME TB: I would make this a class, but I suppose you have it on your list.
+public interface KnowledgeReference {
+
+}
diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
@@ -25,24 +25,24 @@ public class ExecutorTest {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
-		this.singleThreadedExecutorUnderTest = new SingleThreadedExecutor();
+//		MockitoAnnotations.initMocks(this);
+//		this.singleThreadedExecutorUnderTest = new SingleThreadedExecutor();
 	}
 
 	@Test
 	public void testSingleThreadedExecutorExecute() {
 
-		ValueSet emptyValueSet = new ValueSet();
-
-		// Specify behavior for mock objects
-		when(task.getInputReferences()).thenReturn(
-				new LinkedList<KnowledgeReference>());
-		when(task.invoke(emptyValueSet)).thenReturn(new ChangeSet());
-
-		singleThreadedExecutorUnderTest.execute(task);
-
-		verify(task).getInputReferences();
-		verify(task).invoke(emptyValueSet);
-		verifyNoMoreInteractions(task);
+//		ValueSet emptyValueSet = new ValueSet();
+//
+//		// Specify behavior for mock objects
+//		when(task.getInputReferences()).thenReturn(
+//				new LinkedList<KnowledgeReference>());
+//		when(task.invoke(emptyValueSet)).thenReturn(new ChangeSet());
+//
+//		singleThreadedExecutorUnderTest.execute(task);
+//
+//		verify(task).getInputReferences();
+//		verify(task).invoke(emptyValueSet);
+//		verifyNoMoreInteractions(task);
 	}
 }
diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerTest.java
@@ -31,61 +31,61 @@ public class KnowledgeManagerTest {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
-		this.knowledgeManager = new KnowledgeManagerImpl();
-		this.changeSet = mock(ChangeSet.class);
+//		MockitoAnnotations.initMocks(this);
+//		this.knowledgeManager = new KnowledgeManagerImpl();
+//		this.changeSet = mock(ChangeSet.class);
 	}
 
 
 	@Test
 	public void testUpdate() {
-		// Specify behavior for mock objects
-		// Can we define something more specific than just Object for this return type, it seems to broad.
-
-		knowledgeManager.update(changeSet);
-
-		Object obj=new Object();
-		assertEquals(0, changeSet.getUpdatedReferences().size());
-		changeSet.setValue(knowledgeReferenceObj, obj);
-		assertNotNull(changeSet.getUpdatedReferences());
-		assertEquals(1, changeSet.getUpdatedReferences().size());
-		assertEquals(true, changeSet.getUpdatedReferences().contains(knowledgeReferenceObj));
-
-		assertEquals(0, changeSet.getDeletedReferences().size());
-		changeSet.setDeleted(knowledgeReferenceObj);
-		assertNotNull(changeSet.getDeletedReferences());
-		assertEquals(1, changeSet.getDeletedReferences().size());
-		assertEquals(true, changeSet.getDeletedReferences().contains(knowledgeReferenceObj));
-
-		verifyNoMoreInteractions(knowledgeReferenceObj);
+//		// Specify behavior for mock objects
+//		// Can we define something more specific than just Object for this return type, it seems to broad.
+//		
+//		knowledgeManager.update(changeSet);
+//
+//		Object obj=new Object();
+//		assertEquals(0, changeSet.getUpdatedReferences().size());
+//		changeSet.setValue(knowledgeReferenceObj, obj);
+//		assertNotNull(changeSet.getUpdatedReferences());
+//		assertEquals(1, changeSet.getUpdatedReferences().size());
+//		assertEquals(true, changeSet.getUpdatedReferences().contains(knowledgeReferenceObj));
+//
+//		assertEquals(0, changeSet.getDeletedReferences().size());
+//		changeSet.setDeleted(knowledgeReferenceObj);
+//		assertNotNull(changeSet.getDeletedReferences());
+//		assertEquals(1, changeSet.getDeletedReferences().size());
+//		assertEquals(true, changeSet.getDeletedReferences().contains(knowledgeReferenceObj));
+//	
+//		verifyNoMoreInteractions(knowledgeReferenceObj);
 	}
 
 
 	@Test
 	public void testGet() {
 
-		knowledgeReferenceList.add(knowledgeReferenceObj);
-
-		changeSet.setValue(knowledgeReferenceObj, "1");
-		knowledgeManager.update(changeSet);
-		assertNotNull(knowledgeManager.get(knowledgeReferenceList));
-		assertEquals("1", knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
-
-		changeSet.setValue(knowledgeReferenceObj, KnowledgeValue.EMPTY);
-		knowledgeManager.update(changeSet);
-		assertEquals(KnowledgeValue.EMPTY, knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
-
-		changeSet.setDeleted(knowledgeReferenceObj);
-		assertNull(knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
-
-		verifyNoMoreInteractions(knowledgeReferenceObj);
-		verifyNoMoreInteractions(knowledgeReferenceList);
+//		knowledgeReferenceList.add(knowledgeReferenceObj);
+//		
+//		changeSet.setValue(knowledgeReferenceObj, "1");
+//		knowledgeManager.update(changeSet);
+//		assertNotNull(knowledgeManager.get(knowledgeReferenceList));
+//		assertEquals("1", knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
+//			
+//		changeSet.setValue(knowledgeReferenceObj, KnowledgeValue.EMPTY);
+//		knowledgeManager.update(changeSet);
+//		assertEquals(KnowledgeValue.EMPTY, knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
+//		
+//		changeSet.setDeleted(knowledgeReferenceObj);
+//		assertNull(knowledgeManager.get(knowledgeReferenceList).getValue(knowledgeReferenceObj));
+//		
+//		verifyNoMoreInteractions(knowledgeReferenceObj);
+//		verifyNoMoreInteractions(knowledgeReferenceList);
 }
 
 	@Test
 	public void testRegister() {
 
-		knowledgeManager.register(trigger);
+//		knowledgeManager.register(trigger);
 //		verifyNoMoreInteractions(trigger);
 	}
 

diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/TaskTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/TaskTest.java
@@ -31,25 +31,25 @@ public class TaskTest {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
-		this.processTask = new ProcessTask(schedulingSpecification);
-		this.ensembleTask = new EnsembleTask(schedulingSpecification);
+//		MockitoAnnotations.initMocks(this);
+//		this.processTask = new ProcessTask(schedulingSpecification);
+//		this.ensembleTask = new EnsembleTask(schedulingSpecification);
 	}
 
 	@Test
 	public void testProcessInvoke() {
-		Object parameterAValue = new Object();
-		Object parameterBValue = new Object();
-
-		//Train mock
-		when(inputParameters.getValue(parameterA)).thenReturn(parameterAValue);
-		when(inputParameters.getValue(parameterB)).thenReturn(parameterBValue);
-
-		processTask.invoke(inputParameters);
-
-		verify(inputParameters).getValue(parameterA);
-		verify(inputParameters).getValue(parameterB);
-		verifyZeroInteractions(inputParameters);
+//		Object parameterAValue = new Object();
+//		Object parameterBValue = new Object();
+//		
+//		//Train mock
+//		when(inputParameters.getValue(parameterA)).thenReturn(parameterAValue);
+//		when(inputParameters.getValue(parameterB)).thenReturn(parameterBValue);
+//
+//		processTask.invoke(inputParameters);
+//		
+//		verify(inputParameters).getValue(parameterA);
+//		verify(inputParameters).getValue(parameterB);
+//		verifyZeroInteractions(inputParameters);
 	}
 
 	@Test
@@ -64,18 +64,18 @@ public void testProcessGetSchedulingSpecification() {
 
 	@Test
 	public void testEnsembleInvoke() {
-		Object parameterAValue = new Object();
-		Object parameterBValue = new Object();
-
-		//Train mock
-		when(inputParameters.getValue(parameterA)).thenReturn(parameterAValue);
-		when(inputParameters.getValue(parameterB)).thenReturn(parameterBValue);
-
-		ensembleTask.invoke(inputParameters);
-
-		verify(inputParameters, atMost(2)).getValue(parameterA);
-		verify(inputParameters, atMost(2)).getValue(parameterB);
-		verifyZeroInteractions(inputParameters);
+//		Object parameterAValue = new Object();
+//		Object parameterBValue = new Object();
+//		
+//		//Train mock
+//		when(inputParameters.getValue(parameterA)).thenReturn(parameterAValue);
+//		when(inputParameters.getValue(parameterB)).thenReturn(parameterBValue);
+//
+//		ensembleTask.invoke(inputParameters);
+//		
+//		verify(inputParameters, atMost(2)).getValue(parameterA);
+//		verify(inputParameters, atMost(2)).getValue(parameterB);
+//		verifyZeroInteractions(inputParameters);
 	}
 
 	@Test