Updated BundlesServicetest

Author: TanyaEf

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceTest.java

@@ -6,6 +6,8 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import org.codehaus.jettison.json.JSONObject;
 import org.mockito.Mock;
@@ -56,21 +58,22 @@ public void should_return_proper_bundles_for_default_locale() throws Exception {
         //given
         String defaultLocale = Locale.getDefault().toString();
         mockStatic(JerseyRequest.class);
-        when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(JerseyRequest.buildRequest(eq(sessionStorageMock), any(GenericType.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(requestMock).when(requestMock).addParam(anyString(), anyString());
         doReturn(requestMock).when(requestMock).addHeader(anyString(), anyString());
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale(null).allBundles();
+        OperationResult<Map<String, Map<String, String>>> bundles = service.forLocale(null).allBundles();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
         verify(requestMock).addParam("expanded", "true");
         verify(requestMock).addHeader("Accept-Language", defaultLocale.replace('_', '-'));
         verify(requestMock).get();
         verifyStatic(times(1));
-        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), eq(new String[]{"/bundles"}), any(DefaultErrorHandler.class));
+        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(new GenericType<Map<String, Map<String, String>>>() {
+        }), eq(new String[]{"/bundles"}), any(DefaultErrorHandler.class));
         Locale locale = (Locale) Whitebox.getInternalState(service, "locale");
         assertEquals(locale.toString(), defaultLocale);
     }
@@ -80,21 +83,22 @@ public void should_return_proper_bundles_for_default_locale() throws Exception {
     public void should_return_proper_bundles_for_locale() throws Exception {
         //given
         mockStatic(JerseyRequest.class);
-        when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(JerseyRequest.buildRequest(eq(sessionStorageMock),any(GenericType.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(requestMock).when(requestMock).addParam(anyString(), anyString());
         doReturn(requestMock).when(requestMock).addHeader(anyString(), anyString());
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale("de").allBundles();
+        OperationResult<Map<String, Map<String, String>>> bundles = service.forLocale("de").allBundles();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
         verify(requestMock).addParam("expanded", "true");
         verify(requestMock).addHeader("Accept-Language", "de");
         verify(requestMock).get();
         verifyStatic(times(1));
-        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), eq(new String[]{"/bundles"}), any(DefaultErrorHandler.class));
+        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(new GenericType<Map<String, Map<String, String>>>() {
+        }), eq(new String[]{"/bundles"}), any(DefaultErrorHandler.class));
         Locale locale = (Locale) Whitebox.getInternalState(service, "locale");
         assertEquals(locale.toString(), "de");
     }
@@ -103,39 +107,41 @@ public void should_return_proper_bundles_for_locale() throws Exception {
     public void should_return_proper_bundles_by_name_for_locale() throws Exception {
         //given
         mockStatic(JerseyRequest.class);
-        when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(JerseyRequest.buildRequest(eq(sessionStorageMock), any(GenericType.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(requestMock).when(requestMock).addHeader(anyString(), anyString());
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale("de").bundle("jasperserver_messages");
+        OperationResult<Map<String, String>> bundle = service.forLocale("de").bundle("jasperserver_messages");
         //then
-        assertSame(bundles, operationResultMock);
+        assertSame(bundle, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
         verify(requestMock,never()).addParam("expanded", "true");
         verify(requestMock).addHeader("Accept-Language", "de");
         verify(requestMock).get();
         verifyStatic(times(1));
-        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), eq(new String[]{"/bundles", "jasperserver_messages"}), any(DefaultErrorHandler.class));
+        JerseyRequest.buildRequest(eq(sessionStorageMock),  eq(new GenericType<Map<String, String>>() {
+        }), eq(new String[]{"/bundles", "jasperserver_messages"}), any(DefaultErrorHandler.class));
     }
 
     @Test
     public void should_return_proper_bundles_by_name_for_default_locale() throws Exception {
         //given
         mockStatic(JerseyRequest.class);
-        when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(JerseyRequest.buildRequest(eq(sessionStorageMock),  any(GenericType.class), isA(String[].class), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(requestMock).when(requestMock).addHeader(anyString(), anyString());
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale(null).bundle("jasperserver_messages");
+        OperationResult<Map<String, String>> bundle = service.forLocale(null).bundle("jasperserver_messages");
         //then
-        assertSame(bundles, operationResultMock);
+        assertSame(bundle, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
         verify(requestMock,never()).addParam("expanded", "true");
         verify(requestMock).addHeader("Accept-Language", Locale.getDefault().toString().replace('_', '-'));
         verify(requestMock).get();
         verifyStatic(times(1));
-        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(JSONObject.class), eq(new String[]{"/bundles", "jasperserver_messages"}), any(DefaultErrorHandler.class));
+        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(new GenericType<Map<String, String>>() {
+        }), eq(new String[]{"/bundles", "jasperserver_messages"}), any(DefaultErrorHandler.class));
     }
 }