Skip to content

Commit 8914ea3

Browse files
author
TanyaEf
committed
Updated loading configuration from file, updeted configuration in integration tests
1 parent 62019fb commit 8914ea3

File tree

15 files changed

+91
-117
lines changed

15 files changed

+91
-117
lines changed

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerAttributesServiceIT.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes;
22

3-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
43
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
5-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
64
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
75
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
86
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.NullEntityOperationResult;
97
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
108
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttribute;
119
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ServerAttributesListWrapper;
10+
import java.util.List;
1211
import org.testng.Assert;
13-
import org.testng.annotations.AfterMethod;
14-
import org.testng.annotations.BeforeMethod;
12+
import org.testng.annotations.AfterClass;
13+
import org.testng.annotations.BeforeClass;
1514
import org.testng.annotations.Test;
1615

17-
import java.util.List;
18-
1916
import static java.util.Arrays.asList;
2017
import static org.hamcrest.core.IsInstanceOf.instanceOf;
2118

@@ -25,12 +22,9 @@ public class ServerAttributesServiceIT {
2522
private JasperserverRestClient client;
2623
private Session session;
2724

28-
@BeforeMethod
25+
@BeforeClass
2926
public void before() {
30-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
31-
config.setAcceptMimeType(MimeType.JSON);
32-
config.setContentMimeType(MimeType.JSON);
33-
config.setJrsVersion(JRSVersion.v6_0_1);
27+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
3428
client = new JasperserverRestClient(config);
3529
session = client.authenticate("superuser", "superuser");
3630
}
@@ -128,7 +122,7 @@ public void should_delete_attribute() {
128122
Assert.assertTrue(instanceOf(NullEntityOperationResult.class).matches(entity));
129123
}
130124

131-
@AfterMethod
125+
@AfterClass
132126
public void after() {
133127
session.logout();
134128
client = null;

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
44
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
55
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
6-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
7-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
86
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
97
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
108
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.TenantAttributesListWrapper;
119
import java.util.Arrays;
12-
import org.testng.annotations.AfterMethod;
13-
import org.testng.annotations.BeforeMethod;
10+
import org.testng.annotations.AfterClass;
11+
import org.testng.annotations.BeforeClass;
1412
import org.testng.annotations.Test;
1513

1614
import static org.testng.AssertJUnit.assertNotNull;
@@ -25,16 +23,10 @@ public class OrganizationsServiceIT {
2523
private JasperserverRestClient client;
2624
private Session session;
2725

28-
@BeforeMethod
26+
@BeforeClass
2927
public void before() {
30-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
31-
config.setAcceptMimeType(MimeType.JSON);
32-
config.setContentMimeType(MimeType.JSON);
33-
config.setJrsVersion(JRSVersion.v6_0_1);
34-
config.setLogHttp(true);
35-
config.setLogHttpEntity(true);
28+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
3629
client = new JasperserverRestClient(config);
37-
3830
session = client.authenticate("superuser", "superuser");
3931
}
4032

@@ -74,7 +66,7 @@ public void should_return_tenant_attributes() {
7466

7567
}
7668

77-
@AfterMethod
69+
@AfterClass
7870
public void after() {
7971
session.logout();
8072
}

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/UsersServiceIT.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
55
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
66
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
7-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
8-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
97
import java.util.List;
108
import org.testng.Assert;
11-
import org.testng.annotations.AfterMethod;
12-
import org.testng.annotations.BeforeMethod;
9+
import org.testng.annotations.AfterClass;
10+
import org.testng.annotations.BeforeClass;
1311
import org.testng.annotations.Test;
1412

1513
/**
@@ -21,16 +19,10 @@ public class UsersServiceIT {
2119
private JasperserverRestClient client;
2220
private Session session;
2321

24-
@BeforeMethod
22+
@BeforeClass
2523
public void before() {
26-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
27-
config.setAcceptMimeType(MimeType.JSON);
28-
config.setContentMimeType(MimeType.JSON);
29-
config.setJrsVersion(JRSVersion.v6_0_1);
30-
config.setLogHttp(true);
31-
24+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
3225
client = new JasperserverRestClient(config);
33-
3426
session = client.authenticate("superuser", "superuser");
3527
}
3628

@@ -67,7 +59,7 @@ public void should_return_list_users_by_role() {
6759
Assert.assertTrue(users.size() > 3);
6860
}
6961

70-
@AfterMethod
62+
@AfterClass
7163
public void after() {
7264
session.logout();
7365
session = null;

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
44
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
55
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
6-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
7-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
86
import java.util.Locale;
97
import java.util.Map;
10-
import org.testng.annotations.BeforeMethod;
8+
import org.testng.annotations.BeforeClass;
119
import org.testng.annotations.Test;
1210

1311
import static junit.framework.Assert.assertFalse;
@@ -24,14 +22,9 @@ public class BundlesServiceIT {
2422
private JasperserverRestClient client;
2523
private AnonymousSession session;
2624

27-
@BeforeMethod
25+
@BeforeClass
2826
public void before() {
29-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
30-
config.setAcceptMimeType(MimeType.JSON);
31-
config.setContentMimeType(MimeType.JSON);
32-
config.setJrsVersion(JRSVersion.v6_1_0);
33-
config.setLogHttp(true);
34-
config.setLogHttpEntity(true);
27+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
3528
client = new JasperserverRestClient(config);
3629
session = client.getAnonymousSession();
3730
}

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
import java.io.IOException;
1111
import java.io.InputStream;
1212
import java.io.OutputStream;
13-
import junit.framework.Assert;
14-
import org.testng.annotations.AfterMethod;
15-
import org.testng.annotations.BeforeMethod;
13+
import org.testng.annotations.AfterClass;
14+
import org.testng.annotations.BeforeClass;
1615
import org.testng.annotations.Test;
1716

17+
import static org.testng.AssertJUnit.assertNotNull;
18+
1819

1920
/**
2021
* @author Alex Krasnyanskiy
@@ -26,11 +27,9 @@ public class ReportingServiceIT {
2627
private JasperserverRestClient client;
2728
private Session session;
2829

29-
@BeforeMethod
30+
@BeforeClass
3031
public void before() {
31-
configuration = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
32-
configuration.setLogHttp(true);
33-
configuration.setLogHttpEntity(true);
32+
configuration = RestClientConfiguration.loadConfiguration("test_config.properties");
3433
client = new JasperserverRestClient(configuration);
3534
session = client.authenticate("superuser", "superuser");
3635
}
@@ -51,7 +50,7 @@ public void should_return_proper_entity_if_pass_pdf_report_output_format() {
5150

5251
InputStream entity = result.getEntity();
5352
/** Then **/
54-
Assert.assertNotNull(entity);
53+
assertNotNull(entity);
5554
}
5655

5756
@Test
@@ -68,7 +67,7 @@ public void should_return_proper_entity_() {
6867
.run();
6968
InputStream entity = result.getEntity();
7069
/** Then **/
71-
Assert.assertNotNull(entity);
70+
assertNotNull(entity);
7271
}
7372

7473
@Test
@@ -87,7 +86,7 @@ public void should_return_proper_entity_if_passed_number_of_pages_zero() {
8786

8887
InputStream entity = result.getEntity();
8988
/** Then **/
90-
Assert.assertNotNull(entity);
89+
assertNotNull(entity);
9190

9291
}
9392
@Test
@@ -105,7 +104,7 @@ public void should_return_proper_entity_if_pass_string_output_format() {
105104

106105
InputStream entity = result.getEntity();
107106
/** Then **/
108-
Assert.assertNotNull(entity);
107+
assertNotNull(entity);
109108

110109
}
111110

@@ -124,7 +123,7 @@ public void should_return_proper_entity_if_passed_wrong_number_of_pages() {
124123

125124
InputStream entity = result.getEntity();
126125
/** Then **/
127-
Assert.assertNotNull(entity);
126+
assertNotNull(entity);
128127

129128
}
130129

@@ -143,7 +142,7 @@ public void should_return_proper_entity_if_passed_all_wrong_number_of_pages() {
143142

144143
InputStream entity = result.getEntity();
145144
/** Then **/
146-
Assert.assertNotNull(entity);
145+
assertNotNull(entity);
147146

148147
}
149148

@@ -162,7 +161,7 @@ public void should_return_proper_entity_without_numbers_of_pages() {
162161

163162
InputStream entity = result.getEntity();
164163
/** Then **/
165-
Assert.assertNotNull(entity);
164+
assertNotNull(entity);
166165
}
167166

168167
@Test
@@ -180,7 +179,7 @@ public void should_return_proper_entity_with_page_range() {
180179

181180
InputStream entity = result.getEntity();
182181
/** Then **/
183-
Assert.assertNotNull(entity);
182+
assertNotNull(entity);
184183

185184
}
186185

@@ -200,7 +199,7 @@ public void should_return_proper_entity_in_async_mode() {
200199

201200
ReportExecutionDescriptor reportExecutionDescriptor = operationResult.getEntity();
202201
/** Then **/
203-
Assert.assertNotNull(reportExecutionDescriptor);
202+
assertNotNull(reportExecutionDescriptor);
204203
}
205204

206205
@Test
@@ -219,10 +218,10 @@ public void should_return_proper_entity_in_async_mode_if_format_is_string() {
219218

220219
ReportExecutionDescriptor reportExecutionDescriptor = operationResult.getEntity();
221220
/** Then **/
222-
Assert.assertNotNull(reportExecutionDescriptor);
221+
assertNotNull(reportExecutionDescriptor);
223222
}
224223

225-
@AfterMethod
224+
@AfterClass
226225
public void after() {
227226
client = null;
228227
configuration = null;

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources;
22

3-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
43
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
5-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
64
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
75
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
86
import java.io.ByteArrayInputStream;
97
import java.util.concurrent.TimeUnit;
108
import javax.ws.rs.core.Response;
119
import org.testng.Assert;
12-
import org.testng.annotations.AfterMethod;
13-
import org.testng.annotations.BeforeMethod;
10+
import org.testng.annotations.AfterClass;
11+
import org.testng.annotations.BeforeClass;
1412
import org.testng.annotations.Test;
1513

1614
/**
@@ -23,12 +21,9 @@ public class ResourcesServiceIT {
2321
private JasperserverRestClient client;
2422
private Session session;
2523

26-
@BeforeMethod
24+
@BeforeClass
2725
public void before() {
28-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
29-
config.setAcceptMimeType(MimeType.JSON);
30-
config.setContentMimeType(MimeType.JSON);
31-
config.setJrsVersion(JRSVersion.v6_0_1);
26+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
3227
client = new JasperserverRestClient(config);
3328
session = client.authenticate("superuser", "superuser");
3429
}
@@ -53,7 +48,7 @@ public void shouldDeleteAFolder() throws InterruptedException {
5348
Assert.assertNotNull(is);
5449
}
5550

56-
@AfterMethod
51+
@AfterClass
5752
public void after() {
5853
session.logout();
5954
session = null;

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
22

33
import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
4-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
54
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
6-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
75
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
86
import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.AwsSettings;
97
import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DashboardSettings;
@@ -17,8 +15,8 @@
1715
import java.util.List;
1816
import java.util.Map;
1917
import javax.ws.rs.core.GenericType;
20-
import org.testng.annotations.AfterMethod;
21-
import org.testng.annotations.BeforeMethod;
18+
import org.testng.annotations.AfterClass;
19+
import org.testng.annotations.BeforeClass;
2220
import org.testng.annotations.Test;
2321

2422
import static junit.framework.Assert.assertFalse;
@@ -35,14 +33,9 @@ public class SettingsServiceIT {
3533
private JasperserverRestClient client;
3634
private AnonymousSession session;
3735

38-
@BeforeMethod
36+
@BeforeClass
3937
public void before() {
40-
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
41-
config.setAcceptMimeType(MimeType.JSON);
42-
config.setContentMimeType(MimeType.JSON);
43-
config.setJrsVersion(JRSVersion.v6_0_0);
44-
config.setLogHttp(true);
45-
config.setLogHttpEntity(true);
38+
config = RestClientConfiguration.loadConfiguration("test_config.properties");
4639
client = new JasperserverRestClient(config);
4740
session = client.getAnonymousSession();
4841
}
@@ -399,7 +392,7 @@ public void should_return_settings_by_user_specified_string_key_of_group() {
399392
assertTrue(datePicker.containsKey("yearSuffix"));
400393
}
401394

402-
@AfterMethod
395+
@AfterClass
403396
public void after() {
404397
config = null;
405398
client = null;

0 commit comments

Comments
 (0)