Refactoring in integration tests

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/RestClientUnitTest.java

@@ -0,0 +1,12 @@
+package com.jaspersoft.jasperserver.jaxrs.client;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
+import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public abstract class RestClientUnitTest {
+    protected RestClientConfiguration configuration = RestClientConfiguration.loadConfiguration("test_config.properties");
+    protected JasperserverRestClient client = new JasperserverRestClient(configuration);
+}

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.NullEntityOperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
@@ -16,16 +15,12 @@
 import static java.util.Arrays.asList;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
-public class ServerAttributesServiceIT {
+public class ServerAttributesServiceIT extends RestClientUnitTest{
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.authenticate("superuser", "superuser");
     }
 
@@ -125,8 +120,6 @@ public void should_delete_attribute() {
     @AfterClass
     public void after() {
         session.logout();
-        client = null;
-        config = null;
         session = null;
     }
 }

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
@@ -16,17 +15,12 @@
 /**
  * @author Tetiana Iefimenko
  */
-public class OrganizationsServiceIT {
+public class OrganizationsServiceIT extends RestClientUnitTest{
 
-
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.authenticate("superuser", "superuser");
     }
 
@@ -54,21 +48,22 @@ public void should_create_tenant_attributes() {
     public void should_return_tenant_attributes() {
 
 
-        OperationResult<TenantAttributesListWrapper> result3 = session
+        OperationResult<TenantAttributesListWrapper> operationResult = session
                 .organizationsService()
                 .organization("myOrg1")
                 .attributes()
                 .get();
 
-        TenantAttributesListWrapper result = result3.getEntity();
-        assertNotNull(result3);
-        assertNotNull(result);
+        TenantAttributesListWrapper tenantAttributesListWrapper= operationResult.getEntity();
+        assertNotNull(operationResult);
+        assertNotNull(tenantAttributesListWrapper);
 
     }
 
     @AfterClass
     public void after() {
         session.logout();
+        session = null;
     }
 
 }

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import java.util.List;
 import org.testng.Assert;
@@ -13,25 +12,19 @@
 /**
  * @author Alexander Krasnyanskiy
  */
-public class UsersServiceIT {
+public class UsersServiceIT extends RestClientUnitTest{
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.authenticate("superuser", "superuser");
     }
 
     @Test
     public void shouldReturnAllUsers() {
 
-
          //When
-
         List<ClientUser> users = session
                 .usersService()
                 .allUsers()

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceIT.java

@@ -1,8 +1,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles;
 
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
-import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import java.util.Locale;
 import java.util.Map;
 import org.testng.annotations.BeforeClass;
@@ -16,16 +15,12 @@
  * @author Tetiana Iefimenko
  */
 
-public class BundlesServiceIT {
+public class BundlesServiceIT extends RestClientUnitTest {
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private AnonymousSession session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.getAnonymousSession();
     }
 

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.reports.ReportExecutionDescriptor;
@@ -21,16 +20,12 @@
  * @author Alex Krasnyanskiy
  * @author Tetiana Iefimenko
  */
-public class ReportingServiceIT {
+public class ReportingServiceIT extends RestClientUnitTest {
 
-    private RestClientConfiguration configuration;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        configuration = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(configuration);
         session = client.authenticate("superuser", "superuser");
     }
 
@@ -223,8 +218,7 @@ public void should_return_proper_entity_in_async_mode_if_format_is_string() {
 
     @AfterClass
     public void after() {
-        client = null;
-        configuration = null;
+        session.logout();
     }
 
     private void reportToPdf(InputStream entity) {

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import java.io.ByteArrayInputStream;
 import java.util.concurrent.TimeUnit;
@@ -15,16 +14,12 @@
  * @author Alexander Krasnyanskiy
  * @author tetiana Iefimenko
  */
-public class ResourcesServiceIT {
+public class ResourcesServiceIT extends RestClientUnitTest {
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.authenticate("superuser", "superuser");
     }
 

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceIT.java

@@ -1,8 +1,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
 
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
-import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.AwsSettings;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DashboardSettings;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DataSourcePatternsSettings;
@@ -15,7 +14,6 @@
 import java.util.List;
 import java.util.Map;
 import javax.ws.rs.core.GenericType;
-import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -27,16 +25,12 @@
 /**
  * @author Tetiana Iefimenko
  * */
-public class SettingsServiceIT {
+public class SettingsServiceIT extends RestClientUnitTest {
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private AnonymousSession session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.getAnonymousSession();
     }
 
@@ -391,10 +385,4 @@ public void should_return_settings_by_user_specified_string_key_of_group() {
         assertTrue(datePicker.containsKey("nextText"));
         assertTrue(datePicker.containsKey("yearSuffix"));
     }
-
-    @AfterClass
-    public void after() {
-        config = null;
-        client = null;
-    }
 }

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.core.JasperserverRestClient;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
 import com.jaspersoft.jasperserver.jaxrs.client.core.enums.RequestMethod;
 import java.io.IOException;
@@ -18,16 +17,12 @@
 /**
 * Integration tests for {@link ThumbnailsService}
 */
-public class ThumbnailsServiceIT {
+public class ThumbnailsServiceIT extends RestClientUnitTest {
 
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
     private Session session;
 
     @BeforeClass
     public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
         session = client.authenticate("superuser", "superuser");
     }
 
@@ -82,8 +77,6 @@ public void should_return_single_thumbnail_as_stream() throws IOException {
     @AfterClass
     public void after() {
         session.logout();
-        client = null;
-        config = null;
         session = null;
     }
 }

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClientIT.java

@@ -1,29 +1,19 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
 
+import com.jaspersoft.jasperserver.jaxrs.client.RestClientUnitTest;
 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.BeforeMethod;
 import org.testng.annotations.Test;
 
 import static org.testng.AssertJUnit.assertNotNull;
 
 /**
  * @author Tetiana Iefimenko
  */
-public class JasperserverRestClientIT {
-
-
-    private RestClientConfiguration config;
-    private JasperserverRestClient client;
-    Session session;
-
-    @BeforeMethod
-    public void before() {
-        config = RestClientConfiguration.loadConfiguration("test_config.properties");
-        client = new JasperserverRestClient(config);
-    }
+public class JasperserverRestClientIT extends RestClientUnitTest {
+    private  Session session;
 
     @Test
     public void should_return_session_via_j_sucurity_check() {
@@ -40,7 +30,7 @@ public void should_not_return_session_id_with_wrong_credentials_via_j_sucurity_c
 
     @Test
     public void should_return_session_via_basic_login() {
-        config.setAuthenticationType(AuthenticationType.BASIC);
+        configuration.setAuthenticationType(AuthenticationType.BASIC);
         session = client.authenticate("jasperadmin", "jasperadmin");
         assertNotNull(session);
     }