From 8b076ed54b692381a3c1410b704bdad33ad5ca0b Mon Sep 17 00:00:00 2001
From: Martin <marcin.j.chrzanowski@gmail.com>
Date: Thu, 26 Dec 2019 15:27:44 +0100
Subject: Refactor handle (#75)

* Refactor passing messages to handler

* Add RMIMessage skeleton

* Handle RMI message in RMI module
---
 .../edu/mimuw/cloudatlas/agent/ExecutorTest.java   | 40 ++++++----------------
 1 file changed, 11 insertions(+), 29 deletions(-)

(limited to 'src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java')

diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
index 8653258..0ff7a07 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
@@ -4,8 +4,8 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
-import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage.AgentModule;
 import pl.edu.mimuw.cloudatlas.agent.modules.Module;
+import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 
 // TODO make agent messages specific subclass
 
@@ -13,7 +13,7 @@ public class ExecutorTest {
     public class MessageCounterModule extends Module {
         public int counter = 0;
 
-        MessageCounterModule(AgentModule moduleType) {
+        MessageCounterModule(ModuleType moduleType) {
             super(moduleType);
         }
 
@@ -24,7 +24,7 @@ public class ExecutorTest {
 
     @Test
     public void testDoesntExecuteWhenNoMessages() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
         Thread thread = new Thread(executor);
         thread.start();
@@ -33,16 +33,12 @@ public class ExecutorTest {
         assertEquals(0, module.counter);
     }
 
+    /*
     @Test
     public void testExecutesHandlerOnce() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread thread = new Thread(executor);
         thread.start();
         Thread.sleep(100);
@@ -52,31 +48,17 @@ public class ExecutorTest {
 
     @Test
     public void testExecutesHandlerMultipleTimes() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread thread = new Thread(executor);
         thread.start();
         Thread.sleep(100);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread.sleep(100);
         thread.interrupt();
         assertEquals(3, module.counter);
     }
+    */
 }
-- 
cgit v1.2.3