refactor!: move mocking to separate folder

sprestrelski · Dec 5, 2023 · d37c849 · d37c849
1 parent 9329890
commit d37c849
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 51 deletions.
diff --git a/app/src/main/java/code/App.java b/app/src/main/java/code/App.java
@@ -8,10 +8,10 @@
 import code.client.View.*;
 import code.server.BaseServer;
 import code.server.AppServer;
-import code.server.MockServer;
 import code.client.Controllers.*;
 import javafx.scene.Scene;
 import code.server.IRecipeDb;
+import code.server.mocking.MockServer;
 
 import java.io.FileReader;
 import java.io.IOException;

diff --git a/app/src/main/java/code/server/ShareLinkMongoDb.java b/app/src/main/java/code/server/ShareLinkMongoDb.java
diff --git a/...ode/server/MockChatGPTRequestHandler.java → ...er/mocking/MockChatGPTRequestHandler.java b/...ode/server/MockChatGPTRequestHandler.java → ...er/mocking/MockChatGPTRequestHandler.java
@@ -1,9 +1,11 @@
-package code.server;
+package code.server.mocking;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import com.sun.net.httpserver.*;
 
+import code.server.TextToRecipe;
+
 public class MockChatGPTRequestHandler extends TextToRecipe implements HttpHandler {
 
     private String sampleRecipe = """

diff --git a/.../code/server/MockDallERequestHandler.java → ...rver/mocking/MockDallERequestHandler.java b/.../code/server/MockDallERequestHandler.java → ...rver/mocking/MockDallERequestHandler.java
@@ -1,6 +1,8 @@
-package code.server;
+package code.server.mocking;
 
 import code.client.Model.AppConfig;
+import code.server.RecipeToImage;
+
 import com.sun.net.httpserver.*;
 
 import java.io.*;

diff --git a/.../java/code/server/MockHttpConnection.java → ...de/server/mocking/MockHttpConnection.java b/.../java/code/server/MockHttpConnection.java → ...de/server/mocking/MockHttpConnection.java
@@ -1,9 +1,11 @@
-package code.server;
+package code.server.mocking;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import code.server.IHttpConnection;
+
 public class MockHttpConnection implements IHttpConnection {
     private int responseCode;
     private InputStream inputStream;

diff --git a/...src/main/java/code/server/MockServer.java → .../java/code/server/mocking/MockServer.java b/...src/main/java/code/server/MockServer.java → .../java/code/server/mocking/MockServer.java
@@ -1,4 +1,4 @@
-package code.server;
+package code.server.mocking;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -7,6 +7,13 @@
 import com.sun.net.httpserver.*;
 
 import code.client.Model.AppConfig;
+import code.server.AccountMongoDB;
+import code.server.AccountRequestHandler;
+import code.server.BaseServer;
+import code.server.IRecipeDb;
+import code.server.RecipeMongoDb;
+import code.server.RecipeRequestHandler;
+import code.server.ShareRequestHandler;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...ode/server/MockWhisperRequestHandler.java → ...er/mocking/MockWhisperRequestHandler.java b/...ode/server/MockWhisperRequestHandler.java → ...er/mocking/MockWhisperRequestHandler.java
@@ -1,6 +1,10 @@
-package code.server;
+package code.server.mocking;
 
 import com.sun.net.httpserver.*;
+
+import code.server.IHttpConnection;
+import code.server.VoiceToText;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;

diff --git a/app/src/test/java/code/RecipeToImageTest.java b/app/src/test/java/code/RecipeToImageTest.java
@@ -3,8 +3,8 @@
 import org.junit.jupiter.api.Test;
 
 import code.server.BaseServer;
-import code.server.MockServer;
 import code.server.Recipe;
+import code.server.mocking.MockServer;
 import code.client.Model.AppConfig;
 import code.client.Model.Model;
 

diff --git a/app/src/test/java/code/RefreshTest.java b/app/src/test/java/code/RefreshTest.java
@@ -14,6 +14,7 @@
 import code.client.View.*;
 import code.client.Controllers.*;
 import code.server.*;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;

diff --git a/app/src/test/java/code/ServerConnectionTest.java b/app/src/test/java/code/ServerConnectionTest.java
@@ -7,7 +7,7 @@
 import code.client.Model.AppConfig;
 import code.client.View.ServerConnection;
 import code.server.BaseServer;
-import code.server.MockServer;
+import code.server.mocking.MockServer;
 
 import java.io.IOException;
 import java.io.PrintStream;

diff --git a/app/src/test/java/code/TextToRecipeTest.java b/app/src/test/java/code/TextToRecipeTest.java
@@ -6,6 +6,7 @@
 import code.client.Model.AppConfig;
 import code.client.Model.Model;
 import code.server.*;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;

diff --git a/app/src/test/java/code/VoiceToTextTest.java b/app/src/test/java/code/VoiceToTextTest.java
@@ -9,8 +9,8 @@
 import code.client.Model.Model;
 import code.server.BaseServer;
 import code.server.IHttpConnection;
-import code.server.MockHttpConnection;
-import code.server.MockServer;
+import code.server.mocking.MockHttpConnection;
+import code.server.mocking.MockServer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;