1 files changed, 7 insertions, 33 deletions
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
index 133b3b9..ccb4c8d 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
@@ -4,6 +4,7 @@ import org.junit.Test;
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.TimerSchedulerMessage;
 import pl.edu.mimuw.cloudatlas.agent.modules.Module;
+import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduledTask;
 import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduler;
 
@@ -14,8 +15,8 @@ import java.util.HashMap;
 // TODO add wrong message test with switched types
 
 public class SchedulerTest {
-    private HashMap<AgentMessage.AgentModule, Module> modules;
-    private HashMap<AgentMessage.AgentModule, Executor> executors;
+    private HashMap<ModuleType, Module> modules;
+    private HashMap<ModuleType, Executor> executors;
     private ArrayList<Thread> executorThreads;
     private EventBus eventBus;
     private Thread eventBusThread;
@@ -29,48 +30,25 @@ public class SchedulerTest {
         eventBusThread.start();
     }
 
-    public HashMap<AgentMessage.AgentModule, Module> initializeModule() {
-        HashMap<AgentMessage.AgentModule, Module> modules = new HashMap<AgentMessage.AgentModule, Module>();
-        modules.put(AgentMessage.AgentModule.TIMER_SCHEDULER, new TimerScheduler(AgentMessage.AgentModule.TIMER_SCHEDULER));
+    public HashMap<ModuleType, Module> initializeModule() {
+        HashMap<ModuleType, Module> modules = new HashMap<ModuleType, Module>();
+        modules.put(ModuleType.TIMER_SCHEDULER, new TimerScheduler(ModuleType.TIMER_SCHEDULER));
         return modules;
     }
 
     @Test
     public void initializeWrongModuleType() {
         try {
-            Module timer = new TimerScheduler(AgentMessage.AgentModule.RMI);
+            Module timer = new TimerScheduler(ModuleType.RMI);
         } catch (AssertionError e) {
             System.out.println("Wrong timer type during init error caught");
         }
     }
 
     @Test
-    public void sendWrongMessageType() throws InterruptedException {
-        try {
-            this.eventBus.addMessage(new TimerSchedulerMessage(
-                    "0",
-                    AgentMessage.AgentModule.UDP,
-                    System.currentTimeMillis() / 1000L,
-                    "1",
-                    10,
-                    System.currentTimeMillis() / 1000L,
-                    new TimerScheduledTask() {
-                        @Override
-                        public void run() {
-                            System.out.println("Task executed");
-                        }
-                    }));
-            Thread.sleep(1000);
-        } catch (AssertionError e) {
-            System.out.println("Wrong timer-scheduler message type error caught");
-        }
-    }
-
-    @Test
     public void scheduleTask() throws InterruptedException {
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,
@@ -89,7 +67,6 @@ public class SchedulerTest {
     public void scheduleTwoTasks() throws InterruptedException {
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,
@@ -103,7 +80,6 @@ public class SchedulerTest {
 
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 20,
@@ -123,7 +99,6 @@ public class SchedulerTest {
     public void scheduleTwoMessagingTasks() throws InterruptedException {
         TimerSchedulerMessage messageToSend = new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 20,
@@ -137,7 +112,6 @@ public class SchedulerTest {
 
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,