Apdated unti tests for Thumbnails service

TanyaEf · TanyaEf · commit 7bd3bb4add60 · 2015-09-17T12:41:42.000+03:00
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/BatchThumbnailAdapter.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/BatchThumbnailAdapter.java
@@ -38,8 +38,7 @@ public BatchThumbnailAdapter reports(String... uris) {
         return this;
     }
 
-    public BatchThumbnailAdapter
-    reports(Collection<String> uris) {
+    public BatchThumbnailAdapter reports(Collection<String> uris) {
         for (String uri : uris) {
             params.add("uri", uri);
         }
diff --git a/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/BatchThumbnailAdapterTest.java b/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/BatchThumbnailAdapterTest.java
@@ -3,13 +3,15 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RequestBuilder;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import com.jaspersoft.jasperserver.jaxrs.client.core.enums.RequestMethod;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.thumbnails.ResourceThumbnailListWrapper;
+import java.util.List;
+import javax.ws.rs.core.MultivaluedHashMap;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -19,15 +21,16 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import java.util.List;
-
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 
@@ -69,14 +72,13 @@ public void should_pass_session_storage_to_parent_adapter() {
      * for {@link BatchThumbnailAdapter#report(String)}
      */
     public void should_set_report_uri() {
-
-        /** Given **/
+        // Given
         BatchThumbnailAdapter thumbnailAdapter = new BatchThumbnailAdapter(sessionStorageMock);
 
-        /** When **/
+        // When
         BatchThumbnailAdapter retrieved = thumbnailAdapter.report("/public/Samples/Reports/07g.RevenueDetailReport");
 
-        /** Then **/
+        // Then
         MultivaluedHashMap<String, String> params =
                 (MultivaluedHashMap<String, String>) Whitebox.getInternalState(thumbnailAdapter, "params");
         List<String> list = params.get("uri");
@@ -90,16 +92,16 @@ public void should_set_report_uri() {
      */
     public void should_set_thumbnails_parameter() {
 
-        /** Given **/
+        // Given
         BatchThumbnailAdapter thumbnailAdapter = new BatchThumbnailAdapter(sessionStorageMock);
 
-        /** When **/
+        // When
         BatchThumbnailAdapter retrieved = thumbnailAdapter.defaultAllowed(true);
 
-        /** Then **/
+        // Then /
         MultivaluedHashMap<String, String> params =
                 (MultivaluedHashMap<String, String>) Whitebox.getInternalState(thumbnailAdapter, "params");
-        List<String> list = params.get("default_allowed");
+        List<String> list = params.get("defaultAllowed");
         assertSame(retrieved, thumbnailAdapter);
         assertEquals(list.get(0), Boolean.TRUE.toString());
     }
@@ -108,25 +110,64 @@ public void should_set_thumbnails_parameter() {
     /**
      * for {@link BatchThumbnailAdapter#get()}
      */
-    public void should_return_proper_operation_result() {
+    public void should_return_proper_operation_result_with_defualt_request_method() {
 
-        /** Given **/
-        PowerMockito.mockStatic(JerseyRequest.class);
-        Mockito.when(buildRequest(eq(sessionStorageMock), eq(ResourceThumbnailListWrapper.class), eq(new String[]{"/thumbnails"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
-        Mockito.when(jerseyRequestMock.setContentType("application/x-www-form-urlencoded")).thenReturn(requestBuilderMock);
-        Mockito.when(requestBuilderMock.post(any(MultivaluedHashMap.class))).thenReturn(operationResultMock);
+        // Given
+        mockStatic(JerseyRequest.class);
+        when(buildRequest(eq(sessionStorageMock), eq(ResourceThumbnailListWrapper.class), eq(new String[]{"/thumbnails"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
+        when(jerseyRequestMock.setContentType("application/x-www-form-urlencoded")).thenReturn(requestBuilderMock);
+        when(requestBuilderMock.post(any(MultivaluedHashMap.class))).thenReturn(operationResultMock);
 
         BatchThumbnailAdapter thumbnailAdapter = new BatchThumbnailAdapter(sessionStorageMock);
 
-        /** When **/
+        // When
         OperationResult<ResourceThumbnailListWrapper> retrieved = thumbnailAdapter.reports("/public/Samples/Reports/07g.RevenueDetailReport", "/public/Samples/Reports/03._Store_Segment_Performance_Report").get();
 
-        /** Then **/
+        // Then
+        Assert.assertNotNull(retrieved);
+        Assert.assertSame(retrieved, operationResultMock);
+        PowerMockito.verifyStatic(times(1));
+        buildRequest(eq(sessionStorageMock), eq(ResourceThumbnailListWrapper.class), eq(new String[]{"/thumbnails"}), any(DefaultErrorHandler.class));
+        verify(jerseyRequestMock).setContentType(eq("application/x-www-form-urlencoded"));
+        verify(requestBuilderMock).post(argument.capture());
+        verify(jerseyRequestMock, never()).addParams(argument.capture());
+        verify(requestBuilderMock, never()).get();
+        Assert.assertNotNull(argument.getValue());
+        Assert.assertTrue(argument.getValue().containsKey("uri"));
+        Assert.assertSame(argument.getValue().get("uri").get(0), "/public/Samples/Reports/07g.RevenueDetailReport");
+    }
+
+    @Test
+    /**
+     * for {@link BatchThumbnailAdapter#get()}
+     */
+    public void should_return_proper_operation_result_with_get_request_method() {
+
+        // Given
+        mockStatic(JerseyRequest.class);
+        when(buildRequest(eq(sessionStorageMock), eq(ResourceThumbnailListWrapper.class), eq(new String[]{"/thumbnails"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
+        when(jerseyRequestMock.setContentType("application/x-www-form-urlencoded")).thenReturn(requestBuilderMock);
+        when(jerseyRequestMock.addParams(any(MultivaluedHashMap.class))).thenReturn(requestBuilderMock);
+        when(requestBuilderMock.get()).thenReturn(operationResultMock);
+
+        BatchThumbnailAdapter thumbnailAdapter = new BatchThumbnailAdapter(sessionStorageMock);
+
+        // When
+        OperationResult<ResourceThumbnailListWrapper> retrieved = thumbnailAdapter
+                .reports("/public/Samples/Reports/07g.RevenueDetailReport",
+                        "/public/Samples/Reports/03._Store_Segment_Performance_Report")
+                .requestMethod(RequestMethod.GET)
+                .get();
+
+        // Then
         Assert.assertNotNull(retrieved);
         Assert.assertSame(retrieved, operationResultMock);
         PowerMockito.verifyStatic(times(1));
         buildRequest(eq(sessionStorageMock), eq(ResourceThumbnailListWrapper.class), eq(new String[]{"/thumbnails"}), any(DefaultErrorHandler.class));
-        Mockito.verify(requestBuilderMock).post(argument.capture());
+        verify(jerseyRequestMock, never()).setContentType(eq("application/x-www-form-urlencoded"));
+        verify(requestBuilderMock, never()).post(argument.capture());
+        verify(jerseyRequestMock).addParams(argument.capture());
+        verify(requestBuilderMock).get();
         Assert.assertNotNull(argument.getValue());
         Assert.assertTrue(argument.getValue().containsKey("uri"));
         Assert.assertSame(argument.getValue().get("uri").get(0), "/public/Samples/Reports/07g.RevenueDetailReport");
diff --git a/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/SingleThumbnailAdapterTest.java b/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/SingleThumbnailAdapterTest.java
@@ -5,29 +5,30 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import junit.framework.Assert;
+import java.io.InputStream;
+import java.util.List;
+import javax.ws.rs.core.MultivaluedHashMap;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import java.io.InputStream;
-import java.util.List;
-
 import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.verifyStatic;
+import static org.powermock.api.mockito.PowerMockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
+import static org.testng.AssertJUnit.assertNotNull;
 
 /**
  * Unit tests for {@link SingleThumbnailAdapter}
@@ -55,8 +56,10 @@ public void before() {
      * for {@link SingleThumbnailAdapter#SingleThumbnailAdapter(SessionStorage)}
      */
     public void should_pass_session_storage_to_parent_adapter() {
+        //When
         SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
         SessionStorage retrieved = thumbnailAdapter.getSessionStorage();
+        //Then
         assertSame(retrieved, sessionStorageMock);
     }
 
@@ -65,14 +68,13 @@ public void should_pass_session_storage_to_parent_adapter() {
      * for {@link SingleThumbnailAdapter#report(String)}
      */
     public void should_set_report_uri() {
-
-        /** Given **/
+        // Given
         SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
 
-        /** When **/
+        // When
         SingleThumbnailAdapter retrieved = thumbnailAdapter.report("/public/Samples/Reports/07g.RevenueDetailReport");
 
-        /** Then **/
+        // Then
         MultivaluedHashMap<String, String> params =
                 (MultivaluedHashMap<String, String>) Whitebox.getInternalState(thumbnailAdapter, "params");
         List<String> list = params.get("uri");
@@ -86,16 +88,16 @@ public void should_set_report_uri() {
      */
     public void should_set_thumbnails_parameter() {
 
-        /** Given **/
+        // Given
         SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
 
-        /** When **/
+        // When
         SingleThumbnailAdapter retrieved = thumbnailAdapter.defaultAllowed(true);
 
-        /** Then **/
+        // Then
         MultivaluedHashMap<String, String> params =
                 (MultivaluedHashMap<String, String>) Whitebox.getInternalState(thumbnailAdapter, "params");
-        List<String> list = params.get("default_allowed");
+        List<String> list = params.get("defaultAllowed");
         assertSame(retrieved, thumbnailAdapter);
         assertEquals(list.get(0), Boolean.TRUE.toString());
     }
@@ -106,32 +108,34 @@ public void should_set_thumbnails_parameter() {
      */
     public void should_return_proper_operation_result() {
 
-        /** Given **/
-        PowerMockito.mockStatic(JerseyRequest.class);
-        Mockito.when(buildRequest(
+        // Given
+        mockStatic(JerseyRequest.class);
+        when(buildRequest(
                 eq(sessionStorageMock),
                 eq(InputStream.class),
                 eq(new String[]{"/thumbnails/public/Samples/Reports/07g.RevenueDetailReport"}),
                 any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
-        Mockito.when(jerseyRequestMock.setAccept("image/jpeg")).thenReturn(requestBuilderMock);
-        Mockito.when(requestBuilderMock.get()).thenReturn(operationResultMock);
+        when(jerseyRequestMock.setAccept("image/jpeg")).thenReturn(requestBuilderMock);
+        when(requestBuilderMock.get()).thenReturn(operationResultMock);
         SingleThumbnailAdapter thumbnailAdapter = new SingleThumbnailAdapter(sessionStorageMock);
         thumbnailAdapter.report("/public/Samples/Reports/07g.RevenueDetailReport");
 
-
-        /** When **/
+        // When /
         OperationResult<InputStream> retrieved = thumbnailAdapter.get();
 
 
-        /** Then **/
-        Assert.assertNotNull(retrieved);
-        Assert.assertSame(retrieved, operationResultMock);
-        PowerMockito.verifyStatic(times(1));
+        // Then /
+        assertNotNull(retrieved);
+        assertSame(retrieved, operationResultMock);
+        verify(jerseyRequestMock).setAccept(eq("image/jpeg"));
+        verify(requestBuilderMock).get();
+        verifyStatic(times(1));
         buildRequest(
                 eq(sessionStorageMock),
                 eq(InputStream.class),
                 eq(new String[]{"/thumbnails/public/Samples/Reports/07g.RevenueDetailReport"}),
                 any(DefaultErrorHandler.class));
+
     }
 
     @AfterMethod
diff --git a/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/ThumbnailsServiceTest.java b/src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/ThumbnailsServiceTest.java
@@ -1,7 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.thumbnails;
 
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
-import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.AfterMethod;
@@ -37,8 +36,10 @@ public void before() {
      * for {@link ThumbnailsService#ThumbnailsService(SessionStorage)}
      */
     public void should_pass_session_storage_to_parent_adapter() {
+        // When
         ThumbnailsService thumbnailsService = new ThumbnailsService(sessionStorageMock);
         SessionStorage retrieved = thumbnailsService.getSessionStorage();
+        //Then
         assertSame(retrieved, sessionStorageMock);
     }
 
@@ -48,14 +49,14 @@ public void should_pass_session_storage_to_parent_adapter() {
      */
     public void should_invoke_proper_single_thumbnail_adapter_constructor_and_pass_proper_session_storage_instance() throws Exception {
 
-        /** Given **/
+        // Given
         whenNew(SingleThumbnailAdapter.class).withArguments(sessionStorageMock).thenReturn(singleThumbnailAdapterMock);
 
-        /** When **/
+        // When
         ThumbnailsService thumbnailsService = new ThumbnailsService(sessionStorageMock);
         SingleThumbnailAdapter retrieved = thumbnailsService.thumbnail();
 
-        /** Then **/
+        // Then
         assertNotNull(retrieved);
         assertSame(retrieved, singleThumbnailAdapterMock);
         verifyNew(SingleThumbnailAdapter.class, times(1)).withArguments(sessionStorageMock);
@@ -67,14 +68,14 @@ public void should_invoke_proper_single_thumbnail_adapter_constructor_and_pass_p
      */
     public void should_invoke_proper_batch_thumbnail_adapter_constructor_and_pass_proper_session_storage_instance() throws Exception {
 
-        /** Given **/
+        // Given
         whenNew(BatchThumbnailAdapter.class).withArguments(sessionStorageMock).thenReturn(batchThumbnailAdapterMock);
 
-        /** When **/
+        // When
         ThumbnailsService thumbnailsService = new ThumbnailsService(sessionStorageMock);
         BatchThumbnailAdapter retrieved = thumbnailsService.thumbnails();
 
-        /** Then **/
+        // Then
         assertNotNull(retrieved);
         assertSame(retrieved, batchThumbnailAdapterMock);
         verifyNew(BatchThumbnailAdapter.class, times(1)).withArguments(sessionStorageMock);

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public BatchThumbnailAdapter reports(String... uris) {`
`38`	`38`	`return this;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public BatchThumbnailAdapter`
`42`		`- reports(Collection<String> uris) {`
	`41`	`+ public BatchThumbnailAdapter reports(Collection<String> uris) {`
`43`	`42`	`for (String uri : uris) {`
`44`	`43`	`params.add("uri", uri);`
`45`	`44`	`}`