Resolved conflicts in ReportingServiceIT

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportingServiceIT.java

@@ -3,17 +3,21 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
 import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+<<<<<<< HEAD
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+=======
+import java.io.InputStream;
+>>>>>>> develop
 import junit.framework.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 /**
- * @author
- * @author tetiana Iefimenko
+ * @author Alex Krasnyanskiy
+ * @author Tetiana Iefimenko
  */
 public class ReportingServiceIT {
 
@@ -45,28 +49,6 @@ public void should_return_proper_entity_if_pass_jrprint_report_output_format() {
         /** Then **/
         Assert.assertNotNull(entity);
 
-        OutputStream output = null;
-        try {
-            output = new FileOutputStream("file.pdf");
-            int i = 0;
-            while (i != -1) {
-                i = entity.read();
-                output.write(i);
-                output.flush();
-
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-
-            try {
-                entity.close();
-                output.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
     }
 
     @AfterMethod

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SingleSettingsAdapter.java

@@ -78,15 +78,15 @@ public OperationResult<InputControlsSettings> ofInputControlsGroup() {
         return request(InputControlsSettings.class).get();
     }
 
-    private  <T> JerseyRequest<T> request(Class<T> resultClass) {
+    private <T> JerseyRequest<T> request(Class<T> resultClass) {
         return JerseyRequest.buildRequest(
                 sessionStorage,
                 resultClass,
                 new String[]{"/settings/" + groupKey},
                 new DefaultErrorHandler());
     }
 
-    private  <T> JerseyRequest<T> request(GenericType<T> genericType) {
+    private <T> JerseyRequest<T> request(GenericType<T> genericType) {
         return JerseyRequest.buildRequest(
                 sessionStorage,
                 genericType,

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClient.java

@@ -49,7 +49,7 @@ public AnonymousSession getAnonymousSession() {
         return new AnonymousSession(new SessionStorage(configuration, null));
     }
 
-    private void login(SessionStorage storage) {
+    protected void login(SessionStorage storage) {
 
         AuthenticationCredentials credentials = storage.getCredentials();
         WebTarget rootTarget = storage.getRootTarget();

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceTest.java

@@ -0,0 +1,29 @@
+package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
+import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockTestCase;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+@PrepareForTest({JerseyRequest.class})
+public class SettingsServiceTest extends PowerMockTestCase {
+
+    private SettingsService service =  new SettingsService(mock(SessionStorage.class));
+
+    @Test
+    public void should_return_proper_settings_adapter() throws Exception {
+        //when
+        SingleSettingsAdapter retrieved = service.settings();
+        //then
+        assertNotNull(retrieved);
+
+    }
+
+}