From caebfdb4c989bc714ba5c35681be1fea82300f18 Mon Sep 17 00:00:00 2001
From: open-schnick <jonathan.burst@gmx.de>
Date: Tue, 17 Nov 2020 11:21:27 +0100
Subject: [PATCH] FF-158 fixed tests.

---
 .run/AllJUnitTests.run.xml                    |  2 +-
 .../rest/RestApplicationIntegrationTest.java  | 36 ++++---------------
 .../java/de/filefighter/rest/TestUtils.java   | 27 ++++++++++++++
 .../cucumber/UserEditInformationSteps.java    | 12 +++----
 .../rest/cucumber/UserRegistrationSteps.java  | 10 ++----
 5 files changed, 40 insertions(+), 47 deletions(-)
 create mode 100644 src/test/java/de/filefighter/rest/TestUtils.java

diff --git a/.run/AllJUnitTests.run.xml b/.run/AllJUnitTests.run.xml
index 4bfa5567..9691b374 100644
--- a/.run/AllJUnitTests.run.xml
+++ b/.run/AllJUnitTests.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All Tests" type="JUnit" factoryName="JUnit">
-    <module name="RestApi" />
+    <module name="restapi" />
     <useClassPathOnly />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java b/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java
index df2a492a..25c7f476 100644
--- a/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java
+++ b/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java
@@ -60,19 +60,20 @@ void contextLoads() {
     protected void executeRestApiCall(HttpMethod httpMethod, String url) {
         final Map<String, String> headers = new HashMap<>();
         headers.put("Accept", "application/json");
-        executeRequest(httpMethod, url, headers,null);
+        executeRequest(httpMethod, url, headers, null);
     }
 
     protected void executeRestApiCall(HttpMethod httpMethod, String url, Map<String, String> headers) {
-        executeRequest(httpMethod, url, headers,null);
+        executeRequest(httpMethod, url, headers, null);
     }
-    protected void executeRestApiCall(HttpMethod httpMethod, String url, Map<String, String> headers,String postBody) {
+
+    protected void executeRestApiCall(HttpMethod httpMethod, String url, Map<String, String> headers, String postBody) {
         executeRequest(httpMethod, url, headers, postBody);
     }
 
-    private void executeRequest(HttpMethod httpMethod, String url, Map<String, String> headers,String postBody) {
+    private void executeRequest(HttpMethod httpMethod, String url, Map<String, String> headers, String postBody) {
         final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
-        if (postBody!=null){
+        if (postBody != null) {
             requestCallback.setBody(postBody);
         }
         final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
@@ -109,29 +110,4 @@ public void handleError(@NotNull ClientHttpResponse response) throws IOException
             results = new ResponseResults(response);
         }
     }
-
-    protected    static String serializeUser(String confirmationPassword,int[] groupIds, String password, String username){
-        StringBuilder jsonString=new StringBuilder("{");
-
-        if (confirmationPassword != null){
-            jsonString.append("\"confirmationPassword\": \"").append(confirmationPassword).append("\",");
-        }
-        if (groupIds!=null && groupIds.length>0){
-            jsonString.append("\"groupIds\": ").append(Arrays.toString(groupIds)).append(",");
-        }
-        if (password != null){
-            jsonString.append("\"password\": \"").append(password).append("\",");
-        }
-        if (username != null){
-            jsonString.append("\"username\": \"").append(username).append("\",");
-        }
-
-        jsonString.append("}");
-
-        return jsonString.toString();
-    }
-
-
-
-
 }
diff --git a/src/test/java/de/filefighter/rest/TestUtils.java b/src/test/java/de/filefighter/rest/TestUtils.java
new file mode 100644
index 00000000..e4d19641
--- /dev/null
+++ b/src/test/java/de/filefighter/rest/TestUtils.java
@@ -0,0 +1,27 @@
+package de.filefighter.rest;
+
+import java.util.Arrays;
+
+public class TestUtils {
+
+    public static String serializeUserRequest(String confirmationPassword, int[] groupIds, String password, String username) {
+        StringBuilder jsonString = new StringBuilder("{");
+
+        if (confirmationPassword != null) {
+            jsonString.append("\"confirmationPassword\": \"").append(confirmationPassword).append("\",");
+        }
+        if (groupIds != null && groupIds.length > 0) {
+            jsonString.append("\"groupIds\": ").append(Arrays.toString(groupIds)).append(",");
+        }
+        if (password != null) {
+            jsonString.append("\"password\": \"").append(password).append(username != null?"\",":"");
+        }
+        if (username != null) {
+            jsonString.append("\"username\": \"").append(username).append("\"");
+        }
+
+        jsonString.append("}");
+
+        return jsonString.toString();
+    }
+}
diff --git a/src/test/java/de/filefighter/rest/cucumber/UserEditInformationSteps.java b/src/test/java/de/filefighter/rest/cucumber/UserEditInformationSteps.java
index 179db20b..e2341aa1 100644
--- a/src/test/java/de/filefighter/rest/cucumber/UserEditInformationSteps.java
+++ b/src/test/java/de/filefighter/rest/cucumber/UserEditInformationSteps.java
@@ -1,11 +1,13 @@
 package de.filefighter.rest.cucumber;
 
 import de.filefighter.rest.RestApplicationIntegrationTest;
+import de.filefighter.rest.TestUtils;
 import io.cucumber.java.en.When;
 import org.springframework.http.HttpMethod;
 
 import java.util.HashMap;
 
+import static de.filefighter.rest.TestUtils.serializeUserRequest;
 import static de.filefighter.rest.configuration.RestConfiguration.*;
 
 public class UserEditInformationSteps extends RestApplicationIntegrationTest {
@@ -14,16 +16,10 @@ public void userRequestsChangeOfUsernameWithValueAndAccessTokenAndId(String newU
         String authHeaderString = AUTHORIZATION_BEARER_PREFIX + accessToken;
         String url = BASE_API_URI + USER_BASE_URI + "edit";
 
-
         HashMap<String, String> authHeader = new HashMap<>();
         authHeader.put("Authorization", authHeaderString);
 
-
-
-
-        String postBody=serializeUser(null,null,null,newUsername);
-
-
+        String postBody= serializeUserRequest(null,null,null,newUsername);
         executeRestApiCall(HttpMethod.PUT, url, authHeader,postBody);
     }
 
@@ -36,7 +32,7 @@ public void userRequestsChangeOfPasswordWithValueAndAccessTokenAndId(String newP
         authHeader.put("Authorization", authHeaderString);
 
 
-        String postBody=serializeUser(newPassword,null,newPassword,null);
+        String postBody=serializeUserRequest(newPassword,null,newPassword,null);
 
 
         executeRestApiCall(HttpMethod.GET, url, authHeader,postBody);
diff --git a/src/test/java/de/filefighter/rest/cucumber/UserRegistrationSteps.java b/src/test/java/de/filefighter/rest/cucumber/UserRegistrationSteps.java
index df5de343..c2386451 100644
--- a/src/test/java/de/filefighter/rest/cucumber/UserRegistrationSteps.java
+++ b/src/test/java/de/filefighter/rest/cucumber/UserRegistrationSteps.java
@@ -1,6 +1,7 @@
 package de.filefighter.rest.cucumber;
 
 import de.filefighter.rest.RestApplicationIntegrationTest;
+import de.filefighter.rest.TestUtils;
 import io.cucumber.java.en.When;
 import org.springframework.http.HttpMethod;
 
@@ -15,17 +16,10 @@ public void userRequestsRegistrationWithUsernamePasswordAndPasswordConfirmationW
         String authHeaderString = AUTHORIZATION_BEARER_PREFIX + accessToken;
         String url = BASE_API_URI + USER_BASE_URI + "register";
 
-
         HashMap<String, String> authHeader = new HashMap<>();
         authHeader.put("Authorization", authHeaderString);
 
-
-
-
-        String postBody=serializeUser(password,null,password,username);
-
+        String postBody= TestUtils.serializeUserRequest(password,null,password,username);
         executeRestApiCall(HttpMethod.POST, url, authHeader,postBody);
-
-
     }
 }