From 26c29bcc0dbb7eb7f2ac84ff362ebca971d55cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Mon, 4 Mar 2019 15:23:16 +0100
Subject: [PATCH] refactor tests
move ws handler to websocket package
---
.../handler/FeedbackCommandHandler.java | 2 +-
.../{controller => websocket}/handler/FeedbackHandler.java | 2 +-
src/test/java/de/thm/arsnova/config/TestAppConfig.java | 1 +
.../{ => handler}/FeedbackCommandHandlerTest.java | 7 +++----
.../websocket/{ => handler}/FeedbackHandlerTest.java | 4 +---
5 files changed, 7 insertions(+), 9 deletions(-)
rename src/main/java/de/thm/arsnova/{controller => websocket}/handler/FeedbackCommandHandler.java (98%)
rename src/main/java/de/thm/arsnova/{controller => websocket}/handler/FeedbackHandler.java (96%)
rename src/test/java/de/thm/arsnova/websocket/{ => handler}/FeedbackCommandHandlerTest.java (95%)
rename src/test/java/de/thm/arsnova/websocket/{ => handler}/FeedbackHandlerTest.java (88%)
diff --git a/src/main/java/de/thm/arsnova/controller/handler/FeedbackCommandHandler.java b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
similarity index 98%
rename from src/main/java/de/thm/arsnova/controller/handler/FeedbackCommandHandler.java
rename to src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
index e1d5bea1d..ead61057a 100644
--- a/src/main/java/de/thm/arsnova/controller/handler/FeedbackCommandHandler.java
+++ b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
@@ -1,4 +1,4 @@
-package de.thm.arsnova.controller.handler;
+package de.thm.arsnova.websocket.handler;
import de.thm.arsnova.websocket.message.CreateFeedback;
import de.thm.arsnova.websocket.message.FeedbackChanged;
diff --git a/src/main/java/de/thm/arsnova/controller/handler/FeedbackHandler.java b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackHandler.java
similarity index 96%
rename from src/main/java/de/thm/arsnova/controller/handler/FeedbackHandler.java
rename to src/main/java/de/thm/arsnova/websocket/handler/FeedbackHandler.java
index ad7946f93..26d92fc70 100644
--- a/src/main/java/de/thm/arsnova/controller/handler/FeedbackHandler.java
+++ b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackHandler.java
@@ -1,4 +1,4 @@
-package de.thm.arsnova.controller.handler;
+package de.thm.arsnova.websocket.handler;
import de.thm.arsnova.websocket.message.CreateFeedback;
import de.thm.arsnova.websocket.message.GetFeedback;
diff --git a/src/test/java/de/thm/arsnova/config/TestAppConfig.java b/src/test/java/de/thm/arsnova/config/TestAppConfig.java
index e68eb84ff..85dd50c43 100644
--- a/src/test/java/de/thm/arsnova/config/TestAppConfig.java
+++ b/src/test/java/de/thm/arsnova/config/TestAppConfig.java
@@ -45,6 +45,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
"de.thm.arsnova.aop",
"de.thm.arsnova.cache",
"de.thm.arsnova.controller",
+ "de.thm.arsnova.controller.handler",
"de.thm.arsnova.dao",
"de.thm.arsnova.events",
"de.thm.arsnova.security",
diff --git a/src/test/java/de/thm/arsnova/websocket/FeedbackCommandHandlerTest.java b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
similarity index 95%
rename from src/test/java/de/thm/arsnova/websocket/FeedbackCommandHandlerTest.java
rename to src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
index f99e9026e..eac55f6ed 100644
--- a/src/test/java/de/thm/arsnova/websocket/FeedbackCommandHandlerTest.java
+++ b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
@@ -1,6 +1,5 @@
-package de.thm.arsnova.websocket;
+package de.thm.arsnova.websocket.handler;
-import de.thm.arsnova.controller.handler.FeedbackCommandHandler;
import de.thm.arsnova.websocket.message.CreateFeedback;
import de.thm.arsnova.websocket.message.CreateFeedbackPayload;
import de.thm.arsnova.websocket.message.FeedbackChanged;
@@ -51,7 +50,7 @@ public class FeedbackCommandHandlerTest {
ArgumentCaptor.forClass(FeedbackChanged.class);
verify(messagingTemplate).convertAndSend(topicCaptor.capture(), messageCaptor.capture());
- assertThat(topicCaptor.getValue()).isEqualTo("/room/" + roomId + "/feedback");
+ assertThat(topicCaptor.getValue()).isEqualTo("/room/" + roomId + "/feedback.stream");
assertThat(messageCaptor.getValue()).isEqualTo(feedbackChanged);
}
@@ -69,7 +68,7 @@ public class FeedbackCommandHandlerTest {
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(messagingTemplate).convertAndSend(captor.capture(), any(FeedbackChanged.class));
- assertThat(captor.getValue()).isEqualTo("/room/" + roomId + "/feedback");
+ assertThat(captor.getValue()).isEqualTo("/room/" + roomId + "/feedback.stream");
}
}
diff --git a/src/test/java/de/thm/arsnova/websocket/FeedbackHandlerTest.java b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackHandlerTest.java
similarity index 88%
rename from src/test/java/de/thm/arsnova/websocket/FeedbackHandlerTest.java
rename to src/test/java/de/thm/arsnova/websocket/handler/FeedbackHandlerTest.java
index 6a5748995..ebbdeb474 100644
--- a/src/test/java/de/thm/arsnova/websocket/FeedbackHandlerTest.java
+++ b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackHandlerTest.java
@@ -1,7 +1,5 @@
-package de.thm.arsnova.websocket;
+package de.thm.arsnova.websocket.handler;
-import de.thm.arsnova.controller.handler.FeedbackCommandHandler;
-import de.thm.arsnova.controller.handler.FeedbackHandler;
import de.thm.arsnova.websocket.message.CreateFeedback;
import org.junit.Before;
import org.junit.Test;
--
GitLab