diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..2bb7860 --- /dev/null +++ b/.classpath @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 3d9adc4..aa9bcff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /.gradle +/bin /.settings /build -/gradle .project gradlew gradlew.bat diff --git a/build.gradle b/build.gradle index 1c086c6..364c23e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,9 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This is a general purpose Gradle build. - * Learn how to create Gradle builds at https://guides.gradle.org/creating-new-gradle-builds/ - */ +plugins { + id 'java' +} -apply plugin: 'java' +group = 'com.omarnyte' +version = '1.1.2' repositories { mavenCentral() @@ -26,21 +24,23 @@ def defaultPort = 8888 def demoDirectoryPath = System.getProperty("user.dir") + '/src/test/resources/demoFiles' def testDirectoryPath = System.getProperty("user.dir") + '/src/test/resources/testFiles' +def mainClasspath = "com/omarnyte/Main" + task startCorsServer(type: JavaExec) { classpath sourceSets.main.runtimeClasspath - main = "Main" + main = mainClasspath args "-port", corsPort, "-dir", corsDirectoryPath } task startDemoServer(type: JavaExec) { classpath sourceSets.main.runtimeClasspath - main = "Main" + main = mainClasspath args "-port", defaultPort, "-dir", demoDirectoryPath } task startTestServer(type: JavaExec) { classpath sourceSets.main.runtimeClasspath - main = "Main" + main = mainClasspath args "-port", defaultPort, "-dir", testDirectoryPath } @@ -68,6 +68,6 @@ test { jar { manifest { - attributes 'Main-Class': 'Main' + attributes 'Main-Class': 'com.omarnyte.Main' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..758de96 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2d80b69 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/main/java/Handler/Handler.java b/src/main/java/Handler/Handler.java deleted file mode 100644 index 4b95bcb..0000000 --- a/src/main/java/Handler/Handler.java +++ /dev/null @@ -1,5 +0,0 @@ -public interface Handler { - - public Response generateResponse(Request request); - -} \ No newline at end of file diff --git a/src/main/java/CLIParser.java b/src/main/java/com/omarnyte/CliParser.java similarity index 85% rename from src/main/java/CLIParser.java rename to src/main/java/com/omarnyte/CliParser.java index 1969d38..c1b2a32 100644 --- a/src/main/java/CLIParser.java +++ b/src/main/java/com/omarnyte/CliParser.java @@ -1,10 +1,14 @@ +package com.omarnyte; + import java.util.Arrays; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; -public class CLIParser { +import com.omarnyte.exception.MissingFlagException; +import com.omarnyte.exception.UnsupportedFlagException; + +public class CliParser { private static final String DIRECTORY_FLAG = "-dir"; private static final String PORT_FLAG = "-port"; private static final List VALID_STORE_FLAGS = Arrays.asList( DIRECTORY_FLAG ); @@ -13,7 +17,7 @@ public class CLIParser { private String[] args; private HashMap flagsMap; - public CLIParser(String[] args) throws UnsupportedFlagException { + public CliParser(String[] args) throws UnsupportedFlagException { this.args = args; this.flagsMap = createFlagsMap(); } @@ -39,11 +43,11 @@ public String getDirectory() { } public String printValidFlags() { - return String.join(", ", this.VALID_FLAGS); + return String.join(", ", VALID_FLAGS); } public String printValidStoreFlags() { - return String.join(", ", this.VALID_STORE_FLAGS); + return String.join(", ", VALID_STORE_FLAGS); } private HashMap createFlagsMap() throws UnsupportedFlagException { diff --git a/src/main/java/ClientThread.java b/src/main/java/com/omarnyte/ClientThread.java similarity index 84% rename from src/main/java/ClientThread.java rename to src/main/java/com/omarnyte/ClientThread.java index 7d59b36..659d765 100644 --- a/src/main/java/ClientThread.java +++ b/src/main/java/com/omarnyte/ClientThread.java @@ -1,9 +1,18 @@ +package com.omarnyte; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.IOException; import java.io.OutputStream; import java.net.Socket; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.request.Request; +import com.omarnyte.request.RequestParser; +import com.omarnyte.response.Response; +import com.omarnyte.response.ResponseFormatter; + public class ClientThread implements Runnable { private Socket clientSocket; private BufferedReader in; diff --git a/src/main/java/CorsMiddleware.java b/src/main/java/com/omarnyte/CorsMiddleware.java similarity index 87% rename from src/main/java/CorsMiddleware.java rename to src/main/java/com/omarnyte/CorsMiddleware.java index ca8fcf4..541ba62 100644 --- a/src/main/java/CorsMiddleware.java +++ b/src/main/java/com/omarnyte/CorsMiddleware.java @@ -1,5 +1,11 @@ +package com.omarnyte; + import java.util.HashMap; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.response.Response; + public class CorsMiddleware extends Middleware { public Response applyMiddleware(Response originalResponse) { diff --git a/src/main/java/Directory.java b/src/main/java/com/omarnyte/Directory.java similarity index 97% rename from src/main/java/Directory.java rename to src/main/java/com/omarnyte/Directory.java index 1a114fe..a6eab9f 100644 --- a/src/main/java/Directory.java +++ b/src/main/java/com/omarnyte/Directory.java @@ -1,17 +1,20 @@ -import java.io.BufferedReader; +package com.omarnyte; + import java.io.File; import java.io.FileWriter; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.util.Map; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.Files; +import com.omarnyte.exception.NonexistentDirectoryException; + public class Directory { private static final String DEFAULT_FILE_TYPE = "application/octet-stream"; private static final Map MIME_TYPES = Map.ofEntries( + Map.entry("css", "text/css"), Map.entry("gif", "image/gif"), Map.entry("html", "text/html"), Map.entry("jpg", "image/jpeg"), @@ -130,5 +133,4 @@ private String getExtension(String filePath) { return filePath.split("\\.")[1]; } - } diff --git a/src/main/java/Main.java b/src/main/java/com/omarnyte/Main.java similarity index 86% rename from src/main/java/Main.java rename to src/main/java/com/omarnyte/Main.java index e4f0c3c..80d1478 100644 --- a/src/main/java/Main.java +++ b/src/main/java/com/omarnyte/Main.java @@ -1,14 +1,25 @@ +package com.omarnyte; + import java.util.HashMap; - + +import com.omarnyte.CliParser; +import com.omarnyte.exception.*; +import com.omarnyte.handler.*; +import com.omarnyte.handler.NotFoundHandler; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.middleware.MiddlewareConfig; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.UrlDecoder; + public class Main { private final static int DEFAULT_PORT_NUMBER = 8888; private final static String AUTH_ROUTE = "/api/authenticate"; - private static CLIParser parser; + private static CliParser parser; private static Directory directory; public static void main(String[] args) { try { - parser = new CLIParser(args); + parser = new CliParser(args); directory = extractDirectory(); Handler defaultHandler = new NotFoundHandler(directory); @@ -57,7 +68,6 @@ private static Router setUpRouter(Handler defaultHandler) { private static HashMap createRoutesMap() { HashMap routes = new HashMap(); - String rootPath = System.getProperty("user.dir"); routes.put("/*", new ServerHandler(HttpMethod.SUPPORTED_METHODS)); routes.put("/", new DirectoryHandler(directory)); routes.put("/echo", new EchoHandler()); diff --git a/src/main/java/Router.java b/src/main/java/com/omarnyte/Router.java similarity index 75% rename from src/main/java/Router.java rename to src/main/java/com/omarnyte/Router.java index 9cba0a6..63546f5 100644 --- a/src/main/java/Router.java +++ b/src/main/java/com/omarnyte/Router.java @@ -1,5 +1,16 @@ +package com.omarnyte; + import java.util.HashMap; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.handler.DirectoryHandler; +import com.omarnyte.handler.FileHandler; +import com.omarnyte.handler.Handler; +import com.omarnyte.handler.PatchHandler; +import com.omarnyte.jsonpatch.JsonPatchParser; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + public class Router { private Handler defaultHandler; private HashMap routes; diff --git a/src/main/java/Server.java b/src/main/java/com/omarnyte/Server.java similarity index 95% rename from src/main/java/Server.java rename to src/main/java/com/omarnyte/Server.java index f3cc9f3..18f61c8 100644 --- a/src/main/java/Server.java +++ b/src/main/java/com/omarnyte/Server.java @@ -1,3 +1,5 @@ +package com.omarnyte; + import java.io.IOException; import java.net.BindException; import java.net.ServerSocket; @@ -5,6 +7,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.ExecutorService; +import com.omarnyte.middleware.Middleware; + public class Server { private Middleware middleware; private int port; diff --git a/src/main/java/Authentication/Authenticator.java b/src/main/java/com/omarnyte/authentication/Authenticator.java similarity index 93% rename from src/main/java/Authentication/Authenticator.java rename to src/main/java/com/omarnyte/authentication/Authenticator.java index 374f6e4..2cad355 100644 --- a/src/main/java/Authentication/Authenticator.java +++ b/src/main/java/com/omarnyte/authentication/Authenticator.java @@ -1,8 +1,12 @@ +package com.omarnyte.authentication; + import java.util.Base64; -import java.util.Base64.Decoder; -import java.util.HashMap; import java.util.List; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.request.Request; + public class Authenticator extends Middleware { private String authRoute; private Credentials credentials; diff --git a/src/main/java/Authentication/Credentials.java b/src/main/java/com/omarnyte/authentication/Credentials.java similarity index 90% rename from src/main/java/Authentication/Credentials.java rename to src/main/java/com/omarnyte/authentication/Credentials.java index daa2f69..6936dda 100644 --- a/src/main/java/Authentication/Credentials.java +++ b/src/main/java/com/omarnyte/authentication/Credentials.java @@ -1,3 +1,5 @@ +package com.omarnyte.authentication; + public class Credentials { private String password; private String username; diff --git a/src/main/java/Exception/BadRequestException.java b/src/main/java/com/omarnyte/exception/BadRequestException.java similarity index 79% rename from src/main/java/Exception/BadRequestException.java rename to src/main/java/com/omarnyte/exception/BadRequestException.java index f03680b..963f2b5 100644 --- a/src/main/java/Exception/BadRequestException.java +++ b/src/main/java/com/omarnyte/exception/BadRequestException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class BadRequestException extends Exception { public BadRequestException(String message) { diff --git a/src/main/java/Exception/LoggerException.java b/src/main/java/com/omarnyte/exception/LoggerException.java similarity index 78% rename from src/main/java/Exception/LoggerException.java rename to src/main/java/com/omarnyte/exception/LoggerException.java index b4e70b8..d2c99b3 100644 --- a/src/main/java/Exception/LoggerException.java +++ b/src/main/java/com/omarnyte/exception/LoggerException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class LoggerException extends Exception { public LoggerException(String message) { diff --git a/src/main/java/Exception/MissingFlagException.java b/src/main/java/com/omarnyte/exception/MissingFlagException.java similarity index 84% rename from src/main/java/Exception/MissingFlagException.java rename to src/main/java/com/omarnyte/exception/MissingFlagException.java index d969c27..20faace 100644 --- a/src/main/java/Exception/MissingFlagException.java +++ b/src/main/java/com/omarnyte/exception/MissingFlagException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class MissingFlagException extends Exception { public MissingFlagException (String flagType) { diff --git a/src/main/java/Exception/NonexistentDirectoryException.java b/src/main/java/com/omarnyte/exception/NonexistentDirectoryException.java similarity index 85% rename from src/main/java/Exception/NonexistentDirectoryException.java rename to src/main/java/com/omarnyte/exception/NonexistentDirectoryException.java index bfe0901..416dbe1 100644 --- a/src/main/java/Exception/NonexistentDirectoryException.java +++ b/src/main/java/com/omarnyte/exception/NonexistentDirectoryException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class NonexistentDirectoryException extends Exception { public NonexistentDirectoryException(String directory) { diff --git a/src/main/java/Exception/UnprocessableEntityException.java b/src/main/java/com/omarnyte/exception/UnprocessableEntityException.java similarity index 81% rename from src/main/java/Exception/UnprocessableEntityException.java rename to src/main/java/com/omarnyte/exception/UnprocessableEntityException.java index 4eb944a..1de0b54 100644 --- a/src/main/java/Exception/UnprocessableEntityException.java +++ b/src/main/java/com/omarnyte/exception/UnprocessableEntityException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class UnprocessableEntityException extends Exception { public UnprocessableEntityException (String message) { diff --git a/src/main/java/Exception/UnsupportedFlagException.java b/src/main/java/com/omarnyte/exception/UnsupportedFlagException.java similarity index 84% rename from src/main/java/Exception/UnsupportedFlagException.java rename to src/main/java/com/omarnyte/exception/UnsupportedFlagException.java index 2d568c2..2cd3d67 100644 --- a/src/main/java/Exception/UnsupportedFlagException.java +++ b/src/main/java/com/omarnyte/exception/UnsupportedFlagException.java @@ -1,3 +1,5 @@ +package com.omarnyte.exception; + public class UnsupportedFlagException extends Exception { public UnsupportedFlagException (String flag) { diff --git a/src/main/java/Handler/AuthHandler.java b/src/main/java/com/omarnyte/handler/AuthHandler.java similarity index 63% rename from src/main/java/Handler/AuthHandler.java rename to src/main/java/com/omarnyte/handler/AuthHandler.java index 6371563..22066e5 100644 --- a/src/main/java/Handler/AuthHandler.java +++ b/src/main/java/com/omarnyte/handler/AuthHandler.java @@ -1,3 +1,10 @@ +package com.omarnyte.handler; + +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class AuthHandler implements Handler { private final static String AUTH_SCHEME = "Basic"; diff --git a/src/main/java/Handler/DirectoryHandler.java b/src/main/java/com/omarnyte/handler/DirectoryHandler.java similarity index 87% rename from src/main/java/Handler/DirectoryHandler.java rename to src/main/java/com/omarnyte/handler/DirectoryHandler.java index bd653fe..47269b5 100644 --- a/src/main/java/Handler/DirectoryHandler.java +++ b/src/main/java/com/omarnyte/handler/DirectoryHandler.java @@ -1,8 +1,16 @@ -import java.io.File; -import java.io.UnsupportedEncodingException; +package com.omarnyte.handler; + import java.util.Arrays; import java.util.List; +import com.omarnyte.Directory; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; + public class DirectoryHandler implements Handler { private static final List SUPPORTED_METHODS = Arrays.asList( HttpMethod.GET, diff --git a/src/main/java/Handler/EchoHandler.java b/src/main/java/com/omarnyte/handler/EchoHandler.java similarity index 83% rename from src/main/java/Handler/EchoHandler.java rename to src/main/java/com/omarnyte/handler/EchoHandler.java index 5317f7c..d3a48db 100644 --- a/src/main/java/Handler/EchoHandler.java +++ b/src/main/java/com/omarnyte/handler/EchoHandler.java @@ -1,16 +1,20 @@ -import java.io.UnsupportedEncodingException; +package com.omarnyte.handler; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class EchoHandler implements Handler { - private static final String timeFormat = "hh:mm:ss"; + private static final String TIME_FORMAT = "hh:mm:ss"; public Response generateResponse(Request request) { String method = request.getMethod(); - String statusCodeAndReasonPhrase; - String messageBody = ""; switch (method) { case "HEAD": return buildHeadResponse(); @@ -46,7 +50,7 @@ private String createMessageBody() { } private String getFormattedTime() { - DateFormat dateFormat = new SimpleDateFormat(this.timeFormat); + DateFormat dateFormat = new SimpleDateFormat(TIME_FORMAT); return dateFormat.format(new Date()); } diff --git a/src/main/java/Handler/FileHandler.java b/src/main/java/com/omarnyte/handler/FileHandler.java similarity index 91% rename from src/main/java/Handler/FileHandler.java rename to src/main/java/com/omarnyte/handler/FileHandler.java index e3e9a12..8b64bd9 100644 --- a/src/main/java/Handler/FileHandler.java +++ b/src/main/java/com/omarnyte/handler/FileHandler.java @@ -1,8 +1,19 @@ +package com.omarnyte.handler; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.omarnyte.Directory; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; + public class FileHandler implements Handler { private static final List SUPPORTED_METHODS = Arrays.asList( HttpMethod.DELETE, diff --git a/src/main/java/Handler/FormHandler.java b/src/main/java/com/omarnyte/handler/FormHandler.java similarity index 88% rename from src/main/java/Handler/FormHandler.java rename to src/main/java/com/omarnyte/handler/FormHandler.java index 351678d..ac90907 100644 --- a/src/main/java/Handler/FormHandler.java +++ b/src/main/java/com/omarnyte/handler/FormHandler.java @@ -1,9 +1,19 @@ -import java.io.File; +package com.omarnyte.handler; + import java.util.HashMap; import java.util.Arrays; import java.util.List; import java.util.Map; - + +import com.omarnyte.Directory; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; +import com.omarnyte.util.Util; + public class FormHandler implements Handler { private final static String DESTINATION_DIRECTORY_URI = "/POSTed"; private final static String POSTED_FILE_EXTENSION = ".txt"; diff --git a/src/main/java/com/omarnyte/handler/Handler.java b/src/main/java/com/omarnyte/handler/Handler.java new file mode 100644 index 0000000..93166a8 --- /dev/null +++ b/src/main/java/com/omarnyte/handler/Handler.java @@ -0,0 +1,10 @@ +package com.omarnyte.handler; + +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + +public interface Handler { + + public Response generateResponse(Request request); + +} \ No newline at end of file diff --git a/src/main/java/Handler/NotFoundHandler.java b/src/main/java/com/omarnyte/handler/NotFoundHandler.java similarity index 88% rename from src/main/java/Handler/NotFoundHandler.java rename to src/main/java/com/omarnyte/handler/NotFoundHandler.java index 4cc2805..d38ac90 100644 --- a/src/main/java/Handler/NotFoundHandler.java +++ b/src/main/java/com/omarnyte/handler/NotFoundHandler.java @@ -1,11 +1,16 @@ -import java.io.File; -import java.io.IOException; +package com.omarnyte.handler; + import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Random; - + +import com.omarnyte.Directory; +import com.omarnyte.http.MimeType; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; + public class NotFoundHandler implements Handler { private Directory directory; diff --git a/src/main/java/Handler/PatchHandler.java b/src/main/java/com/omarnyte/handler/PatchHandler.java similarity index 83% rename from src/main/java/Handler/PatchHandler.java rename to src/main/java/com/omarnyte/handler/PatchHandler.java index d09c9e8..b6b303f 100644 --- a/src/main/java/Handler/PatchHandler.java +++ b/src/main/java/com/omarnyte/handler/PatchHandler.java @@ -1,5 +1,18 @@ +package com.omarnyte.handler; + import java.util.ArrayList; +import com.omarnyte.Directory; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.jsonpatch.JsonPatchOperation; +import com.omarnyte.jsonpatch.JsonPatchParser; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class PatchHandler implements Handler { private Directory directory; private JsonPatchParser jsonPatchParser; diff --git a/src/main/java/Handler/PeopleHandler.java b/src/main/java/com/omarnyte/handler/PeopleHandler.java similarity index 85% rename from src/main/java/Handler/PeopleHandler.java rename to src/main/java/com/omarnyte/handler/PeopleHandler.java index eb91952..bca56e5 100644 --- a/src/main/java/Handler/PeopleHandler.java +++ b/src/main/java/com/omarnyte/handler/PeopleHandler.java @@ -1,7 +1,18 @@ +package com.omarnyte.handler; + import java.util.Arrays; -import java.util.HashMap; import java.util.List; +import com.omarnyte.Directory; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; +import com.omarnyte.util.Util; + public class PeopleHandler implements Handler { private final static String DESTINATION_DIRECTORY_URI = "/people"; private final static String[] SUPPORTED_MEDIA_TYPES = { diff --git a/src/main/java/Handler/QueryHandler.java b/src/main/java/com/omarnyte/handler/QueryHandler.java similarity index 88% rename from src/main/java/Handler/QueryHandler.java rename to src/main/java/com/omarnyte/handler/QueryHandler.java index a09b7ba..05e0168 100644 --- a/src/main/java/Handler/QueryHandler.java +++ b/src/main/java/com/omarnyte/handler/QueryHandler.java @@ -1,7 +1,18 @@ +package com.omarnyte.handler; + import java.util.Arrays; import java.util.HashMap; import java.util.List; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.request.UrlDecoder; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; + public class QueryHandler implements Handler { private static final List SUPPORTED_METHODS = Arrays.asList( HttpMethod.GET, diff --git a/src/main/java/Handler/ServerHandler.java b/src/main/java/com/omarnyte/handler/ServerHandler.java similarity index 73% rename from src/main/java/Handler/ServerHandler.java rename to src/main/java/com/omarnyte/handler/ServerHandler.java index 0f1041a..a45d22b 100644 --- a/src/main/java/Handler/ServerHandler.java +++ b/src/main/java/com/omarnyte/handler/ServerHandler.java @@ -1,5 +1,12 @@ +package com.omarnyte.handler; + import java.util.List; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; +import com.omarnyte.util.ResponseUtil; + public class ServerHandler implements Handler { private List supportedMethods; diff --git a/src/main/java/MessageHeader.java b/src/main/java/com/omarnyte/http/MessageHeader.java similarity index 97% rename from src/main/java/MessageHeader.java rename to src/main/java/com/omarnyte/http/MessageHeader.java index a2ce34a..8895dfe 100644 --- a/src/main/java/MessageHeader.java +++ b/src/main/java/com/omarnyte/http/MessageHeader.java @@ -1,3 +1,5 @@ +package com.omarnyte.http; + import java.io.UnsupportedEncodingException; public class MessageHeader { diff --git a/src/main/java/MimeType.java b/src/main/java/com/omarnyte/http/MimeType.java similarity index 94% rename from src/main/java/MimeType.java rename to src/main/java/com/omarnyte/http/MimeType.java index d172086..6972a16 100644 --- a/src/main/java/MimeType.java +++ b/src/main/java/com/omarnyte/http/MimeType.java @@ -1,3 +1,5 @@ +package com.omarnyte.http; + import java.util.Map; public class MimeType { diff --git a/src/main/java/JsonPatch/JsonPatchAdd.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchAdd.java similarity index 79% rename from src/main/java/JsonPatch/JsonPatchAdd.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchAdd.java index ead9c0d..80eb729 100644 --- a/src/main/java/JsonPatch/JsonPatchAdd.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchAdd.java @@ -1,6 +1,10 @@ -import java.util.Arrays; +package com.omarnyte.jsonpatch; + import org.json.JSONObject; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchAdd extends JsonPatchOperation { private String value; diff --git a/src/main/java/JsonPatch/JsonPatchCopy.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchCopy.java similarity index 86% rename from src/main/java/JsonPatch/JsonPatchCopy.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchCopy.java index 1fa9a35..65345a0 100644 --- a/src/main/java/JsonPatch/JsonPatchCopy.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchCopy.java @@ -1,6 +1,10 @@ -import java.util.Arrays; +package com.omarnyte.jsonpatch; + import org.json.JSONObject; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchCopy extends JsonPatchOperation { private String from; diff --git a/src/main/java/JsonPatch/JsonPatchMove.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchMove.java similarity index 86% rename from src/main/java/JsonPatch/JsonPatchMove.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchMove.java index 4cf0e92..f33e35e 100644 --- a/src/main/java/JsonPatch/JsonPatchMove.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchMove.java @@ -1,6 +1,10 @@ -import java.util.Arrays; +package com.omarnyte.jsonpatch; + import org.json.JSONObject; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchMove extends JsonPatchOperation { String from; diff --git a/src/main/java/JsonPatch/JsonPatchOperation.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchOperation.java similarity index 90% rename from src/main/java/JsonPatch/JsonPatchOperation.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchOperation.java index bf3fa34..de4356b 100644 --- a/src/main/java/JsonPatch/JsonPatchOperation.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchOperation.java @@ -1,6 +1,10 @@ +package com.omarnyte.jsonpatch; + import org.json.JSONObject; import java.util.Arrays; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; public abstract class JsonPatchOperation { protected String op; @@ -11,7 +15,7 @@ public JsonPatchOperation(String op, String path) { this.path = path; } - abstract String applyOperation(String original) throws BadRequestException, UnprocessableEntityException; + public abstract String applyOperation(String original) throws BadRequestException, UnprocessableEntityException; protected String[] extractKeys(String path) throws BadRequestException { String leadingSlash = "/"; diff --git a/src/main/java/JsonPatch/JsonPatchParser.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchParser.java similarity index 94% rename from src/main/java/JsonPatch/JsonPatchParser.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchParser.java index ebff124..d90df73 100644 --- a/src/main/java/JsonPatch/JsonPatchParser.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchParser.java @@ -1,15 +1,19 @@ +package com.omarnyte.jsonpatch; + import java.util.ArrayList; import java.util.Iterator; import org.json.JSONObject; import org.json.JSONArray; import org.json.JSONException; +import com.omarnyte.exception.BadRequestException; + public class JsonPatchParser { public ArrayList getOperations(String body) throws BadRequestException { try { ArrayList operations = new ArrayList(); - Iterator iterator = new JSONArray(body).iterator(); + Iterator iterator = new JSONArray(body).iterator(); while (iterator.hasNext()) { JSONObject jsonPatchObject = (JSONObject)iterator.next(); JsonPatchOperation operation = createPatchFromJsonObject(jsonPatchObject); diff --git a/src/main/java/JsonPatch/JsonPatchRemove.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchRemove.java similarity index 77% rename from src/main/java/JsonPatch/JsonPatchRemove.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchRemove.java index 37c0835..9da034b 100644 --- a/src/main/java/JsonPatch/JsonPatchRemove.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchRemove.java @@ -1,6 +1,10 @@ -import java.util.Arrays; +package com.omarnyte.jsonpatch; + import org.json.JSONObject; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchRemove extends JsonPatchOperation { public JsonPatchRemove(String op, String path) { diff --git a/src/main/java/JsonPatch/JsonPatchReplace.java b/src/main/java/com/omarnyte/jsonpatch/JsonPatchReplace.java similarity index 90% rename from src/main/java/JsonPatch/JsonPatchReplace.java rename to src/main/java/com/omarnyte/jsonpatch/JsonPatchReplace.java index 610f424..298ba47 100644 --- a/src/main/java/JsonPatch/JsonPatchReplace.java +++ b/src/main/java/com/omarnyte/jsonpatch/JsonPatchReplace.java @@ -1,6 +1,11 @@ +package com.omarnyte.jsonpatch; + import java.util.Arrays; import org.json.JSONObject; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchReplace extends JsonPatchOperation { private String value; diff --git a/src/main/java/Logger/LogFormatter.java b/src/main/java/com/omarnyte/logger/LogFormatter.java similarity index 92% rename from src/main/java/Logger/LogFormatter.java rename to src/main/java/com/omarnyte/logger/LogFormatter.java index 61c36a2..3adf484 100644 --- a/src/main/java/Logger/LogFormatter.java +++ b/src/main/java/com/omarnyte/logger/LogFormatter.java @@ -1,6 +1,11 @@ +package com.omarnyte.logger; + import java.util.HashMap; import java.util.Map; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + public class LogFormatter { public String formatRequest(Request request) { diff --git a/src/main/java/Logger/Logger.java b/src/main/java/com/omarnyte/logger/Logger.java similarity index 87% rename from src/main/java/Logger/Logger.java rename to src/main/java/com/omarnyte/logger/Logger.java index 6f7fd71..14cfc5b 100644 --- a/src/main/java/Logger/Logger.java +++ b/src/main/java/com/omarnyte/logger/Logger.java @@ -1,3 +1,5 @@ +package com.omarnyte.logger; + import java.io.File; import java.io.IOException; import java.io.FileWriter; @@ -6,17 +8,16 @@ import java.text.SimpleDateFormat; import java.util.Date; +import com.omarnyte.exception.LoggerException; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + public class Logger extends Middleware { private String dateTimePattern; private String logDirectoryPath; private File logFile; - - - - LogFormatter logFormatter = new LogFormatter(); - - - + private LogFormatter logFormatter = new LogFormatter(); public Logger(String logDirectoryPath, String dateTimePattern) throws LoggerException { this.logDirectoryPath = logDirectoryPath; diff --git a/src/main/java/Middleware/Middleware.java b/src/main/java/com/omarnyte/middleware/Middleware.java similarity index 85% rename from src/main/java/Middleware/Middleware.java rename to src/main/java/com/omarnyte/middleware/Middleware.java index b89c660..647573a 100644 --- a/src/main/java/Middleware/Middleware.java +++ b/src/main/java/com/omarnyte/middleware/Middleware.java @@ -1,3 +1,8 @@ +package com.omarnyte.middleware; + +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + public abstract class Middleware { private Middleware next; diff --git a/src/main/java/Middleware/MiddlewareConfig.java b/src/main/java/com/omarnyte/middleware/MiddlewareConfig.java similarity index 78% rename from src/main/java/Middleware/MiddlewareConfig.java rename to src/main/java/com/omarnyte/middleware/MiddlewareConfig.java index 52e815a..b3d84c4 100644 --- a/src/main/java/Middleware/MiddlewareConfig.java +++ b/src/main/java/com/omarnyte/middleware/MiddlewareConfig.java @@ -1,6 +1,15 @@ +package com.omarnyte.middleware; + import java.util.Arrays; import java.util.List; +import com.omarnyte.CorsMiddleware; +import com.omarnyte.authentication.Authenticator; +import com.omarnyte.authentication.Credentials; +import com.omarnyte.exception.LoggerException; +import com.omarnyte.logger.Logger; +import com.omarnyte.middleware.Middleware; + public class MiddlewareConfig { private final static String AUTH_ROUTE = "/api/authenticate"; private static final String LOG_DIRECTORY_PATH = System.getProperty("user.dir") + "/logs"; diff --git a/src/main/java/HttpMethod.java b/src/main/java/com/omarnyte/request/HttpMethod.java similarity index 94% rename from src/main/java/HttpMethod.java rename to src/main/java/com/omarnyte/request/HttpMethod.java index c63f13c..03d2e7b 100644 --- a/src/main/java/HttpMethod.java +++ b/src/main/java/com/omarnyte/request/HttpMethod.java @@ -1,3 +1,5 @@ +package com.omarnyte.request; + import java.util.Arrays; import java.util.List; diff --git a/src/main/java/Request/Request.java b/src/main/java/com/omarnyte/request/Request.java similarity index 98% rename from src/main/java/Request/Request.java rename to src/main/java/com/omarnyte/request/Request.java index 935375e..c8842c2 100644 --- a/src/main/java/Request/Request.java +++ b/src/main/java/com/omarnyte/request/Request.java @@ -1,3 +1,5 @@ +package com.omarnyte.request; + import java.util.HashMap; public class Request { diff --git a/src/main/java/Request/RequestLineParser.java b/src/main/java/com/omarnyte/request/RequestLineParser.java similarity index 94% rename from src/main/java/Request/RequestLineParser.java rename to src/main/java/com/omarnyte/request/RequestLineParser.java index d3c5eb5..0c912d6 100644 --- a/src/main/java/Request/RequestLineParser.java +++ b/src/main/java/com/omarnyte/request/RequestLineParser.java @@ -1,4 +1,6 @@ -import java.util.HashMap; +package com.omarnyte.request; + +import com.omarnyte.exception.BadRequestException; public class RequestLineParser { private static final String SP = " "; diff --git a/src/main/java/Request/RequestParser.java b/src/main/java/com/omarnyte/request/RequestParser.java similarity index 94% rename from src/main/java/Request/RequestParser.java rename to src/main/java/com/omarnyte/request/RequestParser.java index 4eaccdd..0e9f912 100644 --- a/src/main/java/Request/RequestParser.java +++ b/src/main/java/com/omarnyte/request/RequestParser.java @@ -1,7 +1,13 @@ +package com.omarnyte.request; + import java.io.BufferedReader; import java.io.IOException; import java.util.HashMap; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; + public class RequestParser { BufferedReader reader; diff --git a/src/main/java/Request/UrlDecoder.java b/src/main/java/com/omarnyte/request/UrlDecoder.java similarity index 97% rename from src/main/java/Request/UrlDecoder.java rename to src/main/java/com/omarnyte/request/UrlDecoder.java index 262c064..6151b4c 100644 --- a/src/main/java/Request/UrlDecoder.java +++ b/src/main/java/com/omarnyte/request/UrlDecoder.java @@ -1,3 +1,5 @@ +package com.omarnyte.request; + import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/Response/HttpStatusCode.java b/src/main/java/com/omarnyte/response/HttpStatusCode.java similarity index 97% rename from src/main/java/Response/HttpStatusCode.java rename to src/main/java/com/omarnyte/response/HttpStatusCode.java index 192d36e..686cc6b 100644 --- a/src/main/java/Response/HttpStatusCode.java +++ b/src/main/java/com/omarnyte/response/HttpStatusCode.java @@ -1,3 +1,5 @@ +package com.omarnyte.response; + import java.util.Map; public class HttpStatusCode { diff --git a/src/main/java/Response/Response.java b/src/main/java/com/omarnyte/response/Response.java similarity index 95% rename from src/main/java/Response/Response.java rename to src/main/java/com/omarnyte/response/Response.java index e1221a1..4df1c7f 100644 --- a/src/main/java/Response/Response.java +++ b/src/main/java/com/omarnyte/response/Response.java @@ -1,6 +1,9 @@ -import java.io.UnsupportedEncodingException; +package com.omarnyte.response; + import java.util.HashMap; +import com.omarnyte.response.HttpStatusCode; + public class Response { private byte[] messageBody; private String reasonPhrase; @@ -106,7 +109,7 @@ public String getHeader(String headerField) { return this.headers.get(headerField); } - public HashMap getHeaders() { + public HashMap getHeaders() { return this.headers; } diff --git a/src/main/java/Response/ResponseFormatter.java b/src/main/java/com/omarnyte/response/ResponseFormatter.java similarity index 95% rename from src/main/java/Response/ResponseFormatter.java rename to src/main/java/com/omarnyte/response/ResponseFormatter.java index a36ef0d..9c65fa9 100644 --- a/src/main/java/Response/ResponseFormatter.java +++ b/src/main/java/com/omarnyte/response/ResponseFormatter.java @@ -1,8 +1,12 @@ +package com.omarnyte.response; + import java.util.HashMap; import java.util.Map; import java.io.ByteArrayOutputStream; import java.io.IOException; +import com.omarnyte.response.Response; + public class ResponseFormatter { Response response; diff --git a/src/main/java/util/ResponseUtil.java b/src/main/java/com/omarnyte/util/ResponseUtil.java similarity index 81% rename from src/main/java/util/ResponseUtil.java rename to src/main/java/com/omarnyte/util/ResponseUtil.java index e4a88ba..822f005 100644 --- a/src/main/java/util/ResponseUtil.java +++ b/src/main/java/com/omarnyte/util/ResponseUtil.java @@ -1,5 +1,11 @@ +package com.omarnyte.util; + import java.util.List; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class ResponseUtil { public static Response buildMethodNotAllowedResponse(List supportedMethods) { diff --git a/src/main/java/util/Util.java b/src/main/java/com/omarnyte/util/Util.java similarity index 88% rename from src/main/java/util/Util.java rename to src/main/java/com/omarnyte/util/Util.java index 07085b7..e2fbd93 100644 --- a/src/main/java/util/Util.java +++ b/src/main/java/com/omarnyte/util/Util.java @@ -1,3 +1,5 @@ +package com.omarnyte.util; + import java.util.Random; public class Util { @@ -7,4 +9,4 @@ public static String createRandomFileName(String extension) { return Integer.toString(rand) + extension; } -} \ No newline at end of file +} diff --git a/src/test/java/CLIParserTest.java b/src/test/java/com/omarnyte/CLIParserTest.java similarity index 70% rename from src/test/java/CLIParserTest.java rename to src/test/java/com/omarnyte/CLIParserTest.java index 0d82ba8..bb696da 100644 --- a/src/test/java/CLIParserTest.java +++ b/src/test/java/com/omarnyte/CLIParserTest.java @@ -1,16 +1,19 @@ +package com.omarnyte; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.CliParser; +import com.omarnyte.exception.MissingFlagException; +import com.omarnyte.exception.UnsupportedFlagException; + public class CLIParserTest { private String[] argsWithDirectory = { "-dir", "some/path" }; private String[] argsWithPortAndDirectory = { "-port", "7777", "-dir", "some/path" }; - private String[] argsWithNoPortAndNoDirectory = { "-not-port", - "seven seven seven seven", - "not-dir", - "123/456/789" }; + private String[] emptyArgs = { }; @Rule @@ -18,21 +21,21 @@ public class CLIParserTest { @Test public void returnsDefaultPortNumberIfNoneIsProvided() throws UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithDirectory); + CliParser parser = new CliParser(this.argsWithDirectory); int defaultPortNumber = 9999; assertEquals(9999, parser.getPortNumberOrDefault(9999)); } @Test public void returnsPortNumberIfOneIsProvided() throws UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithPortAndDirectory); + CliParser parser = new CliParser(this.argsWithPortAndDirectory); int defaultPortNumber = 9999; assertEquals(7777, parser.getPortNumberOrDefault(9999)); } @Test public void throwsMissingFlagExceptionWhenNoStoreProvided() throws MissingFlagException, UnsupportedFlagException { - CLIParser parser = new CLIParser(this.emptyArgs); + CliParser parser = new CliParser(this.emptyArgs); thrown.expect(MissingFlagException.class); String storeFlag = parser.getStoreFlag(); @@ -40,25 +43,25 @@ public void throwsMissingFlagExceptionWhenNoStoreProvided() throws MissingFlagEx @Test public void returnsCorrectStoreFlag() throws MissingFlagException, UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithPortAndDirectory); + CliParser parser = new CliParser(this.argsWithPortAndDirectory); assertEquals("-dir", parser.getStoreFlag()); } @Test public void returnsDirectory() throws UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithPortAndDirectory); + CliParser parser = new CliParser(this.argsWithPortAndDirectory); assertEquals("some/path", parser.getDirectory()); } @Test public void printsValidFlags() throws UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithPortAndDirectory); + CliParser parser = new CliParser(this.argsWithPortAndDirectory); assertTrue(parser.printValidFlags().contains("-dir")); } @Test public void printsValidStoreFlags() throws UnsupportedFlagException { - CLIParser parser = new CLIParser(this.argsWithPortAndDirectory); + CliParser parser = new CliParser(this.argsWithPortAndDirectory); assertTrue(parser.printValidFlags().contains("-dir")); } diff --git a/src/test/java/ClientThreadTest.java b/src/test/java/com/omarnyte/ClientThreadTest.java similarity index 90% rename from src/test/java/ClientThreadTest.java rename to src/test/java/com/omarnyte/ClientThreadTest.java index 8c4aee4..b5b505b 100644 --- a/src/test/java/ClientThreadTest.java +++ b/src/test/java/com/omarnyte/ClientThreadTest.java @@ -1,8 +1,18 @@ +package com.omarnyte; + import static org.junit.Assert.assertEquals; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.Router; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.middleware.Middleware; +import com.omarnyte.mock.MockMiddleware; +import com.omarnyte.mock.MockRouter; +import com.omarnyte.mock.MockSocket; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class ClientThreadTest { private final static String EXPECTED_RESPONSE_BODY = "EXPECTED RESPONSE"; @@ -23,7 +33,6 @@ public void writesResponseUnalateredByMiddleware() throws NonexistentDirectoryEx clientThread.run(); String expectedResponse = "HTTP/1.1 200 OK\r\n\r\n" + EXPECTED_RESPONSE_BODY; - byte[] expectedResponseBytes = expectedResponse.getBytes(); String actualResponse = mockSocket.getWrittenBytes().toString(); assertEquals(expectedResponse, actualResponse); } @@ -36,7 +45,6 @@ public void writesResponseAlteredBySingleMiddleware() throws NonexistentDirector clientThread.run(); String expectedResponse = "HTTP/1.1 200 OK\r\n\r\n" + bodyAlteredByMiddlware; - byte[] expectedResponseBytes = expectedResponse.getBytes(); String actualResponse = mockSocket.getWrittenBytes().toString(); assertEquals(expectedResponse, actualResponse); } @@ -49,7 +57,6 @@ public void writesResponseAlteredByMultiMiddlewareChain() throws NonexistentDire clientThread.run(); String expectedResponse = "HTTP/1.1 200 OK\r\n\r\n" + expectedBody; - byte[] expectedResponseBytes = expectedResponse.getBytes(); String actualResponse = mockSocket.getWrittenBytes().toString(); assertEquals(expectedResponse, actualResponse); } diff --git a/src/test/java/CorsMiddlewareTest.java b/src/test/java/com/omarnyte/CorsMiddlewareTest.java similarity index 89% rename from src/test/java/CorsMiddlewareTest.java rename to src/test/java/com/omarnyte/CorsMiddlewareTest.java index 92021a0..ea4db67 100644 --- a/src/test/java/CorsMiddlewareTest.java +++ b/src/test/java/com/omarnyte/CorsMiddlewareTest.java @@ -1,7 +1,13 @@ +package com.omarnyte; + import java.util.HashMap; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class CorsMiddlewareTest { private final static String HEADER_FIELD = "a-header-field"; private final static String HEADER_VALUE = "a-header-value"; diff --git a/src/test/java/DirectoryTest.java b/src/test/java/com/omarnyte/DirectoryTest.java similarity index 93% rename from src/test/java/DirectoryTest.java rename to src/test/java/com/omarnyte/DirectoryTest.java index 7ddbf38..fc3d467 100644 --- a/src/test/java/DirectoryTest.java +++ b/src/test/java/com/omarnyte/DirectoryTest.java @@ -1,3 +1,5 @@ +package com.omarnyte; + import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -9,6 +11,11 @@ import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.testutil.TempDirectory; +import com.omarnyte.testutil.TestUtil; + public class DirectoryTest { private final static String EMPTY_TEXT_FILE_URI = "/empty-file.txt"; private final static String NONEXISTENT_FILE_URI = "/does-not-exist.txt"; @@ -26,7 +33,7 @@ public class DirectoryTest { @BeforeClass public static void setUp() throws IOException, NonexistentDirectoryException { TempDirectory temp = new TempDirectory(TEMP_DIRECTORY_PATH); - TempDirectory tempSubdirectory = new TempDirectory(TEMP_DIRECTORY_PATH + TEMP_SUBDIRECTORY_URI); + new TempDirectory(TEMP_DIRECTORY_PATH + TEMP_SUBDIRECTORY_URI); temp.createEmptyFile(EMPTY_TEXT_FILE_URI); temp.createEmptyFile(TO_BE_DELETED_URI); temp.createFileWithContent(TEXT_FILE_URI, TEXT_FILE_CONTENT); @@ -41,7 +48,7 @@ public static void setUp() throws IOException, NonexistentDirectoryException { @Test public void throwsNonexistentDirectoryExceptionWithInvalidPath() throws NonexistentDirectoryException { thrown.expect(NonexistentDirectoryException.class); - Directory directory = new Directory(NONEXISTENT_FILE_URI); + new Directory(NONEXISTENT_FILE_URI); } @Test diff --git a/src/test/java/MessageHeaderTest.java b/src/test/java/com/omarnyte/MessageHeaderTest.java similarity index 83% rename from src/test/java/MessageHeaderTest.java rename to src/test/java/com/omarnyte/MessageHeaderTest.java index 81b4b19..8d1c638 100644 --- a/src/test/java/MessageHeaderTest.java +++ b/src/test/java/com/omarnyte/MessageHeaderTest.java @@ -1,6 +1,10 @@ +package com.omarnyte; + import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.omarnyte.http.MessageHeader; + public class MessageHeaderTest { @Test @@ -11,4 +15,4 @@ public void returnsTheCorrectContentLengthForText() { assertEquals(expectedLength, MessageHeader.determineContentLength(sampleText)); } -} \ No newline at end of file +} diff --git a/src/test/java/RouterTest.java b/src/test/java/com/omarnyte/RouterTest.java similarity index 86% rename from src/test/java/RouterTest.java rename to src/test/java/com/omarnyte/RouterTest.java index 9d5ce29..85c47b1 100644 --- a/src/test/java/RouterTest.java +++ b/src/test/java/com/omarnyte/RouterTest.java @@ -1,8 +1,19 @@ +package com.omarnyte; + import java.util.HashMap; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.handler.Handler; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.mock.MockHandler; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TestUtil; + public class RouterTest { private final static String CUSTOM_URI = "/custom/uri"; private final static String MESSAGE_FROM_CUSTOM_HANDLER = "I come from the custom handler."; diff --git a/src/test/java/RunCucumberTest.java b/src/test/java/com/omarnyte/RunCucumberTest.java similarity index 62% rename from src/test/java/RunCucumberTest.java rename to src/test/java/com/omarnyte/RunCucumberTest.java index 743c9ae..c0c219d 100644 --- a/src/test/java/RunCucumberTest.java +++ b/src/test/java/com/omarnyte/RunCucumberTest.java @@ -1,8 +1,12 @@ +package com.omarnyte; + import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; import org.junit.runner.RunWith; @RunWith(Cucumber.class) -@CucumberOptions(plugin = {"pretty"}) +@CucumberOptions( + plugin = {"pretty"}, + features = "src/test/resources/") public class RunCucumberTest { } \ No newline at end of file diff --git a/src/test/java/Authentication/AuthenticatorTest.java b/src/test/java/com/omarnyte/authentication/AuthenticatorTest.java similarity index 92% rename from src/test/java/Authentication/AuthenticatorTest.java rename to src/test/java/com/omarnyte/authentication/AuthenticatorTest.java index 87167be..979834d 100644 --- a/src/test/java/Authentication/AuthenticatorTest.java +++ b/src/test/java/com/omarnyte/authentication/AuthenticatorTest.java @@ -1,8 +1,15 @@ +package com.omarnyte.authentication; + import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.Test; + +import com.omarnyte.authentication.Authenticator; +import com.omarnyte.authentication.Credentials; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; public class AuthenticatorTest { private static final String AUTH_ROUTE = "/auth/route"; diff --git a/src/test/java/Authentication/CredentialsTest.java b/src/test/java/com/omarnyte/authentication/CredentialsTest.java similarity index 89% rename from src/test/java/Authentication/CredentialsTest.java rename to src/test/java/com/omarnyte/authentication/CredentialsTest.java index 1954c3f..9d183a9 100644 --- a/src/test/java/Authentication/CredentialsTest.java +++ b/src/test/java/com/omarnyte/authentication/CredentialsTest.java @@ -1,9 +1,10 @@ -import static org.junit.Assert.assertEquals; +package com.omarnyte.authentication; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.authentication.Credentials; public class CredentialsTest { private final static String USERNAME = "clever_username"; diff --git a/src/test/java/Handler/DirectoryHandlerTest.java b/src/test/java/com/omarnyte/handler/DirectoryHandlerTest.java similarity index 87% rename from src/test/java/Handler/DirectoryHandlerTest.java rename to src/test/java/com/omarnyte/handler/DirectoryHandlerTest.java index 43185e5..0aaffcd 100644 --- a/src/test/java/Handler/DirectoryHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/DirectoryHandlerTest.java @@ -1,8 +1,20 @@ +package com.omarnyte.handler; + import static org.junit.Assert.assertEquals; import java.io.IOException; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TempDirectory; +import com.omarnyte.testutil.TestUtil; + public class DirectoryHandlerTest { private final static String HTML_FILE_URI = "/html-file.html"; private final static String TEXT_FILE_URI = "/text-file.txt"; @@ -13,7 +25,7 @@ public class DirectoryHandlerTest { @BeforeClass public static void setup () throws IOException, NonexistentDirectoryException { - String tempDirectoryPath = System.getProperty("user.dir") + "/src/test/java/Handler/DirectoryHandlerTestDirectory"; + String tempDirectoryPath = System.getProperty("user.dir") + "/src/test/java/com/omarnyte/handler/DirectoryHandlerTestDirectory"; TempDirectory temp = new TempDirectory(tempDirectoryPath); temp.createEmptyFile(TEXT_FILE_URI); @@ -80,4 +92,4 @@ public void return405MethodNotAllowedWithUnallowedMethod() { assertEquals(expectedReasonPhrase, actualReasonPhrase); } -} +} \ No newline at end of file diff --git a/src/test/java/Handler/EchoHandlerTest.java b/src/test/java/com/omarnyte/handler/EchoHandlerTest.java similarity index 85% rename from src/test/java/Handler/EchoHandlerTest.java rename to src/test/java/com/omarnyte/handler/EchoHandlerTest.java index 347ab10..09ada0f 100644 --- a/src/test/java/Handler/EchoHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/EchoHandlerTest.java @@ -1,6 +1,13 @@ +package com.omarnyte.handler; + import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TestUtil; + public class EchoHandlerTest { private final static Handler handler = new EchoHandler(); private final static String TIME_PATTERN = "hh:mm:ss"; diff --git a/src/test/java/Handler/FileHandlerTest.java b/src/test/java/com/omarnyte/handler/FileHandlerTest.java similarity index 93% rename from src/test/java/Handler/FileHandlerTest.java rename to src/test/java/com/omarnyte/handler/FileHandlerTest.java index 59ac8d7..a3426c5 100644 --- a/src/test/java/Handler/FileHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/FileHandlerTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.handler; + import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -6,9 +8,18 @@ import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; - + +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TestUtil; + public class FileHandlerTest { - private final static String JSON_PATCH_TYPE = "application/json/json-patch+json"; private final static String IMAGE_FILE_URI = "/image.jpg"; private final static String TEXT_FILE_CONTENT = "This is a sample text file."; private final static String TEXT_FILE_URI = "/text-file.txt"; diff --git a/src/test/java/Handler/FormHandlerTest.java b/src/test/java/com/omarnyte/handler/FormHandlerTest.java similarity index 88% rename from src/test/java/Handler/FormHandlerTest.java rename to src/test/java/com/omarnyte/handler/FormHandlerTest.java index f6b28f0..cd02adb 100644 --- a/src/test/java/Handler/FormHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/FormHandlerTest.java @@ -1,9 +1,21 @@ +package com.omarnyte.handler; + import java.util.HashMap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TestUtil; + public class FormHandlerTest { private final static String BODY = createBody(); private final static String FIRST_KEY = "firstKey"; @@ -77,7 +89,7 @@ public void returns303SeeOtherAfterSuccessfulPost() { @Test public void returnsLocationHeaderFieldAfterSuccesfulPost() { HashMap headers = responseToPostRequest.getHeaders(); - this.seeOtherUri = headers.get(MessageHeader.LOCATION); + seeOtherUri = headers.get(MessageHeader.LOCATION); assertTrue(headers.containsKey(MessageHeader.LOCATION)); } diff --git a/src/test/java/Handler/NotFoundHandlerTest.java b/src/test/java/com/omarnyte/handler/NotFoundHandlerTest.java similarity index 76% rename from src/test/java/Handler/NotFoundHandlerTest.java rename to src/test/java/com/omarnyte/handler/NotFoundHandlerTest.java index 4b684cd..13474c0 100644 --- a/src/test/java/Handler/NotFoundHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/NotFoundHandlerTest.java @@ -1,14 +1,20 @@ -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; +package com.omarnyte.handler; + import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; +import com.omarnyte.testutil.TestUtil; + public class NotFoundHandlerTest { private final static String NONEXISTENT_URI = "/does-not-exist.txt"; - private final static String PLAIN_TEXT_BODY = "plain text"; private static Handler notFoundHandler; @@ -20,7 +26,7 @@ public static void setUp() throws NonexistentDirectoryException { @Test public void returns404NotFoundForGetRequests() { - Request request = TestUtil.buildRequestToUri("GET", NONEXISTENT_URI); + Request request = TestUtil.buildRequestToUri(HttpMethod.GET, NONEXISTENT_URI); Response response = notFoundHandler.generateResponse(request); int expectedStatusCode = HttpStatusCode.NOT_FOUND; @@ -34,7 +40,7 @@ public void returns404NotFoundForGetRequests() { @Test public void returns404NotFoundForPatchRequests() { - Request request = TestUtil.buildRequestToUri("PATCH", NONEXISTENT_URI); + Request request = TestUtil.buildRequestToUri(HttpMethod.PATCH, NONEXISTENT_URI); Response response = notFoundHandler.generateResponse(request); int expectedStatusCode = HttpStatusCode.NOT_FOUND; @@ -49,7 +55,7 @@ public void returns404NotFoundForPatchRequests() { @Test public void returns201CreatedForPutRequestToResourceThatDoesNotExist() { String body = "body"; - Request request = TestUtil.buildRequestToUriWithBody("PUT", NONEXISTENT_URI, body); + Request request = TestUtil.buildRequestToUriWithBody(HttpMethod.PUT, NONEXISTENT_URI, body); Response response = notFoundHandler.generateResponse(request); int expectedStatusCode = HttpStatusCode.CREATED; @@ -61,4 +67,4 @@ public void returns201CreatedForPutRequestToResourceThatDoesNotExist() { assertEquals(expectedReasonPhrase, actualReasonPhrase); } -} \ No newline at end of file +} diff --git a/src/test/java/Handler/PatchHandlerTest.java b/src/test/java/com/omarnyte/handler/PatchHandlerTest.java similarity index 86% rename from src/test/java/Handler/PatchHandlerTest.java rename to src/test/java/com/omarnyte/handler/PatchHandlerTest.java index f43249b..6a645d0 100644 --- a/src/test/java/Handler/PatchHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/PatchHandlerTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.handler; + import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -7,6 +9,19 @@ import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.http.MimeType; +import com.omarnyte.jsonpatch.JsonPatchOperation; +import com.omarnyte.jsonpatch.JsonPatchParser; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.mock.MockJsonPatchOperation; +import com.omarnyte.mock.MockJsonPatchParser; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class PatchHandlerTest { private final static String JSON_FILE_URI = "/to-be-patched.json"; private final static String JSON_FILE_ORIGINAL_CONTENT = "ORIGINAL JSON FILE CONTENT"; @@ -91,7 +106,7 @@ private static HashMap setUpMockFileContents() { private static Map setUpMockFileTypes() { return Map.ofEntries( - Map.entry(JSON_FILE_URI, "application/json") + Map.entry(JSON_FILE_URI, MimeType.JSON) ); } @@ -106,7 +121,7 @@ private Request buildPatchRequestToNonexistentJsonFile() { headers.put(MessageHeader.CONTENT_TYPE, JSON_PATCH_TYPE); String jsonPatchBody = "JSON PATCH BODY"; return new Request.Builder() - .method("PATCH") + .method(HttpMethod.PATCH) .uri("does-not-exist.json") .headers(headers) .body(jsonPatchBody) @@ -115,10 +130,10 @@ private Request buildPatchRequestToNonexistentJsonFile() { private Request buildPatchRequestToJsonFileWithPlainTextContent() { HashMap headers = new HashMap(); - headers.put(MessageHeader.CONTENT_TYPE, "text/plain"); + headers.put(MessageHeader.CONTENT_TYPE, MimeType.PLAIN_TEXT); String plainTextBody = "plain text body"; return new Request.Builder() - .method("PATCH") + .method(HttpMethod.PATCH) .uri(JSON_FILE_URI) .headers(headers) .body(plainTextBody) @@ -130,10 +145,11 @@ private static Request buildPatchRequestToJsonFileWithJsonPatchContent() { headers.put(MessageHeader.CONTENT_TYPE, JSON_PATCH_TYPE); String jsonPatchBody = "JSON PATCH BODY"; return new Request.Builder() - .method("PATCH") + .method(HttpMethod.PATCH) .uri(JSON_FILE_URI) .headers(headers) .body(jsonPatchBody) .build(); } -} \ No newline at end of file + +} diff --git a/src/test/java/Handler/PeopleHandlerTest.java b/src/test/java/com/omarnyte/handler/PeopleHandlerTest.java similarity index 91% rename from src/test/java/Handler/PeopleHandlerTest.java rename to src/test/java/com/omarnyte/handler/PeopleHandlerTest.java index 718ac85..8357c3c 100644 --- a/src/test/java/Handler/PeopleHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/PeopleHandlerTest.java @@ -1,16 +1,21 @@ -import java.io.IOException; -import java.util.ArrayList; +package com.omarnyte.handler; + import java.util.HashMap; -import java.util.List; -import java.util.Map; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.mock.MockDirectory; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class PeopleHandlerTest { - private final static String PEOPLE_URI = "/people"; private final static String SUPPORTED_MEDIA_TYPE = "application/json"; - private final static String UNSUPPORTED_MEDIA_TYPE = "unsupported/type"; private final static HashMap HEADERS_WITH_SUPPORTED_MEDIA = buildHeadersWithSupportedMediaType(); private static Handler peopleHandler; diff --git a/src/test/java/Handler/QueryHandlerTest.java b/src/test/java/com/omarnyte/handler/QueryHandlerTest.java similarity index 91% rename from src/test/java/Handler/QueryHandlerTest.java rename to src/test/java/com/omarnyte/handler/QueryHandlerTest.java index d8e97b1..a1a91fd 100644 --- a/src/test/java/Handler/QueryHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/QueryHandlerTest.java @@ -1,7 +1,17 @@ +package com.omarnyte.handler; + import org.junit.Test; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.request.UrlDecoder; +import com.omarnyte.mock.MockUrlDecoder; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class QueryHandlerTest { private final static String FIRST_KEY = "aKey"; private final static String FIRST_VALUE = "aValue"; diff --git a/src/test/java/Handler/ServerHandlerTest.java b/src/test/java/com/omarnyte/handler/ServerHandlerTest.java similarity index 88% rename from src/test/java/Handler/ServerHandlerTest.java rename to src/test/java/com/omarnyte/handler/ServerHandlerTest.java index 390d9fd..bc2745f 100644 --- a/src/test/java/Handler/ServerHandlerTest.java +++ b/src/test/java/com/omarnyte/handler/ServerHandlerTest.java @@ -1,9 +1,17 @@ +package com.omarnyte.handler; + import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.HttpMethod; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; +import com.omarnyte.response.HttpStatusCode; + public class ServerHandlerTest { private final static String FIRST_SUPPORTED_METHOD = "SUPPORTED_METHOD"; private final static String SECOND_SUPPORTED_METHOD = "ANOTHER_SUPPORTED_METHOD"; diff --git a/src/test/java/JsonPatch/JsonPatchAddTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchAddTest.java similarity index 88% rename from src/test/java/JsonPatch/JsonPatchAddTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchAddTest.java index 96e17fb..a72e5b7 100644 --- a/src/test/java/JsonPatch/JsonPatchAddTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchAddTest.java @@ -1,6 +1,11 @@ +package com.omarnyte.jsonpatch; + import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchAddTest { @Test diff --git a/src/test/java/JsonPatch/JsonPatchCopyTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchCopyTest.java similarity index 90% rename from src/test/java/JsonPatch/JsonPatchCopyTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchCopyTest.java index 71a94cd..8890a79 100644 --- a/src/test/java/JsonPatch/JsonPatchCopyTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchCopyTest.java @@ -1,7 +1,12 @@ +package com.omarnyte.jsonpatch; + import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.rules.ExpectedException; -import org.junit.Test; +import org.junit.Test; + +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; public class JsonPatchCopyTest { private final static String FIRST_KEY = "\"firstKey\""; diff --git a/src/test/java/JsonPatch/JsonPatchMoveTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchMoveTest.java similarity index 92% rename from src/test/java/JsonPatch/JsonPatchMoveTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchMoveTest.java index e1f6a4f..1d59f10 100644 --- a/src/test/java/JsonPatch/JsonPatchMoveTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchMoveTest.java @@ -1,8 +1,13 @@ +package com.omarnyte.jsonpatch; + import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchMoveTest { private final static String FIRST_KEY = "\"firstKey\""; private final static String FIRST_VALUE = "\"firstValue\""; diff --git a/src/test/java/JsonPatch/JsonPatchParserTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchParserTest.java similarity index 86% rename from src/test/java/JsonPatch/JsonPatchParserTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchParserTest.java index 48d8734..f1dd96a 100644 --- a/src/test/java/JsonPatch/JsonPatchParserTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchParserTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.jsonpatch; + import java.util.ArrayList; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; @@ -5,9 +7,9 @@ import org.junit.rules.ExpectedException; import org.junit.Test; -public class JsonPatchParserTest { - private final static String JSON_PATCH_BODY = createJsonPatchBodyWithTwoPatches(); +import com.omarnyte.exception.BadRequestException; +public class JsonPatchParserTest { private static JsonPatchParser parser; @BeforeClass @@ -23,7 +25,7 @@ public void throwsBadRequestExceptionWhenNotGivenAnArrayOfOperations() throws Ba String body = "{ \"op\": \"add\", \"path\": \"/a/b\" }"; thrown.expect(BadRequestException.class); - ArrayList jsonPatches = parser.getOperations(body); + parser.getOperations(body); } @Test @@ -31,7 +33,7 @@ public void throwsBadRequestExceptionWithMissingOp() throws BadRequestException String body = createJsonPatchBodyMissingOp(); thrown.expect(BadRequestException.class); - ArrayList jsonPatches = parser.getOperations(body); + parser.getOperations(body); } @Test @@ -39,7 +41,7 @@ public void throwsBadRequestExceptionWithInvalidOp() throws BadRequestException String body = createJsonPatchBodyWithInvalidOp(); thrown.expect(BadRequestException.class); - ArrayList jsonPatches = parser.getOperations(body); + parser.getOperations(body); } @Test @@ -47,7 +49,7 @@ public void throwsBadRequestExceptionWithMissingPath() throws BadRequestExceptio String body = createJsonPatchBodyMissingPath(); thrown.expect(BadRequestException.class); - ArrayList jsonPatches = parser.getOperations(body); + parser.getOperations(body); } @Test diff --git a/src/test/java/JsonPatch/JsonPatchRemoveTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchRemoveTest.java similarity index 91% rename from src/test/java/JsonPatch/JsonPatchRemoveTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchRemoveTest.java index e52b719..1dd9a55 100644 --- a/src/test/java/JsonPatch/JsonPatchRemoveTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchRemoveTest.java @@ -1,8 +1,13 @@ +package com.omarnyte.jsonpatch; + import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchRemoveTest { private final static String FIRST_KEY = "\"firstKey\""; private final static String FIRST_VALUE = "\"firstValue\""; @@ -41,4 +46,4 @@ private static String crateJsonBodyStringWithNewLines() { "}"; } -} \ No newline at end of file +} diff --git a/src/test/java/JsonPatch/JsonPatchReplaceTest.java b/src/test/java/com/omarnyte/jsonpatch/JsonPatchReplaceTest.java similarity index 91% rename from src/test/java/JsonPatch/JsonPatchReplaceTest.java rename to src/test/java/com/omarnyte/jsonpatch/JsonPatchReplaceTest.java index 2a012dd..c899adb 100644 --- a/src/test/java/JsonPatch/JsonPatchReplaceTest.java +++ b/src/test/java/com/omarnyte/jsonpatch/JsonPatchReplaceTest.java @@ -1,8 +1,13 @@ +package com.omarnyte.jsonpatch; + import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.exception.UnprocessableEntityException; + public class JsonPatchReplaceTest { private final static String FIRST_KEY = "\"firstKey\""; private final static String FIRST_VALUE = "\"firstValue\""; diff --git a/src/test/java/Logger/LogFormatterTest.java b/src/test/java/com/omarnyte/logger/LogFormatterTest.java similarity index 94% rename from src/test/java/Logger/LogFormatterTest.java rename to src/test/java/com/omarnyte/logger/LogFormatterTest.java index 6dca2c2..127c4b2 100644 --- a/src/test/java/Logger/LogFormatterTest.java +++ b/src/test/java/com/omarnyte/logger/LogFormatterTest.java @@ -1,14 +1,18 @@ -import org.junit.AfterClass; +package com.omarnyte.logger; + import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; +import com.omarnyte.response.HttpStatusCode; +import com.omarnyte.response.Response; + public class LogFormatterTest { private final static String CONTENT_TYPE = "application/x-www-form-urlencoded"; private final static String CONTENT_LENGTH = "13"; private final static String MESSAGE_BODY = "hello, world!"; - // private final static String MESSAGE_BODY_KEY = "hello"; - // private final static String MESSAGE_BODY_VAL = "world"; private final static String METHOD = "GET"; private final static String REASON_PHRASE = "OK"; private final static String URI = "/uri/path"; diff --git a/src/test/java/Logger/LoggerTest.java b/src/test/java/com/omarnyte/logger/LoggerTest.java similarity index 91% rename from src/test/java/Logger/LoggerTest.java rename to src/test/java/com/omarnyte/logger/LoggerTest.java index a9dea6e..30bb1f1 100644 --- a/src/test/java/Logger/LoggerTest.java +++ b/src/test/java/com/omarnyte/logger/LoggerTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.logger; + import java.io.File; import java.io.IOException; import java.nio.file.Path; @@ -10,6 +12,10 @@ import org.junit.rules.ExpectedException; import org.junit.Test; +import com.omarnyte.exception.LoggerException; +import com.omarnyte.testutil.TempDirectory; +import com.omarnyte.testutil.TestUtil; + public class LoggerTest { private final static String DATE_TIME_PATTERN = "yyyymmddhhmmss"; private final static String TEMP_DIRECTORY_PATH = System.getProperty("user.dir") + "/src/test/java/LoggerTestDirectory"; @@ -20,7 +26,7 @@ public class LoggerTest { @BeforeClass public static void setUp() throws IOException, LoggerException { - TempDirectory temp = new TempDirectory(TEMP_DIRECTORY_PATH); + new TempDirectory(TEMP_DIRECTORY_PATH); logger = new Logger(TEMP_DIRECTORY_PATH, DATE_TIME_PATTERN); logFileName = TestUtil.getFormattedTime(DATE_TIME_PATTERN) + ".txt"; diff --git a/src/test/java/Mock/MockDirectory.java b/src/test/java/com/omarnyte/mock/MockDirectory.java similarity index 87% rename from src/test/java/Mock/MockDirectory.java rename to src/test/java/com/omarnyte/mock/MockDirectory.java index eb81cc6..5550f33 100644 --- a/src/test/java/Mock/MockDirectory.java +++ b/src/test/java/com/omarnyte/mock/MockDirectory.java @@ -1,8 +1,13 @@ +package com.omarnyte.mock; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.omarnyte.Directory; +import com.omarnyte.exception.NonexistentDirectoryException; + public class MockDirectory extends Directory { private final static String DEFAULT_DIRECTORY_PATH = System.getProperty("TEST_DIRECTORY_PATH"); @@ -15,14 +20,14 @@ public MockDirectory() throws NonexistentDirectoryException { super(DEFAULT_DIRECTORY_PATH); } - public MockDirectory(List files, HashMap fileContents, Map fileTypes) throws NonexistentDirectoryException { + public MockDirectory(List files, HashMap fileContents, Map fileTypes) throws NonexistentDirectoryException { super(DEFAULT_DIRECTORY_PATH); this.files = files; this.fileContents = fileContents; this.fileTypes = fileTypes; } - public MockDirectory(List subdirectories, List files, HashMap fileContents, Map fileTypes) throws NonexistentDirectoryException { + public MockDirectory(List subdirectories, List files, HashMap fileContents, Map fileTypes) throws NonexistentDirectoryException { super(DEFAULT_DIRECTORY_PATH); this.subdirectories = subdirectories; this.files = files; diff --git a/src/test/java/Mock/MockHandler.java b/src/test/java/com/omarnyte/mock/MockHandler.java similarity index 61% rename from src/test/java/Mock/MockHandler.java rename to src/test/java/com/omarnyte/mock/MockHandler.java index a79c0ca..2756514 100644 --- a/src/test/java/Mock/MockHandler.java +++ b/src/test/java/com/omarnyte/mock/MockHandler.java @@ -1,3 +1,10 @@ +package com.omarnyte.mock; + +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + +import com.omarnyte.handler.Handler; + public class MockHandler implements Handler { Response response; diff --git a/src/test/java/Mock/MockInputStream.java b/src/test/java/com/omarnyte/mock/MockInputStream.java similarity index 94% rename from src/test/java/Mock/MockInputStream.java rename to src/test/java/com/omarnyte/mock/MockInputStream.java index 6587f05..bd56dd9 100644 --- a/src/test/java/Mock/MockInputStream.java +++ b/src/test/java/com/omarnyte/mock/MockInputStream.java @@ -1,3 +1,5 @@ +package com.omarnyte.mock; + import java.util.Arrays; import java.io.InputStream; diff --git a/src/test/java/Mock/MockJsonPatchOperation.java b/src/test/java/com/omarnyte/mock/MockJsonPatchOperation.java similarity index 81% rename from src/test/java/Mock/MockJsonPatchOperation.java rename to src/test/java/com/omarnyte/mock/MockJsonPatchOperation.java index c1b1795..2c9d10b 100644 --- a/src/test/java/Mock/MockJsonPatchOperation.java +++ b/src/test/java/com/omarnyte/mock/MockJsonPatchOperation.java @@ -1,4 +1,6 @@ -import java.util.ArrayList; +package com.omarnyte.mock; + +import com.omarnyte.jsonpatch.JsonPatchOperation; public class MockJsonPatchOperation extends JsonPatchOperation { private String contentToReturn; diff --git a/src/test/java/Mock/MockJsonPatchParser.java b/src/test/java/com/omarnyte/mock/MockJsonPatchParser.java similarity index 69% rename from src/test/java/Mock/MockJsonPatchParser.java rename to src/test/java/com/omarnyte/mock/MockJsonPatchParser.java index 01113df..196c4bc 100644 --- a/src/test/java/Mock/MockJsonPatchParser.java +++ b/src/test/java/com/omarnyte/mock/MockJsonPatchParser.java @@ -1,5 +1,11 @@ +package com.omarnyte.mock; + import java.util.ArrayList; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.jsonpatch.JsonPatchOperation; +import com.omarnyte.jsonpatch.JsonPatchParser; + public class MockJsonPatchParser extends JsonPatchParser { private ArrayList mockOperations; diff --git a/src/test/java/Mock/MockMiddleware.java b/src/test/java/com/omarnyte/mock/MockMiddleware.java similarity index 72% rename from src/test/java/Mock/MockMiddleware.java rename to src/test/java/com/omarnyte/mock/MockMiddleware.java index 1b5601f..3ce98ca 100644 --- a/src/test/java/Mock/MockMiddleware.java +++ b/src/test/java/com/omarnyte/mock/MockMiddleware.java @@ -1,3 +1,8 @@ +package com.omarnyte.mock; + +import com.omarnyte.middleware.Middleware; +import com.omarnyte.response.Response; + public class MockMiddleware extends Middleware { private Response expectedResponse; diff --git a/src/test/java/Mock/MockOutputStream.java b/src/test/java/com/omarnyte/mock/MockOutputStream.java similarity index 93% rename from src/test/java/Mock/MockOutputStream.java rename to src/test/java/com/omarnyte/mock/MockOutputStream.java index 0258bda..c8f6d42 100644 --- a/src/test/java/Mock/MockOutputStream.java +++ b/src/test/java/com/omarnyte/mock/MockOutputStream.java @@ -1,3 +1,5 @@ +package com.omarnyte.mock; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/test/java/Mock/MockRouter.java b/src/test/java/com/omarnyte/mock/MockRouter.java similarity index 75% rename from src/test/java/Mock/MockRouter.java rename to src/test/java/com/omarnyte/mock/MockRouter.java index 22bb824..3ccf1ec 100644 --- a/src/test/java/Mock/MockRouter.java +++ b/src/test/java/com/omarnyte/mock/MockRouter.java @@ -1,5 +1,14 @@ +package com.omarnyte.mock; + import java.util.HashMap; +import com.omarnyte.Directory; +import com.omarnyte.Router; +import com.omarnyte.exception.NonexistentDirectoryException; +import com.omarnyte.handler.Handler; +import com.omarnyte.request.Request; +import com.omarnyte.response.Response; + public class MockRouter extends Router { private Response expectedResponse; diff --git a/src/test/java/Mock/MockSocket.java b/src/test/java/com/omarnyte/mock/MockSocket.java similarity index 96% rename from src/test/java/Mock/MockSocket.java rename to src/test/java/com/omarnyte/mock/MockSocket.java index 65808ae..9f7642f 100644 --- a/src/test/java/Mock/MockSocket.java +++ b/src/test/java/com/omarnyte/mock/MockSocket.java @@ -1,3 +1,5 @@ +package com.omarnyte.mock; + import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/src/test/java/Mock/MockUrlDecoder.java b/src/test/java/com/omarnyte/mock/MockUrlDecoder.java similarity index 66% rename from src/test/java/Mock/MockUrlDecoder.java rename to src/test/java/com/omarnyte/mock/MockUrlDecoder.java index 2b277cf..ef54789 100644 --- a/src/test/java/Mock/MockUrlDecoder.java +++ b/src/test/java/com/omarnyte/mock/MockUrlDecoder.java @@ -1,3 +1,7 @@ +package com.omarnyte.mock; + +import com.omarnyte.request.UrlDecoder; + public class MockUrlDecoder extends UrlDecoder { public String decodeString(String encodedString) { diff --git a/src/test/java/Request/RequestLineParserTest.java b/src/test/java/com/omarnyte/request/RequestLineParserTest.java similarity index 94% rename from src/test/java/Request/RequestLineParserTest.java rename to src/test/java/com/omarnyte/request/RequestLineParserTest.java index 93910d1..f71ff8c 100644 --- a/src/test/java/Request/RequestLineParserTest.java +++ b/src/test/java/com/omarnyte/request/RequestLineParserTest.java @@ -1,10 +1,13 @@ -import java.util.HashMap; +package com.omarnyte.request; + import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.rules.ExpectedException; +import com.omarnyte.exception.BadRequestException; + public class RequestLineParserTest { private final static String METHOD = "GET"; private final static String URI = "/uri/path"; @@ -29,7 +32,7 @@ public void throwsBadRequestException() throws BadRequestException { String requestLineString = "GET\r\n"; thrown.expect(BadRequestException.class); - RequestLineParser requestLine = new RequestLineParser(requestLineString); + new RequestLineParser(requestLineString); } @Test diff --git a/src/test/java/Request/RequestParserTest.java b/src/test/java/com/omarnyte/request/RequestParserTest.java similarity index 94% rename from src/test/java/Request/RequestParserTest.java rename to src/test/java/com/omarnyte/request/RequestParserTest.java index 88e53c1..ae19388 100644 --- a/src/test/java/Request/RequestParserTest.java +++ b/src/test/java/com/omarnyte/request/RequestParserTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.request; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -9,6 +11,10 @@ import org.junit.Rule; import org.junit.rules.ExpectedException; +import com.omarnyte.exception.BadRequestException; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.request.Request; + public class RequestParserTest { private final static String CONTENT_LENGTH= "22"; private final static String CONTENT_TYPE = "application/x-www-form-urlencoded"; @@ -60,7 +66,7 @@ public void throwsBadRequestException() throws BadRequestException { RequestParser requestParser = new RequestParser(new BufferedReader(new StringReader(requestString))); thrown.expect(BadRequestException.class); - Request request = requestParser.generateRequest(); + requestParser.generateRequest(); } private static Request createRequest() throws BadRequestException { diff --git a/src/test/java/Request/RequestTest.java b/src/test/java/com/omarnyte/request/RequestTest.java similarity index 78% rename from src/test/java/Request/RequestTest.java rename to src/test/java/com/omarnyte/request/RequestTest.java index 7210521..7324e96 100644 --- a/src/test/java/Request/RequestTest.java +++ b/src/test/java/com/omarnyte/request/RequestTest.java @@ -1,22 +1,22 @@ +package com.omarnyte.request; + import java.util.HashMap; import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; +import com.omarnyte.request.Request; + public class RequestTest { private final static String BODY = "request body"; private final static String FIRST_HEADER_FIELD = "First-Header-Field"; private final static String FIRST_HEADER_VAL = "First-Header-Val"; - private final static String FIRST_PARAMETER_KEY = "First-Parameter-Key"; - private final static String FIRST_PARAMETER_VAL = "First-Parameter-Val"; - private final static String CONTENT_LENGTH = "100"; private final static HashMap HEADERS = setHeaders(); private final static String METHOD = "GET"; private final static String QUERY = "aKey=aValue&anotherKey&anotherValue"; private final static String SECOND_HEADER_FIELD = "Second-Header-Field"; private final static String SECOND_HEADER_VAL = "Second-Header-Val"; - private final static String SECOND_PARAMETER_KEY = "Second-Parameter-Key"; - private final static String SECOND_PARAMETER_VAL = "Second-Parameter-Val"; + private final static String URI = "/uri/path"; private final static String VERSION = "1.1"; @@ -68,13 +68,6 @@ private static HashMap setHeaders() { return headers; } - private static HashMap setParameters() { - HashMap parameters = new HashMap(); - parameters.put(FIRST_PARAMETER_KEY, FIRST_PARAMETER_VAL); - parameters.put(SECOND_PARAMETER_KEY, SECOND_PARAMETER_VAL); - return parameters; - } - private static Request buildRequest() { return new Request.Builder() .method(METHOD) diff --git a/src/test/java/Request/UrlDecoderTest.java b/src/test/java/com/omarnyte/request/UrlDecoderTest.java similarity index 97% rename from src/test/java/Request/UrlDecoderTest.java rename to src/test/java/com/omarnyte/request/UrlDecoderTest.java index 9ccb259..a22b984 100644 --- a/src/test/java/Request/UrlDecoderTest.java +++ b/src/test/java/com/omarnyte/request/UrlDecoderTest.java @@ -1,3 +1,5 @@ +package com.omarnyte.request; + import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/Response/ResponseFormatterTest.java b/src/test/java/com/omarnyte/response/ResponseFormatterTest.java similarity index 96% rename from src/test/java/Response/ResponseFormatterTest.java rename to src/test/java/com/omarnyte/response/ResponseFormatterTest.java index bdaa212..ee59b34 100644 --- a/src/test/java/Response/ResponseFormatterTest.java +++ b/src/test/java/com/omarnyte/response/ResponseFormatterTest.java @@ -1,6 +1,10 @@ +package com.omarnyte.response; + import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.omarnyte.http.MessageHeader; + public class ResponseFormatterTest { private final static String HTTP_VERSION = "1.1"; private final static int STATUS_CODE = HttpStatusCode.OK; diff --git a/src/test/java/Response/ResponseTest.java b/src/test/java/com/omarnyte/response/ResponseTest.java similarity index 93% rename from src/test/java/Response/ResponseTest.java rename to src/test/java/com/omarnyte/response/ResponseTest.java index 12d4d1b..fcf398a 100644 --- a/src/test/java/Response/ResponseTest.java +++ b/src/test/java/com/omarnyte/response/ResponseTest.java @@ -1,8 +1,12 @@ +package com.omarnyte.response; + import java.util.HashMap; import static org.junit.Assert.assertEquals; -import org.junit.Before; import org.junit.Test; +import com.omarnyte.http.MessageHeader; +import com.omarnyte.response.Response; + public class ResponseTest { private final static String HTTP_VERSION = "1.1"; private final static String REASON_PHRASE = "OK"; diff --git a/src/test/java/StepDefinitions/DirectoryStepDefs.java b/src/test/java/com/omarnyte/stepdefinitions/DirectoryStepDefs.java similarity index 96% rename from src/test/java/StepDefinitions/DirectoryStepDefs.java rename to src/test/java/com/omarnyte/stepdefinitions/DirectoryStepDefs.java index f3e8b18..e65cb10 100644 --- a/src/test/java/StepDefinitions/DirectoryStepDefs.java +++ b/src/test/java/com/omarnyte/stepdefinitions/DirectoryStepDefs.java @@ -1,12 +1,15 @@ +package com.omarnyte.stepdefinitions; + import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; -import cucumber.api.PendingException; import java.io.File; import java.io.FileOutputStream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import com.omarnyte.testutil.TestUtil; + public class DirectoryStepDefs { private final static String TEST_DIRECTORY_PATH = System.getProperty("TEST_DIRECTORY_PATH"); diff --git a/src/test/java/StepDefinitions/RequestHeaderStepDefs.java b/src/test/java/com/omarnyte/stepdefinitions/RequestHeaderStepDefs.java similarity index 94% rename from src/test/java/StepDefinitions/RequestHeaderStepDefs.java rename to src/test/java/com/omarnyte/stepdefinitions/RequestHeaderStepDefs.java index d1cacaf..4e45c72 100644 --- a/src/test/java/StepDefinitions/RequestHeaderStepDefs.java +++ b/src/test/java/com/omarnyte/stepdefinitions/RequestHeaderStepDefs.java @@ -1,5 +1,6 @@ +package com.omarnyte.stepdefinitions; + import cucumber.api.java.en.When; -import cucumber.api.PendingException; import java.util.Base64; public class RequestHeaderStepDefs { diff --git a/src/test/java/StepDefinitions/RequestStepDefs.java b/src/test/java/com/omarnyte/stepdefinitions/RequestStepDefs.java similarity index 97% rename from src/test/java/StepDefinitions/RequestStepDefs.java rename to src/test/java/com/omarnyte/stepdefinitions/RequestStepDefs.java index 5c7eb8a..9ef0316 100644 --- a/src/test/java/StepDefinitions/RequestStepDefs.java +++ b/src/test/java/com/omarnyte/stepdefinitions/RequestStepDefs.java @@ -1,5 +1,6 @@ +package com.omarnyte.stepdefinitions; + import cucumber.api.java.en.When; -import cucumber.api.PendingException; import java.io.IOException; import java.io.OutputStream; import java.net.URL; diff --git a/src/test/java/StepDefinitions/ResponseHeaderStepDefs.java b/src/test/java/com/omarnyte/stepdefinitions/ResponseHeaderStepDefs.java similarity index 92% rename from src/test/java/StepDefinitions/ResponseHeaderStepDefs.java rename to src/test/java/com/omarnyte/stepdefinitions/ResponseHeaderStepDefs.java index ce2c1b4..6385db5 100644 --- a/src/test/java/StepDefinitions/ResponseHeaderStepDefs.java +++ b/src/test/java/com/omarnyte/stepdefinitions/ResponseHeaderStepDefs.java @@ -1,6 +1,6 @@ +package com.omarnyte.stepdefinitions; + import cucumber.api.java.en.Then; -import cucumber.api.PendingException; -import java.util.Arrays; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/StepDefinitions/ResponseStepDefs.java b/src/test/java/com/omarnyte/stepdefinitions/ResponseStepDefs.java similarity index 95% rename from src/test/java/StepDefinitions/ResponseStepDefs.java rename to src/test/java/com/omarnyte/stepdefinitions/ResponseStepDefs.java index 948503f..293880f 100644 --- a/src/test/java/StepDefinitions/ResponseStepDefs.java +++ b/src/test/java/com/omarnyte/stepdefinitions/ResponseStepDefs.java @@ -1,6 +1,6 @@ +package com.omarnyte.stepdefinitions; + import cucumber.api.java.en.Then; -import cucumber.api.PendingException; -import java.io.IOException; import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -8,10 +8,11 @@ import java.util.Date; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.After; + +import com.omarnyte.testutil.StepDefsUtil; +import com.omarnyte.testutil.TestUtil; public class ResponseStepDefs { - private final static int PORT = Integer.parseInt(System.getProperty("PORT")); private final static String TEST_DIRECTORY_PATH = System.getProperty("TEST_DIRECTORY_PATH"); private World world; diff --git a/src/test/java/StepDefinitions/World.java b/src/test/java/com/omarnyte/stepdefinitions/World.java similarity index 75% rename from src/test/java/StepDefinitions/World.java rename to src/test/java/com/omarnyte/stepdefinitions/World.java index f123645..7360133 100644 --- a/src/test/java/StepDefinitions/World.java +++ b/src/test/java/com/omarnyte/stepdefinitions/World.java @@ -1,3 +1,5 @@ +package com.omarnyte.stepdefinitions; + import java.net.HttpURLConnection; public class World { diff --git a/src/test/java/util/StepDefsUtil.java b/src/test/java/com/omarnyte/testutil/StepDefsUtil.java similarity index 97% rename from src/test/java/util/StepDefsUtil.java rename to src/test/java/com/omarnyte/testutil/StepDefsUtil.java index d875a98..253d97d 100644 --- a/src/test/java/util/StepDefsUtil.java +++ b/src/test/java/com/omarnyte/testutil/StepDefsUtil.java @@ -1,3 +1,5 @@ +package com.omarnyte.testutil; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/test/java/util/TempDirectory.java b/src/test/java/com/omarnyte/testutil/TempDirectory.java similarity index 97% rename from src/test/java/util/TempDirectory.java rename to src/test/java/com/omarnyte/testutil/TempDirectory.java index 8d00da7..5ae49d3 100644 --- a/src/test/java/util/TempDirectory.java +++ b/src/test/java/com/omarnyte/testutil/TempDirectory.java @@ -1,3 +1,5 @@ +package com.omarnyte.testutil; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/src/test/java/util/TestUtil.java b/src/test/java/com/omarnyte/testutil/TestUtil.java similarity index 89% rename from src/test/java/util/TestUtil.java rename to src/test/java/com/omarnyte/testutil/TestUtil.java index 93f7706..059dd96 100644 --- a/src/test/java/util/TestUtil.java +++ b/src/test/java/com/omarnyte/testutil/TestUtil.java @@ -1,20 +1,23 @@ +package com.omarnyte.testutil; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.HashMap; import java.util.Date; +import com.omarnyte.request.Request; public class TestUtil { + private final static String VERSION = "1.1"; public static Request buildRequestToUri(String method, String uri) { return new Request.Builder() .method(method) .uri(uri) - .version("1.1") + .version(VERSION) .build(); } @@ -22,7 +25,7 @@ public static Request buildRequestToUriWithBody(String method, String uri, Strin return new Request.Builder() .method(method) .uri(uri) - .version("1.1") + .version(VERSION) .body(body) .build(); }