Skip to content

Commit 4729c93

Browse files
yaroslav-kovalchykyaroslav-kovalchyk
committed
Merge pull request #96 from TanyaEf/master
Refactored SettingsService
2 parents 7f4ff65 + 81b4c32 commit 4729c93

22 files changed

+2644
-50
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ public class UsersServiceIT {
2020

2121
@BeforeMethod
2222
public void before() {
23-
RestClientConfiguration cfg = new RestClientConfiguration("http://localhost:8085");
23+
RestClientConfiguration cfg = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
2424
JasperserverRestClient client = new JasperserverRestClient(cfg);
25-
session = client.authenticate("jasperadmin", "jasperadmin");
25+
session = client.authenticate("superuser", "superuser");
2626
}
2727

2828
@Test
2929
public void shouldReturnAllUsers() {
3030

31-
// When
31+
// When
3232
List<ClientUser> users = session
3333
.usersService()
3434
.allUsers()
3535
.get()
3636
.getEntity()
3737
.getUserList();
3838

39-
// Then
39+
// Then
4040
Assert.assertTrue(users.size() > 3);
4141
}
4242

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

Lines changed: 286 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
import com.jaspersoft.jasperserver.jaxrs.client.core.MimeType;
66
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
77
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
8+
import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.*;
89
import org.testng.annotations.AfterMethod;
910
import org.testng.annotations.BeforeMethod;
1011
import org.testng.annotations.Test;
1112

13+
import javax.ws.rs.core.GenericType;
14+
import java.util.List;
1215
import java.util.Map;
1316

14-
import static com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings.SingleSettingsAdapter.ServerSettingsGroup.GLOBAL_CONFIGURATION;
15-
import static com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings.SingleSettingsAdapter.ServerSettingsGroup.REQUEST;
1617
import static junit.framework.Assert.assertFalse;
1718
import static junit.framework.Assert.assertNotNull;
1819
import static junit.framework.Assert.assertSame;
@@ -41,14 +42,264 @@ public void should_return_settings_by_request_group() {
4142
final Map settings = session
4243
.settingsService()
4344
.settings()
44-
.group(REQUEST)
45+
.group("request", Map.class)
4546
.getEntity();
4647

4748
// Then
4849
assertNotNull(settings);
4950
assertFalse(settings.isEmpty());
5051
}
5152

53+
@Test
54+
public void should_return_requestSettings_dto() {
55+
56+
// When
57+
final RequestSettings settings = session
58+
.settingsService()
59+
.settings()
60+
.ofRequestGroup()
61+
.getEntity();
62+
63+
// Then
64+
assertNotNull(settings);
65+
assertNotNull(settings.getContextPath());
66+
assertNotNull(settings.getMaxInactiveInterval());
67+
}
68+
69+
@Test
70+
public void should_return_settings_by_dataSourcePatterns() {
71+
72+
// When
73+
final Map settings = session
74+
.settingsService()
75+
.settings()
76+
.group("dataSourcePatterns", Map.class)
77+
.getEntity();
78+
79+
// Then
80+
assertNotNull(settings);
81+
assertFalse(settings.isEmpty());
82+
}
83+
84+
@Test
85+
public void should_return_dataSourcePatternsSettings_dto() {
86+
87+
// When
88+
final DataSourcePatternsSettings settings = session
89+
.settingsService()
90+
.settings()
91+
.ofDataSourcePatternsGroup()
92+
.getEntity();
93+
94+
// Then
95+
assertNotNull(settings);
96+
assertNotNull(settings.getAttributePlaceholderPattern());
97+
assertNotNull(settings.getDynamicUrlPartPattern());
98+
assertNotNull(settings.getDbHost());
99+
assertNotNull(settings.getDbName());
100+
assertNotNull(settings.getDbPort());
101+
}
102+
103+
@Test
104+
public void should_return_settings_by_awsSettings() {
105+
106+
// When
107+
final Map settings = session
108+
.settingsService()
109+
.settings()
110+
.group("awsSettings", Map.class)
111+
.getEntity();
112+
113+
// Then
114+
assertNotNull(settings);
115+
assertFalse(settings.isEmpty());
116+
}
117+
118+
@Test
119+
public void should_return_awsSettings_dto() {
120+
121+
// When
122+
final AwsSettings settings = session
123+
.settingsService()
124+
.settings()
125+
.ofAwsGroup()
126+
.getEntity();
127+
128+
// Then
129+
assertNotNull(settings);
130+
assertNotNull(settings.getAwsRegions());
131+
}
132+
133+
@Test
134+
public void should_return_settings_by_decimalFormatSymbols() {
135+
136+
// When
137+
final Map settings = session
138+
.settingsService()
139+
.settings()
140+
.group("decimalFormatSymbols", Map.class)
141+
.getEntity();
142+
143+
// Then
144+
assertNotNull(settings);
145+
assertFalse(settings.isEmpty());
146+
}
147+
148+
@Test
149+
public void should_return_decimalFormatSymbolsSettings_dto() {
150+
151+
// When
152+
final DecimalFormatSymbolsSettings settings = session
153+
.settingsService()
154+
.settings()
155+
.ofDecimalFormatSymbolsGroup()
156+
.getEntity();
157+
158+
// Then
159+
assertNotNull(settings);
160+
assertNotNull(settings.getDecimalSeparator());
161+
assertNotNull(settings.getCurrency());
162+
assertNotNull(settings.getMinusSign());
163+
assertNotNull(settings.getInfinity());
164+
}
165+
166+
@Test
167+
public void should_return_settings_by_dateTimeSettings() {
168+
169+
// When
170+
final Map settings = session
171+
.settingsService()
172+
.settings()
173+
.group("dateTimeSettings", Map.class)
174+
.getEntity();
175+
176+
// Then
177+
assertNotNull(settings);
178+
assertFalse(settings.isEmpty());
179+
}
180+
181+
@Test
182+
public void should_return_list_of_dateTimeSettings_dto() {
183+
184+
// When
185+
final DateTimeSettings settings = session
186+
.settingsService()
187+
.settings()
188+
.ofDateTimeGroup()
189+
.getEntity();
190+
191+
// Then
192+
assertNotNull(settings);
193+
assertNotNull(settings.getDatepicker());
194+
assertNotNull(settings.getTimepicker());
195+
}
196+
197+
@Test
198+
public void should_return_settings_by_userTimeZone() {
199+
200+
// When
201+
final List settings = session
202+
.settingsService()
203+
.settings()
204+
.group("userTimeZones", List.class)
205+
.getEntity();
206+
207+
// Then
208+
assertNotNull(settings);
209+
assertFalse(settings.isEmpty());
210+
}
211+
212+
@Test
213+
public void should_return_list_of_userTimeZone_dto() {
214+
215+
// When
216+
final List<UserTimeZone> settings = session
217+
.settingsService()
218+
.settings()
219+
.ofUserTimeZonesGroup()
220+
.getEntity();
221+
222+
// Then
223+
assertNotNull(settings);
224+
assertTrue(settings.size() > 0);
225+
}
226+
227+
@Test
228+
public void should_return_list_of_userTimeZone_dto_by_genericType() {
229+
230+
// When
231+
final List<UserTimeZone> settings = session
232+
.settingsService()
233+
.settings()
234+
.group("userTimeZones", new GenericType<List<UserTimeZone>>(){})
235+
.getEntity();
236+
237+
// Then
238+
assertNotNull(settings);
239+
assertTrue(settings.size() > 0);
240+
}
241+
242+
@Test
243+
public void should_return_settings_by_dashboardSettings() {
244+
245+
// When
246+
final Map settings = session
247+
.settingsService()
248+
.settings()
249+
.group("dashboardSettings", Map.class)
250+
.getEntity();
251+
252+
// Then
253+
assertNotNull(settings);
254+
assertFalse(settings.isEmpty());
255+
}
256+
257+
@Test
258+
public void should_return_list_of_dashboardSettings_dto() {
259+
260+
// When
261+
final DashboardSettings settings = session
262+
.settingsService()
263+
.settings()
264+
.ofDashboardGroup()
265+
.getEntity();
266+
267+
// Then
268+
assertNotNull(settings);
269+
assertNotNull(settings.getNewItemsRegistry());
270+
assertTrue(settings.getNewItemsRegistry().size() > 0);
271+
}
272+
273+
@Test
274+
public void should_return_settings_by_inputControls() {
275+
276+
// When
277+
final Map settings = session
278+
.settingsService()
279+
.settings()
280+
.group("inputControls", Map.class)
281+
.getEntity();
282+
283+
// Then
284+
assertNotNull(settings);
285+
assertFalse(settings.isEmpty());
286+
}
287+
288+
@Test
289+
public void should_return_list_of_inputControlsSettings_dto() {
290+
291+
// When
292+
final InputControlsSettings settings = session
293+
.settingsService()
294+
.settings()
295+
.ofInputControlsGroup()
296+
.getEntity();
297+
298+
// Then
299+
assertNotNull(settings);
300+
assertNotNull(settings.getUseUrlParametersOnReset());
301+
}
302+
52303
@Test
53304
@SuppressWarnings("unchecked")
54305
public void should_return_settings_by_global_configuration_group() {
@@ -60,7 +311,7 @@ public void should_return_settings_by_global_configuration_group() {
60311
final Map settings = session
61312
.settingsService()
62313
.settings()
63-
.group(GLOBAL_CONFIGURATION)
314+
.group("globalConfiguration", Map.class)
64315
.getEntity();
65316

66317
// Then
@@ -82,6 +333,36 @@ public void should_return_settings_by_global_configuration_group() {
82333
assertTrue(allFileResourceTypes.containsValue("Content Resource"));
83334
}
84335

336+
@Test
337+
public void should_return_list_of_globalConfigurationSettings_dto() {
338+
339+
// When
340+
final GlobalConfigurationSettings settings = session
341+
.settingsService()
342+
.settings()
343+
.ofGlobalConfigurationGroup()
344+
.getEntity();
345+
346+
// Then
347+
assertNotNull(settings);
348+
assertNotNull(settings.getAllFileResourceTypes());
349+
assertNotNull(settings.getCalendarInputJsp());
350+
assertNotNull(settings.getCurrentYearDateFormat());
351+
assertNotNull(settings.getDateFormat());
352+
assertNotNull(settings.getDefaultDomainDependentsBlockAndUpdate());
353+
assertNotNull(settings.getDefaultDomainDependentsUseACL());
354+
assertNotNull(settings.getDefaultRole());
355+
assertNotNull(settings.getDefaultDontUpdateDomainDependents());
356+
assertNotNull(settings.getEntitiesPerPage());
357+
assertNotNull(settings.getEmailRegExpPattern());
358+
assertNotNull(settings.getAllFileResourceTypes());
359+
assertNotNull(settings.getViewReportsFilterList());
360+
assertNotNull(settings.getOutputFolderFilterPatterns());
361+
assertNotNull(settings.getOutputFolderFilterList());
362+
assertNotNull(settings.getMessages());
363+
assertNotNull(settings.getDataSourceTypes());
364+
}
365+
85366
@Test
86367
public void should_return_settings_by_user_specified_string_key_of_group() {
87368

@@ -91,7 +372,7 @@ public void should_return_settings_by_user_specified_string_key_of_group() {
91372
final Map settings = session
92373
.settingsService()
93374
.settings()
94-
.group("dateTimeSettings")
375+
.group("dateTimeSettings", Map.class)
95376
.getEntity();
96377

97378
/**

0 commit comments

Comments
 (0)