Skip to content

Commit e42eaf0

Browse files
author
TanyaEf
committed
Restored OrganizationsServiceTest
1 parent 6b21d09 commit e42eaf0

File tree

4 files changed

+246
-133
lines changed

4 files changed

+246
-133
lines changed

‎README.md‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,16 +1587,36 @@ String edition = result.getEntity();
15871587
###Bundles service
15881588
Use bundles service to get bundles of internalization properties for particular or default user’s locale as JSON. To get all bundles for particular locale(foe example, "de") use the code below:
15891589
```java
1590-
final JSONObject bundles = session
1590+
final Map<String, Map<String, String>> bundles = session
15911591
.bundlesService()
15921592
.forLocale("de")
15931593
.allBundles()
15941594
.getEntity();
15951595
```
1596-
If you pass `null` in `.forLocale()` method, you will get bundles for your default locale.
1596+
or specify locale as instance of `java.util.Locale.class` or as constant of this class:
1597+
```java
1598+
final Map<String, Map<String, String>> bundles = session
1599+
.bundlesService()
1600+
.forLocale(Locale.US)
1601+
.allBundles()
1602+
.getEntity();
1603+
1604+
final Map<String, Map<String, String>> bundles = session
1605+
.bundlesService()
1606+
.forLocale(new Locale("en_US"))
1607+
.allBundles()
1608+
.getEntity();
1609+
```
1610+
If you do not call`.forLocale()` method, you will get bundles for your default locale:
1611+
```java
1612+
final Map<String, Map<String, String>> bundles = session
1613+
.bundlesService()
1614+
.allBundles()
1615+
.getEntity();
1616+
```
15971617
To get bundle by name you should specified locale in `.forLocale()` method and name of the bundle in `.bundles()` method:
15981618
```java
1599-
final JSONObject bundle = session
1619+
final Map<String, String> bundle = session
16001620
.bundlesService()
16011621
.forLocale("en_US")
16021622
.bundle("jasperserver_messages")

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

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
66
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
77
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
8+
import java.util.Locale;
89
import java.util.Map;
910
import org.testng.annotations.BeforeMethod;
1011
import org.testng.annotations.Test;
@@ -41,7 +42,6 @@ public void should_return_all_bundles_for_default_locale() {
4142
// When
4243
final Map<String, Map<String, String>> bundles = session
4344
.bundlesService()
44-
.forLocale(null)
4545
.allBundles()
4646
.getEntity();
4747

@@ -52,7 +52,7 @@ public void should_return_all_bundles_for_default_locale() {
5252
}
5353

5454
@Test
55-
public void should_return_all_bundles_for_specified_locale() {
55+
public void should_return_all_bundles_for_specified_string_locale() {
5656

5757
// When
5858
final Map<String, Map<String, String>> bundles = session
@@ -68,7 +68,23 @@ public void should_return_all_bundles_for_specified_locale() {
6868
}
6969

7070
@Test
71-
public void should_return__bundle_by_name_for_specified_locale() {
71+
public void should_return_all_bundles_for_specified_locale() {
72+
73+
// When
74+
final Map<String, Map<String, String>> bundles = session
75+
.bundlesService()
76+
.forLocale(new Locale("de"))
77+
.allBundles()
78+
.getEntity();
79+
80+
// Then
81+
assertNotNull(bundles);
82+
assertFalse(bundles.size() == 0);
83+
assertTrue(bundles.containsKey("jasperserver_config"));
84+
}
85+
86+
@Test
87+
public void should_return__bundle_by_name_for_specified_string_locale() {
7288

7389
// When
7490
final Map<String, String> bundle = session
@@ -83,13 +99,44 @@ public void should_return__bundle_by_name_for_specified_locale() {
8399
assertTrue(bundle.containsKey("logCollectors.form.resourceUri.hint"));
84100
}
85101

102+
@Test
103+
public void should_return__bundle_by_name_for_specified_locale() {
104+
105+
// When
106+
final Map<String, String> bundle = session
107+
.bundlesService()
108+
.forLocale(new Locale("en_US"))
109+
.bundle("jasperserver_messages")
110+
.getEntity();
111+
112+
// Then
113+
assertNotNull(bundle);
114+
assertFalse(bundle.size() == 0);
115+
assertTrue(bundle.containsKey("logCollectors.form.resourceUri.hint"));
116+
}
117+
118+
@Test
119+
public void should_return__bundle_by_name_for_specified_as_constant_locale() {
120+
121+
// When
122+
final Map<String, String> bundle = session
123+
.bundlesService()
124+
.forLocale(Locale.US)
125+
.bundle("jasperserver_messages")
126+
.getEntity();
127+
128+
// Then
129+
assertNotNull(bundle);
130+
assertFalse(bundle.size() == 0);
131+
assertTrue(bundle.containsKey("logCollectors.form.resourceUri.hint"));
132+
}
133+
86134
@Test
87135
public void should_return__bundle_by_name_for_default_locale() {
88136

89137
// When
90138
final Map<String, String> bundle = session
91139
.bundlesService()
92-
.forLocale(null)
93140
.bundle("jasperserver_messages")
94141
.getEntity();
95142

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceTest.java‎

Lines changed: 122 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,122 @@
1-
//package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
2-
//
3-
//import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
4-
//import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
5-
//import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
6-
//import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
7-
//import com.jaspersoft.jasperserver.jaxrs.client.dto.authority.Organization;
8-
//import junit.framework.Assert;
9-
//import org.mockito.Mock;
10-
//import org.mockito.Mockito;
11-
//import org.powermock.api.mockito.PowerMockito;
12-
//import org.powermock.core.classloader.annotations.PrepareForTest;
13-
//import org.powermock.modules.testng.PowerMockTestCase;
14-
//import org.testng.annotations.AfterMethod;
15-
//import org.testng.annotations.BeforeMethod;
16-
//import org.testng.annotations.Test;
17-
//
18-
//import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
19-
//import static org.mockito.Matchers.any;
20-
//import static org.mockito.Matchers.eq;
21-
//import static org.mockito.Mockito.reset;
22-
//import static org.mockito.Mockito.times;
23-
//import static org.mockito.MockitoAnnotations.initMocks;
24-
//import static org.powermock.api.mockito.PowerMockito.whenNew;
25-
//import static org.testng.AssertJUnit.assertSame;
26-
//
27-
//@PrepareForTest({OrganizationsService.class,JerseyRequest.class})
28-
//public class OrganizationsServiceTest extends PowerMockTestCase {
29-
//
30-
// @Mock
31-
// private SessionStorage sessionStorageMock;
32-
// @Mock
33-
// private BatchOrganizationsAdapter batchOrganizationsAdapter;
34-
// @Mock
35-
// private SingleOrganizationAdapter singleOrganizationAdapter;
36-
// @Mock
37-
// private JerseyRequest<Organization> jerseyRequestMock;
38-
// @Mock
39-
// private OperationResult<Organization> operationResultMock;
40-
//
41-
// @BeforeMethod
42-
// public void before() {
43-
// initMocks(this);
44-
// }
45-
//
46-
// @Test
47-
// public void should_return_proper_instance_of_BatchOrganizationsAdapter() throws Exception {
48-
//
49-
// // Given
50-
// whenNew(BatchOrganizationsAdapter.class).withArguments(sessionStorageMock).thenReturn(batchOrganizationsAdapter);
51-
// OrganizationsService service = new OrganizationsService(sessionStorageMock);
52-
//
53-
// // When
54-
// BatchOrganizationsAdapter retrieved = service.organizations();
55-
//
56-
// // Then
57-
// assertSame(retrieved, batchOrganizationsAdapter);
58-
// }
59-
//
60-
// @Test
61-
// public void should_return_proper_instance_of_SingleOrganizationAdapter() throws Exception {
62-
//
63-
// // Given
64-
// whenNew(SingleOrganizationAdapter.class).withArguments(sessionStorageMock, "orgId").thenReturn(singleOrganizationAdapter);
65-
// OrganizationsService service = new OrganizationsService(sessionStorageMock);
66-
//
67-
// // When
68-
// SingleOrganizationAdapter retrieved = service.organization("orgId");
69-
//
70-
// // Then
71-
// assertSame(retrieved, singleOrganizationAdapter);
72-
// }
73-
//
74-
// @Test(expectedExceptions = IllegalArgumentException.class)
75-
// public void should_throw_exception() throws Exception {
76-
//
77-
// // Given
78-
// OrganizationsService service = new OrganizationsService(sessionStorageMock);
79-
//
80-
// // When
81-
// service.organization("");
82-
// }
83-
//
84-
//
85-
// @Test
86-
// public void should_delete_organization() {
87-
//
88-
// /** Given **/
89-
// PowerMockito.mockStatic(JerseyRequest.class);
90-
// Mockito.when(buildRequest(
91-
// eq(sessionStorageMock),
92-
// eq(Organization.class),
93-
// eq(new String[]{"/organizations", "MyOrg"}),
94-
// any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
95-
// Mockito.when(jerseyRequestMock.delete()).thenReturn(operationResultMock);
96-
//
97-
//
98-
// /** When **/
99-
// SingleOrganizationAdapter adapter = new SingleOrganizationAdapter(sessionStorageMock, "MyOrg");
100-
// OperationResult retrieved = adapter.delete();
101-
//
102-
//
103-
//
104-
// /** Then **/
105-
// Assert.assertNotNull(retrieved);
106-
// Assert.assertSame(retrieved, operationResultMock);
107-
// PowerMockito.verifyStatic(times(1));
108-
// buildRequest(
109-
// eq(sessionStorageMock),
110-
// eq(Organization.class),
111-
// eq(new String[]{"/organizations", "MyOrg"}),
112-
// any(DefaultErrorHandler.class));
113-
// Mockito.verify(jerseyRequestMock, times(1)).delete();
114-
// Mockito.verifyNoMoreInteractions(jerseyRequestMock);
115-
//
116-
// }
117-
//
118-
// @AfterMethod
119-
// public void after() {
120-
// reset(sessionStorageMock, batchOrganizationsAdapter,operationResultMock, jerseyRequestMock, singleOrganizationAdapter);
121-
// }
122-
//}
1+
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
2+
3+
import com.jaspersoft.jasperserver.dto.authority.ClientTenant;
4+
import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
5+
import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
6+
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
7+
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
8+
import junit.framework.Assert;
9+
import org.mockito.Mock;
10+
import org.mockito.Mockito;
11+
import org.powermock.api.mockito.PowerMockito;
12+
import org.powermock.core.classloader.annotations.PrepareForTest;
13+
import org.powermock.modules.testng.PowerMockTestCase;
14+
import org.testng.annotations.AfterMethod;
15+
import org.testng.annotations.BeforeMethod;
16+
import org.testng.annotations.Test;
17+
18+
import static com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest.buildRequest;
19+
import static org.mockito.Matchers.any;
20+
import static org.mockito.Matchers.eq;
21+
import static org.mockito.Mockito.reset;
22+
import static org.mockito.Mockito.times;
23+
import static org.mockito.MockitoAnnotations.initMocks;
24+
import static org.powermock.api.mockito.PowerMockito.whenNew;
25+
import static org.testng.AssertJUnit.assertSame;
26+
27+
@PrepareForTest({OrganizationsService.class,JerseyRequest.class})
28+
public class OrganizationsServiceTest extends PowerMockTestCase {
29+
30+
@Mock
31+
private SessionStorage sessionStorageMock;
32+
@Mock
33+
private BatchOrganizationsAdapter batchOrganizationsAdapter;
34+
@Mock
35+
private SingleOrganizationAdapter singleOrganizationAdapter;
36+
@Mock
37+
private JerseyRequest<ClientTenant> jerseyRequestMock;
38+
@Mock
39+
private OperationResult<ClientTenant> operationResultMock;
40+
41+
@BeforeMethod
42+
public void before() {
43+
initMocks(this);
44+
}
45+
46+
@Test
47+
public void should_return_proper_instance_of_BatchOrganizationsAdapter() throws Exception {
48+
49+
// Given
50+
whenNew(BatchOrganizationsAdapter.class).withArguments(sessionStorageMock).thenReturn(batchOrganizationsAdapter);
51+
OrganizationsService service = new OrganizationsService(sessionStorageMock);
52+
53+
// When
54+
BatchOrganizationsAdapter retrieved = service.organizations();
55+
56+
// Then
57+
assertSame(retrieved, batchOrganizationsAdapter);
58+
}
59+
60+
@Test
61+
public void should_return_proper_instance_of_SingleOrganizationAdapter() throws Exception {
62+
63+
// Given
64+
whenNew(SingleOrganizationAdapter.class).withArguments(sessionStorageMock, "orgId").thenReturn(singleOrganizationAdapter);
65+
OrganizationsService service = new OrganizationsService(sessionStorageMock);
66+
67+
// When
68+
SingleOrganizationAdapter retrieved = service.organization("orgId");
69+
70+
// Then
71+
assertSame(retrieved, singleOrganizationAdapter);
72+
}
73+
74+
@Test(expectedExceptions = IllegalArgumentException.class)
75+
public void should_throw_exception() throws Exception {
76+
77+
// Given
78+
OrganizationsService service = new OrganizationsService(sessionStorageMock);
79+
80+
// When
81+
service.organization("");
82+
}
83+
84+
85+
@Test
86+
public void should_delete_organization() {
87+
88+
// Given
89+
PowerMockito.mockStatic(JerseyRequest.class);
90+
Mockito.when(buildRequest(
91+
eq(sessionStorageMock),
92+
eq(ClientTenant.class),
93+
eq(new String[]{"/organizations", "MyOrg"}),
94+
any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
95+
Mockito.when(jerseyRequestMock.delete()).thenReturn(operationResultMock);
96+
97+
98+
// When
99+
SingleOrganizationAdapter adapter = new SingleOrganizationAdapter(sessionStorageMock, "MyOrg");
100+
OperationResult retrieved = adapter.delete();
101+
102+
103+
104+
// Then
105+
Assert.assertNotNull(retrieved);
106+
Assert.assertSame(retrieved, operationResultMock);
107+
PowerMockito.verifyStatic(times(1));
108+
buildRequest(
109+
eq(sessionStorageMock),
110+
eq(ClientTenant.class),
111+
eq(new String[]{"/organizations", "MyOrg"}),
112+
any(DefaultErrorHandler.class));
113+
Mockito.verify(jerseyRequestMock, times(1)).delete();
114+
Mockito.verifyNoMoreInteractions(jerseyRequestMock);
115+
116+
}
117+
118+
@AfterMethod
119+
public void after() {
120+
reset(sessionStorageMock, batchOrganizationsAdapter,operationResultMock, jerseyRequestMock, singleOrganizationAdapter);
121+
}
122+
}

0 commit comments

Comments
 (0)