Refactoring in integration tests

TanyaEf · TanyaEf · commit 9c961573d0e8 · 2015-09-21T18:43:17.000+03:00
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ config.setAuthenticationType(AuthenticationType.SPRING);
 Or set authentication type in configuration file (for details, read section [Configuration](https://github.com/Jaspersoft/jrs-rest-java-client/blob/master/README.md#configuration)).
 Please notice, the basic authentication is not stateless and it is valid till method logout() is called or the application is restarted and you can not use this authentication type for Report Service, because all operations must be executed in the same session (for details, read section [Report services](https://github.com/Jaspersoft/jrs-rest-java-client/blob/master/README.md#report-services)).
 ###Anonymous session
-For some Jasperserver services authentication is not required (for example, settings service and server info service), so you can use anonymous session:
+For some Jasperserver services authentication is not required (for example, settings service, bundles service or server info service), so you can use anonymous session:
  ```java
 AnonymousSession session = client.getAnonymousSession();
 ```
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/RestClientTestUtil.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/RestClientTestUtil.java
@@ -0,0 +1,23 @@
+package com.jaspersoft.jasperserver.jaxrs.client;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
+import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public abstract class RestClientTestUtil {
+    protected  RestClientConfiguration configuration;
+    protected  JasperserverRestClient client;
+    protected Session session;
+
+    protected void initClient() {
+        configuration = RestClientConfiguration.loadConfiguration("test_config.properties");
+        client = new JasperserverRestClient(configuration);
+    }
+
+    protected void initSession() {
+        session = client.authenticate("superuser", "superuser");
+    }
+}
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/RestClientUnitTest.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/RestClientUnitTest.java
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerAttributesServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerAttributesServiceIT.java
@@ -1,7 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.NullEntityOperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttribute;
@@ -15,13 +14,13 @@
 import static java.util.Arrays.asList;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
-public class ServerAttributesServiceIT extends RestClientUnitTest{
+public class ServerAttributesServiceIT extends RestClientTestUtil {
 
-    private Session session;
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
     @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java
@@ -1,7 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.TenantAttributesListWrapper;
@@ -15,13 +14,13 @@
 /**
  * @author Tetiana Iefimenko
  */
-public class OrganizationsServiceIT extends RestClientUnitTest{
+public class OrganizationsServiceIT extends RestClientTestUtil {
 
-    private Session session;
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
 
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/UsersServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/UsersServiceIT.java
@@ -1,8 +1,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.users;
 
 import com.jaspersoft.jasperserver.dto.authority.ClientUser;
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import java.util.List;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -12,13 +11,13 @@
 /**
  * @author Alexander Krasnyanskiy
  */
-public class UsersServiceIT extends RestClientUnitTest{
+public class UsersServiceIT extends RestClientTestUtil {
 
-    private Session session;
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
     @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceIT.java
@@ -1,6 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
 import java.util.Locale;
 import java.util.Map;
@@ -15,13 +15,19 @@
  * @author Tetiana Iefimenko
  */
 
-public class BundlesServiceIT extends RestClientUnitTest {
+public class BundlesServiceIT extends RestClientTestUtil {
 
     private AnonymousSession session;
 
+    @Override
+    public void initSession() {
+        session = client.getAnonymousSession();
+    }
+
     @BeforeClass
     public void before() {
-        session = client.getAnonymousSession();
+        initClient();
+        initSession();
     }
 
      @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportingServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportingServiceIT.java
@@ -1,7 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.reporting;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.ReportExecutionDescriptor;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.ReportExecutionRequest;
@@ -20,13 +19,13 @@
  * @author Alex Krasnyanskiy
  * @author Tetiana Iefimenko
  */
-public class ReportingServiceIT extends RestClientUnitTest {
+public class ReportingServiceIT extends RestClientTestUtil {
 
-    private Session session;
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
     @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java
@@ -1,7 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import java.io.ByteArrayInputStream;
 import java.util.concurrent.TimeUnit;
 import javax.ws.rs.core.Response;
@@ -14,13 +13,12 @@
  * @author Alexander Krasnyanskiy
  * @author tetiana Iefimenko
  */
-public class ResourcesServiceIT extends RestClientUnitTest {
-
-    private Session session;
+public class ResourcesServiceIT extends RestClientTestUtil {
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
 
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceIT.java
@@ -1,6 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.AwsSettings;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DashboardSettings;
@@ -25,13 +25,19 @@
 /**
  * @author Tetiana Iefimenko
  * */
-public class SettingsServiceIT extends RestClientUnitTest {
+public class SettingsServiceIT extends RestClientTestUtil {
 
     private AnonymousSession session;
 
+    @Override
+    public void initSession() {
+        session = client.getAnonymousSession();
+    }
+
     @BeforeClass
     public void before() {
-        session = client.getAnonymousSession();
+        initClient();
+        initSession();
     }
 
     @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/ThumbnailsServiceIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/thumbnails/ThumbnailsServiceIT.java
@@ -1,8 +1,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.thumbnails;
 
 import com.jaspersoft.jasperserver.dto.thumbnails.ResourceThumbnail;
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.RequestMethod;
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,13 +16,12 @@
 /**
 * Integration tests for {@link ThumbnailsService}
 */
-public class ThumbnailsServiceIT extends RestClientUnitTest {
-
-    private Session session;
+public class ThumbnailsServiceIT extends RestClientTestUtil {
 
     @BeforeClass
     public void before() {
-        session = client.authenticate("superuser", "superuser");
+        initClient();
+        initSession();
     }
 
     @Test
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClientIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClientIT.java
@@ -1,19 +1,24 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
 
-import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.JSClientWebException;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.testng.AssertJUnit.assertNotNull;
 
 /**
  * @author Tetiana Iefimenko
  */
-public class JasperserverRestClientIT extends RestClientUnitTest {
-    private  Session session;
+public class JasperserverRestClientIT extends RestClientTestUtil {
+
+    @BeforeClass
+    public void before() {
+        initClient();
+    }
 
     @Test
     public void should_return_session_via_j_sucurity_check() {
diff --git a/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/RestClientConfigurationIT.java b/src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/RestClientConfigurationIT.java
@@ -1,5 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientTestUtil;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
 import org.testng.annotations.AfterMethod;
@@ -13,48 +14,46 @@
 /**
  * @author Tetiana Iefimenko
  */
-public class RestClientConfigurationIT {
+public class RestClientConfigurationIT extends RestClientTestUtil {
 
-    private RestClientConfiguration config;
 
     @Test
     public void should_load_configuration_from_file() {
 
         // When
-
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
+        configuration = RestClientConfiguration.loadConfiguration("test_config.properties");
         // Then
-        assertNotNull(config);
-        assertNotNull(config.getJasperReportsServerUrl());
-        assertNotNull(config.getJrsVersion());
-        assertNotNull(config.getAuthenticationType());
-        assertNotNull(config.getRestrictedHttpMethods());
-        assertNotNull(config.getLogHttp());
-        assertNotNull(config.getLogHttpEntity());
-        assertNotNull(config.getAcceptMimeType());
-        assertNotNull(config.getContentMimeType());
-        assertTrue(config.getLogHttp());
-        assertTrue(config.getLogHttpEntity());
-        assertFalse(config.getRestrictedHttpMethods());
-        assertFalse(config.getRestrictedHttpMethods());
-        assertFalse(config.getRestrictedHttpMethods());
-        assertEquals(config.getJasperReportsServerUrl(), "http://localhost:4444/jasperserver-pro");
-        assertEquals(config.getJrsVersion(), JRSVersion.v6_1_0);
-        assertEquals(config.getAuthenticationType(), AuthenticationType.SPRING);
+        assertNotNull(configuration);
+        assertNotNull(configuration.getJasperReportsServerUrl());
+        assertNotNull(configuration.getJrsVersion());
+        assertNotNull(configuration.getAuthenticationType());
+        assertNotNull(configuration.getRestrictedHttpMethods());
+        assertNotNull(configuration.getLogHttp());
+        assertNotNull(configuration.getLogHttpEntity());
+        assertNotNull(configuration.getAcceptMimeType());
+        assertNotNull(configuration.getContentMimeType());
+        assertTrue(configuration.getLogHttp());
+        assertTrue(configuration.getLogHttpEntity());
+        assertFalse(configuration.getRestrictedHttpMethods());
+        assertFalse(configuration.getRestrictedHttpMethods());
+        assertFalse(configuration.getRestrictedHttpMethods());
+        assertEquals(configuration.getJasperReportsServerUrl(), "http://localhost:4444/jasperserver-pro");
+        assertEquals(configuration.getJrsVersion(), JRSVersion.v6_1_0);
+        assertEquals(configuration.getAuthenticationType(), AuthenticationType.SPRING);
     }
 
 
     @Test
     public void should_return_empty_configuration() {
         // When
-            config = RestClientConfiguration.loadConfiguration("wrong_path");
+            configuration = RestClientConfiguration.loadConfiguration("wrong_path");
         //Then
-        assertEquals(config.getJasperReportsServerUrl(), null);
+        assertEquals(configuration.getJasperReportsServerUrl(), null);
     }
 
    @AfterMethod
     public void afterTest() {
-        config = null;
+        configuration = null;
     }
 
 }
