add tests

alyssaruth · Sep 19, 2024 · 6a374f6 · 6a374f6
1 parent 4c3a0f4
commit 6a374f6
Show file tree

Hide file tree

Showing 30 changed files with 336 additions and 314 deletions.
diff --git a/client/src/main/kotlin/http/DevApi.kt b/client/src/main/kotlin/http/DevApi.kt
@@ -1,6 +1,6 @@
 package http
 
-import dto.DevCommandRequest
+import http.dto.DevCommandRequest
 import kong.unirest.HttpMethod
 
 class DevApi(private val httpClient: HttpClient) {

diff --git a/client/src/main/kotlin/http/HealthCheckApi.kt b/client/src/main/kotlin/http/HealthCheckApi.kt
@@ -1,6 +1,6 @@
 package http
 
-import dto.HealthCheckResponse
+import http.dto.HealthCheckResponse
 import kong.unirest.HttpMethod
 
 class HealthCheckApi(private val httpClient: HttpClient) {

diff --git a/client/src/main/kotlin/http/HttpClient.kt b/client/src/main/kotlin/http/HttpClient.kt
@@ -1,6 +1,6 @@
 package http
 
-import dto.ClientErrorResponse
+import http.dto.ClientErrorResponse
 import java.util.*
 import kong.unirest.HttpMethod
 import kong.unirest.HttpResponse

diff --git a/client/src/test/kotlin/http/HttpClientTest.kt b/client/src/test/kotlin/http/HttpClientTest.kt
@@ -1,6 +1,6 @@
 package http
 
-import dto.ClientErrorResponse
+import http.dto.ClientErrorResponse
 import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.matchers.maps.shouldContain
 import io.kotest.matchers.maps.shouldContainKeys

diff --git a/...rc/main/kotlin/dto/ClientErrorResponse.kt → ...in/kotlin/http/dto/ClientErrorResponse.kt b/...rc/main/kotlin/dto/ClientErrorResponse.kt → ...in/kotlin/http/dto/ClientErrorResponse.kt
@@ -1,3 +1,3 @@
-package dto
+package http.dto
 
 data class ClientErrorResponse(val errorCode: String, val errorMessage: String)
diff --git a/.../src/main/kotlin/dto/DevCommandRequest.kt → ...main/kotlin/http/dto/DevCommandRequest.kt b/.../src/main/kotlin/dto/DevCommandRequest.kt → ...main/kotlin/http/dto/DevCommandRequest.kt
@@ -1,3 +1,3 @@
-package dto
+package http.dto
 
 data class DevCommandRequest(val command: String)
diff --git a/...rc/main/kotlin/dto/HealthCheckResponse.kt → ...in/kotlin/http/dto/HealthCheckResponse.kt b/...rc/main/kotlin/dto/HealthCheckResponse.kt → ...in/kotlin/http/dto/HealthCheckResponse.kt
@@ -1,3 +1,3 @@
-package dto
+package http.dto
 
 data class HealthCheckResponse(val version: String)
diff --git a/server/src/main/java/object/Room.java b/server/src/main/java/object/Room.java
@@ -1,21 +1,16 @@
 package object;
 
+import auth.UserConnection;
+import org.w3c.dom.Document;
+import server.EntropyServer;
+import util.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.w3c.dom.Document;
-
-import server.EntropyServer;
-import util.CardsUtil;
-import util.Debug;
-import util.EntropyUtil;
-import util.StatisticsUtil;
-import util.XmlBuilderServer;
-import util.XmlConstants;
-
 /**
  * Server-side version of a Room
  */

diff --git a/server/src/main/java/object/ServerRunnable.java b/server/src/main/java/object/ServerRunnable.java
@@ -1,6 +1,8 @@
 package object;
 
 
+import auth.UserConnection;
+
 public interface ServerRunnable extends Runnable
 {
 	public abstract String getDetails();

diff --git a/server/src/main/java/object/ServerThread.java b/server/src/main/java/object/ServerThread.java
@@ -1,6 +1,6 @@
 package object;
 
-import util.Debug;
+import auth.UserConnection;
 
 public class ServerThread extends Thread
 {

diff --git a/server/src/main/java/object/UserConnection.java b/server/src/main/java/object/UserConnection.java
diff --git a/server/src/main/java/server/EntropyServer.java b/server/src/main/java/server/EntropyServer.java
@@ -1,5 +1,6 @@
 package server;
 
+import auth.UserConnection;
 import logging.LoggerUncaughtExceptionHandler;
 import object.*;
 import org.w3c.dom.Document;

diff --git a/server/src/main/java/server/InactiveCheckRunnable.java b/server/src/main/java/server/InactiveCheckRunnable.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
+import auth.UserConnection;
 import object.ServerRunnable;
-import object.UserConnection;
 import util.Debug;
 
 import static utils.InjectedThings.logger;

diff --git a/server/src/main/java/server/ListenerRunnable.java b/server/src/main/java/server/ListenerRunnable.java
@@ -1,7 +1,7 @@
 package server;
 
+import auth.UserConnection;
 import object.ServerRunnable;
-import object.UserConnection;
 import util.Debug;
 
 import java.net.ServerSocket;

diff --git a/server/src/main/java/server/MessageHandlerRunnable.java b/server/src/main/java/server/MessageHandlerRunnable.java
@@ -12,10 +12,10 @@
 
 import javax.crypto.SecretKey;
 
+import auth.UserConnection;
 import object.NotificationSocket;
 import object.Room;
 import object.ServerRunnable;
-import object.UserConnection;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/server/src/main/java/server/NotificationRunnable.java b/server/src/main/java/server/NotificationRunnable.java
@@ -5,9 +5,9 @@
 import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import auth.UserConnection;
 import object.NotificationSocket;
 import object.ServerRunnable;
-import object.UserConnection;
 
 import org.w3c.dom.Document;
 

diff --git a/server/src/main/java/util/EntropyThreadPoolExecutor.java b/server/src/main/java/util/EntropyThreadPoolExecutor.java
@@ -54,9 +54,9 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
+import auth.UserConnection;
 import object.ServerRunnable;
 import object.ServerThread;
-import object.UserConnection;
 import utils.InjectedThings;
 
 /**