Revize a885eacd

#10366 Dopsání testů pro autentikační službu. Mírný refactoring kódu pro vytváření JSON stringů.

pom.xml

@@ -120 +120 @@
 			<scope>test</scope>
 		</dependency>
 
-
+		<!-- json library with minimal overhead -->
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
 		<!-- UI TESTING -->
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserController.java

@@ -107 +107 @@
      * @return String that represents JSON object
      */
     private String generateResponseObject(UserModelStatusCodes code, String jwtToken) {
-        HashMap<String, String> json = new HashMap<>();
+        HashMap<String, Object> json = new HashMap<>();
         json.put("message", code.getLabel());
         if (jwtToken != null) {
             json.put("jwtToken", jwtToken);
         }
-        return JSONBuilder.buildJson(json);
+        return JSONBuilder.buildJSON(json);
     }
 
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/OAuthServiceImpl.java

@@ -18 +18 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Service which communicate with OAuth application
@@ -50 +51 @@
     private UserService userService;
 
 
-    private RequestBuilder requestBuilder = new RequestBuilder();
+    //private RequestBuilder requestBuilder = new RequestBuilder();
 
     public ResponseEntity<String> authenticate(String token) {
 
-        return requestBuilder.sendRequestResponse(AUTH_URL_AUTH, token);
+        return RequestBuilder.sendRequestResponse(AUTH_URL_AUTH, token);
     }
 
     public ResponseEntity<String> loginUser(User user) {
@@ -64 +65 @@
             return null;
         }
         //HttpURLConnection con = RequestBuilder.createConnection(AUTH_URL);
-        HashMap<String, String> requestBody = new HashMap<>();
+        Map<String, Object> requestBody = new HashMap<>();
 
         requestBody.put("name", userName);
 
-        return requestBuilder.sendRequestResponse(AUTH_URL_LOGIN, requestBody);
+        return RequestBuilder.sendRequestResponse(AUTH_URL_LOGIN, requestBody);
     }
 
     public ResponseEntity<String> logoutUser(User user) {
@@ -80 +81 @@
         }
 
         //HttpURLConnection con = RequestBuilder.createConnection(AUTH_URL);
-        HashMap<String, String> requestBody = new HashMap<>();
+        HashMap<String, Object> requestBody = new HashMap<>();
 
         requestBody.put("name", userName);
         requestBody.put("token", token);
 
-        return requestBuilder.sendRequestResponse(AUTH_URL_LOGOUT, requestBody);
+        return RequestBuilder.sendRequestResponse(AUTH_URL_LOGOUT, requestBody);
     }
 
     @Override

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/JSONBuilder.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Version 1.0 - only simple json can be built
@@ -10 +12 @@
  * @author Vaclav Hrabik, Jiri Trefil
  */
 public class JSONBuilder {
-
     /**
      * Method transforms map into string representation of JSON object
-     * @param map key value pair that will be generated as json line
+     * @param json key value pair that will be generated as json line
      * @return String representation of JSON object
-     */
-    public static String buildJson(HashMap<String, String> map){
-        if(map == null) {
-            return "";
-        }
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectNode jsonObject = mapper.createObjectNode();
-        for (String key : map.keySet()) {
-            jsonObject.put(key,map.get(key));
+     * */
+
+    public static String buildJSON(Map<String,Object> json){
+
+        JSONObject jsonObject = new JSONObject();
+        for(String key : json.keySet()){
+            jsonObject.put(key,parseJSONValue(json.get(key)));
         }
-        return jsonObject.toString();
+        String jsonString = jsonObject.toJSONString();
+
+        return jsonString;
     }
 
+    private static Object parseJSONValue(Object value){
+
+        if(value instanceof HashMap<?,?>){
+            Map<String,Object> map = null;
+            try{
+                map = (HashMap<String,Object>) value;
+            }
+            catch (ClassCastException e){
+                throw new RuntimeException("Provided object of HashMap is not <String,Object> typed!");
+            }
+            JSONObject jsonObject = new JSONObject();
+            for(String key : map.keySet())
+                jsonObject.put(key,parseJSONValue(map.get(key)));
+            return jsonObject;
 
 
+        }
+        if (value instanceof ArrayList){
+            JSONArray jsonArray = new JSONArray();
+            ArrayList<Object> list;
+            list = (ArrayList<Object>) value;
+            for(int i = 0,n=list.size(); i < n; i++)
+                jsonArray.add(parseJSONValue(list.get(i)));
+            return jsonArray;
+        }
+
+
+        //some simple data type without any indentation, we can just return it
+        return value;
+    }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/ParamsBuilder.java

@@ -12 +12 @@
      * @param parameters Key: value pair parameters
      * @return String JSON representation
      */
-    public static String createPostParams(HashMap<String,String> parameters) {
-        return JSONBuilder.buildJson(parameters);
+    public static String createPostParams(HashMap<String,Object> parameters) {
+        return JSONBuilder.buildJSON(parameters);
     }
 
     /**

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserControllerTest.java

@@ -39 +39 @@
     @Test
     public void registerUserNew() throws Exception {
         Mockito.when(userService.registerUser(any())).thenReturn(UserModelStatusCodes.USER_CREATED);
-        HashMap<String,String> map = new HashMap<>();
+        HashMap<String,Object> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
         map.put("email","[e-mail]");
-        String json = JSONBuilder.buildJson(map);
+        String json = JSONBuilder.buildJSON(map);
         RequestBuilder requestBuilder = MockMvcRequestBuilders
                 .post("/v2/user/register")
                 .accept(MediaType.APPLICATION_JSON).content(json)
@@ -58 +58 @@
     @Test
     public void registerUserInvalidArguments() throws Exception {
         Mockito.when(userService.registerUser(any())).thenReturn(UserModelStatusCodes.INVALID_USER_ARGUMENTS);
-        HashMap<String,String> map = new HashMap<>();
+        HashMap<String,Object> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
         map.put("email","yxz");
-        String json = JSONBuilder.buildJson(map);
+        String json = JSONBuilder.buildJSON(map);
         RequestBuilder requestBuilder = MockMvcRequestBuilders
                 .post("/v2/user/register")
                 .accept(MediaType.APPLICATION_JSON).content(json)
@@ -80 +80 @@
     @Test
     public void registerUserExists() throws Exception {
         Mockito.when(userService.registerUser(any())).thenReturn(UserModelStatusCodes.USER_EXISTS);
-        HashMap<String,String> map = new HashMap<>();
+        HashMap<String,Object> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
         map.put("email","[e-mail]");
-        String json = JSONBuilder.buildJson(map);
+        String json = JSONBuilder.buildJSON(map);
         RequestBuilder requestBuilder = MockMvcRequestBuilders
                 .post("/v2/user/register")
                 .accept(MediaType.APPLICATION_JSON).content(json)
@@ -100 +100 @@
     @Test
     public void loginValidUser() throws Exception {
         Mockito.when(userService.verifyUser(any())).thenReturn(UserModelStatusCodes.USER_LOGGED_IN);
-        HashMap<String,String> map = new HashMap<>();
+        HashMap<String,Object> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
         map.put("email","[e-mail]");
-        String json = JSONBuilder.buildJson(map);
+        String json = JSONBuilder.buildJSON(map);
         RequestBuilder requestBuilder = MockMvcRequestBuilders
               .post("/v2/user/login")
               .accept(MediaType.APPLICATION_JSON).content(json)
@@ -120 +120 @@
     @Test
     public void loginInValidUser() throws Exception {
         Mockito.when(userService.verifyUser(any())).thenReturn(UserModelStatusCodes.USER_LOGIN_FAILED);
-        HashMap<String,String> map = new HashMap<>();
+        HashMap<String,Object> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
         map.put("email","[e-mail]");
-        String json = JSONBuilder.buildJson(map);
+        String json = JSONBuilder.buildJSON(map);
         RequestBuilder requestBuilder = MockMvcRequestBuilders
                 .post("/v2/user/login")
                 .accept(MediaType.APPLICATION_JSON).content(json)

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/OAuthServiceImplTest.java

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.UserModelStatusCodes;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.User;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.JSONBuilder;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.RequestBuilder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28 +29 @@
     @Autowired
     private OAuthService oAuthService;
 
-    @MockBean
-    private RequestBuilder requestBuilder;
 
     /**
      * Mocked User
      */
     private final User mockUser = new User("foo", "[e-mail]", "foo");
-    
+    private final String sampleToken = "eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyMGU4NmJiMC1lMDU4LTQwYTMtYjQyZC02ZTBjOWIyMmQ5MWQiL" +
+            "CJzdWIiOiJmb28iLCJpYXQiOjE2ODE0MTY2ODAsImV4cCI6MTY4MTQxNjk4MH0.YJTwPEI4njQqYRuLGilf_oVl0gGD5BWFmdolk1O" +
+            "vYWIgTcoIAFwh6bwqrW7XM6Hlj-ItYj9EmihYIqN5gfJVtg";
+    // valid user logged in - http response with code 200 and token in body is expected
     @Test
     public void loginValidUser(){
-        ResponseEntity<String> response = ResponseEntity.ok().body("eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyMGU4NmJiMC1lMDU4LTQwYTMtYjQyZC02ZTBjOWIyMmQ5MWQiL" +
-                "CJzdWIiOiJmb28iLCJpYXQiOjE2ODE0MTY2ODAsImV4cCI6MTY4MTQxNjk4MH0.YJTwPEI4njQqYRuLGilf_oVl0gGD5BWFmdolk1O" +
-                "vYWIgTcoIAFwh6bwqrW7XM6Hlj-ItYj9EmihYIqN5gfJVtg");
-        HashMap<String, String> hashMap = new HashMap<>();
-        hashMap.put("name", mockUser.getName());
-//        when(requestBuilder.sendRequestResponse(anyString(), anyCollection())).thenReturn(response);
-//        try(MockedStatic<RequestBuilder> requestBuilderMockedStatic = Mockito.mockStatic(RequestBuilder.class)){
-//                requestBuilderMockedStatic.when(() -> RequestBuilder.sendRequestResponse(anyString(), mockHashMap)).thenReturn(response);
-//        }
+        ResponseEntity<String> response = ResponseEntity.ok().body(sampleToken);
+        try(MockedStatic<RequestBuilder> requestBuilderMockedStatic = Mockito.mockStatic(RequestBuilder.class)){
+               requestBuilderMockedStatic.when(() -> RequestBuilder.sendRequestResponse(anyString(), anyMap())).thenReturn(response);
+            ResponseEntity<String> response1 = oAuthService.loginUser(mockUser);
 
-        ResponseEntity<String> response1 = oAuthService.loginUser(mockUser);
+            assertEquals(response, response1);
+        }
+    }
 
-        assertEquals(response, response1);
+    // return 200 response if valid user is trying to authenticate
+    @Test
+    public void authenticateValidUser(){
+        ResponseEntity<String> expectedResponse = ResponseEntity.ok().body(mockUser.getName());
+        try(MockedStatic<RequestBuilder> requestBuilderMockedStatic = Mockito.mockStatic(RequestBuilder.class)){
+            requestBuilderMockedStatic.when(() -> RequestBuilder.sendRequestResponse(anyString(), anyString())).thenReturn(expectedResponse);
+            ResponseEntity<String> response = oAuthService.authenticate(sampleToken);
+            assertEquals(expectedResponse, response);
+        }
 
     }
 
+    // return 401 if unauthorized user is trying to authenticate
+    @Test
+    public void authenticateInvalidUser(){
+        ResponseEntity<String> expectedResponse = ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(mockUser.getName());
+        try(MockedStatic<RequestBuilder> requestBuilderMockedStatic = Mockito.mockStatic(RequestBuilder.class)){
+            requestBuilderMockedStatic.when(() -> RequestBuilder.sendRequestResponse(anyString(), anyString())).thenReturn(expectedResponse);
+            ResponseEntity<String> response = oAuthService.authenticate(sampleToken);
+            assertEquals(expectedResponse, response);
+        }
 
-    /*    public ResponseEntity<String> loginUser(User user) {
-        final String userName = user.getName();
-
-        if(userName == null) {
-            return null;
+    }
+    @Test
+    public void logoutUser(){
+        Map<String,Object> json = new HashMap<>();
+        json.put("message","ok");
+        //have to set token to the user - in this scenario we assume user is logged in
+        mockUser.setToken(sampleToken);
+        String jsonString = JSONBuilder.buildJSON(json);
+        ResponseEntity<String> expectedResponse = ResponseEntity.status(HttpStatus.OK).body(jsonString);
+        try(MockedStatic<RequestBuilder> requestBuilderMockedStatic = Mockito.mockStatic(RequestBuilder.class)){
+            requestBuilderMockedStatic.when(() -> RequestBuilder.sendRequestResponse(anyString(), anyMap())).thenReturn(expectedResponse);
+            ResponseEntity<String> response = oAuthService.logoutUser(mockUser);
+            assertEquals(expectedResponse, response);
         }
-        //HttpURLConnection con = RequestBuilder.createConnection(AUTH_URL);
-        HashMap<String, String> requestBody = new HashMap<>();
 
-        requestBody.put("name", userName);
 
-        return RequestBuilder.sendRequestResponse(AUTH_URL_LOGIN, requestBody);
     }
-     */
+