Skip to content

Commit 8dce4de

Browse files
TanyaEfTanyaEf
committed
Updated unit tests
1 parent d4284b5 commit 8dce4de

File tree

9 files changed

+252
-103
lines changed

9 files changed

+252
-103
lines changed

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/SingleUserRequestAdapter.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
1212
import java.util.ArrayList;
1313

14-
import static java.util.regex.Pattern.compile;
15-
1614
public class SingleUserRequestAdapter extends AbstractAdapter {
1715

1816
private ArrayList<String> uri = new ArrayList<String>();
1917

2018
private ClientUser user;
2119
/**
2220
* The field is used for deprecated methods of the class.
21+
*
2322
* @deprecated Replaced by {@link SingleUserRequestAdapter#uri}.
2423
*/
2524
private String userUriPrefix;
@@ -149,11 +148,12 @@ public SingleUserRequestAdapter(String userId, String organizationId, SessionSto
149148
*/
150149
public OperationResult<ClientUser> get(String userId) {
151150

152-
if (compile("^.*?users([^/]+)$").matcher(uri.toString()).find()) {
151+
if (!uri.contains("users")) {
153152
return request().get();
154153
}
155-
156-
uri.add(userId);
154+
if (!uri.get(uri.size() - 1).equals(userId)) {
155+
uri.add(userId);
156+
}
157157
return request().get();
158158
}
159159

@@ -171,9 +171,10 @@ private JerseyRequest<ClientUser> request() {
171171
* @deprecated Replaced by {@link SingleUserRequestAdapter#asyncGet(Callback)}.
172172
*/
173173
public <R> RequestExecution asyncGet(final Callback<OperationResult<ClientUser>, R> callback, String userId) {
174-
if (uri.contains("users")) {
174+
if (uri.contains("users") && !uri.get(uri.size() - 1).equals(userId)) {
175175
uri.add(userId);
176176
}
177+
177178
final JerseyRequest<ClientUser> request = request();
178179
RequestExecution task = new RequestExecution(new Runnable() {
179180
@Override
@@ -190,9 +191,9 @@ public void run() {
190191
*/
191192
public OperationResult<ClientUser> updateOrCreate(ClientUser user) {
192193
uri.add(user.getUsername());
193-
if (!uri.toString().contains("organizations") && user.getTenantId() != null) {
194+
if ((!uri.toString().contains("organizations")) && (user.getTenantId() != null)) {
194195
uri.add(0, "organizations");
195-
uri.add(user.getTenantId());
196+
uri.add(1,user.getTenantId());
196197
}
197198
return request().put(user);
198199
}

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/SingleUserRequestAdapterDeprecatedTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public Void execute(OperationResult<ClientUser> data) {
314314

315315
// Then
316316
assertNotNull(retrieved);
317-
assertEquals(uri.toString(), "/users/Simon");
317+
assertEquals(uri.toString(), "[users, Simon]");
318318
assertNotSame(currentThreadId, newThreadId.get());
319319
verify(callback, times(1)).execute(operationResultMock);
320320
verify(userJerseyRequestMock, times(1)).get();

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/SingleUserRequestAdapterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void should_invoke_constructor_with_proper_three_params() {
6767

6868
// Then
6969
assertSame(adapter.getSessionStorage(), sessionStorageMock);
70-
assertEquals((ArrayList<String>)Whitebox.getInternalState(adapter, "uri"), "users");
70+
assertEquals(((ArrayList<String>)Whitebox.getInternalState(adapter, "uri")).get(0), "users");
7171
assertEquals(Whitebox.getInternalState(adapter, "user"), userMock);
7272
}
7373

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/BatchResourcesAdapterTest.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ public void should_invoke_all_private_logic_and_return_proper_operation_result()
9494

9595
/** Given **/
9696
mockStatic(JerseyRequest.class);
97-
when(buildRequest(eq(sessionStorageMock), eq(ClientResourceListWrapper.class), eq(new String[]{"/resources"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
97+
when(buildRequest(eq(sessionStorageMock),
98+
eq(ClientResourceListWrapper.class),
99+
eq(new String[]{"resources"}),
100+
any(DefaultErrorHandler.class))).thenReturn(requestMock);
98101
doReturn(resultMock).when(requestMock).get();
99102
BatchResourcesAdapter adapter = new BatchResourcesAdapter(sessionStorageMock);
100103

@@ -106,7 +109,10 @@ public void should_invoke_all_private_logic_and_return_proper_operation_result()
106109
assertSame(retrievedResult, resultMock);
107110

108111
verifyStatic();
109-
buildRequest(eq(sessionStorageMock), eq(ClientResourceListWrapper.class), eq(new String[]{"/resources"}), any(DefaultErrorHandler.class));
112+
buildRequest(eq(sessionStorageMock),
113+
eq(ClientResourceListWrapper.class),
114+
eq(new String[]{"resources"}),
115+
any(DefaultErrorHandler.class));
110116

111117
verify(requestMock).get();
112118
verify(requestMock).addParams(any(MultivaluedHashMap.class));
@@ -170,7 +176,7 @@ public void should_delete_resource_asynchronously_and_return_proper_RequestExecu
170176

171177
/** Given **/
172178
mockStatic(JerseyRequest.class);
173-
when(buildRequest(eq(sessionStorageMock), eq(Object.class), eq(new String[]{"/resources"}), any(DefaultErrorHandler.class))).thenReturn(objectJerseyRequestMock);
179+
when(buildRequest(eq(sessionStorageMock), eq(Object.class), eq(new String[]{"resources"}), any(DefaultErrorHandler.class))).thenReturn(objectJerseyRequestMock);
174180
doReturn(objectOperationResultMock).when(objectJerseyRequestMock).delete();
175181

176182
final AtomicInteger newThreadId = new AtomicInteger();
@@ -216,7 +222,7 @@ public void should_delete_resource_and_return_operation_result() {
216222

217223
/** Given **/
218224
mockStatic(JerseyRequest.class);
219-
when(buildRequest(eq(sessionStorageMock), eq(Object.class), eq(new String[]{"/resources"}), any(DefaultErrorHandler.class))).thenReturn(objectJerseyRequestMock);
225+
when(buildRequest(eq(sessionStorageMock), eq(Object.class), eq(new String[]{"resources"}), any(DefaultErrorHandler.class))).thenReturn(objectJerseyRequestMock);
220226
doReturn(objectOperationResultMock).when(objectJerseyRequestMock).delete();
221227

222228
BatchResourcesAdapter adapter = new BatchResourcesAdapter(sessionStorageMock);

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/SingleResourceAdapterTest.java‎

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ public void should_return_specified_resource_asynchronously() throws Interrupted
131131

132132
SingleResourceAdapter adapterSpy = PowerMockito.spy(new SingleResourceAdapter(sessionStorageMock, resourceUri));
133133
mockStatic(JerseyRequest.class);
134-
PowerMockito.when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class), eq(new String[]{"/resources", resourceUri}))).thenReturn(jerseyRequestMock);
134+
PowerMockito.when(buildRequest(eq(sessionStorageMock),
135+
eq(ClientResource.class),
136+
eq(new String[]{"resources", resourceUri}))).thenReturn(jerseyRequestMock);
135137
PowerMockito.doReturn(operationResultMock).when(jerseyRequestMock).get();
136138

137139
final Callback<OperationResult<ClientResource>, Void> callback = PowerMockito.spy(new Callback<OperationResult<ClientResource>, Void>() {
@@ -196,7 +198,9 @@ public void should_delete_resource_asynchronously() throws InterruptedException
196198
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
197199

198200
mockStatic(JerseyRequest.class);
199-
when(buildRequest(eq(sessionStorageMock), eq(Object.class), eq(new String[]{"/resources", resourceUri}))).thenReturn(objectJerseyRequestMock);
201+
when(buildRequest(eq(sessionStorageMock),
202+
eq(Object.class),
203+
eq(new String[]{"resources", resourceUri}))).thenReturn(objectJerseyRequestMock);
200204
doReturn(objectOperationResultMock).when(objectJerseyRequestMock).delete();
201205

202206
final Callback<OperationResult, Void> callback = spy(new Callback<OperationResult, Void>() {
@@ -242,7 +246,7 @@ public void should_upload_file_asynchronously() throws InterruptedException {
242246

243247
mockStatic(JerseyRequest.class);
244248
when(buildRequest(eq(sessionStorageMock), eq(ClientFile.class),
245-
eq(new String[]{"/resources", resourceUri}))).thenReturn(clientFileJerseyRequestMock);
249+
eq(new String[]{"resources", resourceUri}))).thenReturn(clientFileJerseyRequestMock);
246250
doReturn(clientFileOperationResultMock).when(clientFileJerseyRequestMock).post(anyObject());
247251

248252
final Callback<OperationResult<ClientFile>, Void> callback =
@@ -295,7 +299,7 @@ public void should_return_operation_result_with_client_resource_folder() {
295299

296300
mockStatic(JerseyRequest.class);
297301
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class),
298-
eq(new String[]{"/resources", resourceUri}))).thenReturn(jerseyRequestMock);
302+
eq(new String[]{"resources", resourceUri}))).thenReturn(jerseyRequestMock);
299303
doReturn(operationResultMock).when(jerseyRequestMock).get();
300304

301305
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
@@ -329,7 +333,7 @@ public void should_send_descriptor_into_server_asynchronously() throws Interrupt
329333

330334
mockStatic(JerseyRequest.class);
331335
when(buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class),
332-
eq(new String[]{"/resources", resourceUri}))).thenReturn(adhocDataViewJerseyRequestMock);
336+
eq(new String[]{"resources", resourceUri}))).thenReturn(adhocDataViewJerseyRequestMock);
333337
doReturn(adhocDataViewOperationResultMock).when(adhocDataViewJerseyRequestMock).post(descriptorMock);
334338
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
335339
doReturn(MimeType.JSON).when(configurationMock).getContentMimeType();
@@ -385,7 +389,7 @@ public void should_send_descriptor_into_server() {
385389

386390
mockStatic(JerseyRequest.class);
387391
when(buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class),
388-
eq(new String[]{"/resources", resourceUri}))).thenReturn(adhocDataViewJerseyRequestMock);
392+
eq(new String[]{"resources", resourceUri}))).thenReturn(adhocDataViewJerseyRequestMock);
389393
doReturn(adhocDataViewOperationResultMock).when(adhocDataViewJerseyRequestMock).post(descriptorMock);
390394
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
391395
doReturn(MimeType.JSON).when(configurationMock).getContentMimeType();
@@ -397,7 +401,7 @@ public void should_send_descriptor_into_server() {
397401

398402
/** Then **/
399403
verifyStatic();
400-
buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class), eq(new String[]{"/resources", resourceUri}));
404+
buildRequest(eq(sessionStorageMock), eq(ClientAdhocDataView.class), eq(new String[]{"resources", resourceUri}));
401405

402406
assertNotNull(retrieved);
403407
assertSame(retrieved, adhocDataViewOperationResultMock);
@@ -416,7 +420,7 @@ public void should_delete_resource_on_server() {
416420

417421
mockStatic(JerseyRequest.class);
418422
when(buildRequest(eq(sessionStorageMock), eq(Object.class),
419-
eq(new String[]{"/resources", resourceUri}))).thenReturn(objectJerseyRequestMock);
423+
eq(new String[]{"resources", resourceUri}))).thenReturn(objectJerseyRequestMock);
420424
doReturn(objectOperationResultMock).when(objectJerseyRequestMock).delete();
421425

422426
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
@@ -438,7 +442,7 @@ public void should_return_resource_as_IS_in_binary_format() {
438442

439443
mockStatic(JerseyRequest.class);
440444
when(buildRequest(eq(sessionStorageMock), eq(InputStream.class),
441-
eq(new String[]{"/resources", resourceUri}))).thenReturn(inputStreamJerseyRequestMock);
445+
eq(new String[]{"resources", resourceUri}))).thenReturn(inputStreamJerseyRequestMock);
442446
doReturn(inputStreamOperationResultMock).when(inputStreamJerseyRequestMock).get();
443447
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
444448

@@ -460,7 +464,7 @@ public void should_return_resource_as_IS_in_binary_format_asynchronously() throw
460464

461465
mockStatic(JerseyRequest.class);
462466
when(buildRequest(eq(sessionStorageMock), eq(InputStream.class),
463-
eq(new String[]{"/resources", resourceUri}))).thenReturn(inputStreamJerseyRequestMock);
467+
eq(new String[]{"resources", resourceUri}))).thenReturn(inputStreamJerseyRequestMock);
464468
doReturn(inputStreamOperationResultMock).when(inputStreamJerseyRequestMock).get();
465469
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
466470

@@ -510,7 +514,9 @@ public void should_update_resource_asynchronously() throws InterruptedException
510514
ClientVirtualDataSource source = new ClientVirtualDataSource();
511515

512516
mockStatic(JerseyRequest.class);
513-
when(buildRequest(eq(sessionStorageMock), eq(ClientVirtualDataSource.class), eq(new String[]{"/resources", resourceUri}), any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
517+
when(buildRequest(eq(sessionStorageMock),
518+
eq(ClientVirtualDataSource.class),
519+
eq(new String[]{"resources", resourceUri}), any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
514520

515521
doReturn(operationResultMock).when(virtualDataSourceJerseyRequestMock).put(source);
516522
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -566,7 +572,9 @@ public void should_copy_resource_asynchronously() throws InterruptedException {
566572
final int currentThreadId = (int) Thread.currentThread().getId();
567573

568574
mockStatic(JerseyRequest.class);
569-
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class), eq(new String[]{"/resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
575+
when(buildRequest(eq(sessionStorageMock),
576+
eq(ClientResource.class),
577+
eq(new String[]{"resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
570578
doReturn(operationResultMock).when(jerseyRequestMock).put("");
571579

572580
final Callback<OperationResult<ClientResource>, Void> callback = Mockito.spy(new Callback<OperationResult<ClientResource>, Void>() {
@@ -614,7 +622,10 @@ public void should_move_resource_asynchronously() throws InterruptedException {
614622
final int currentThreadId = (int) Thread.currentThread().getId();
615623

616624
mockStatic(JerseyRequest.class);
617-
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class), eq(new String[]{"/resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
625+
when(buildRequest(eq(sessionStorageMock),
626+
eq(ClientResource.class),
627+
eq(new String[]{"resources", resourceUri}),
628+
any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
618629
doReturn(operationResultMock).when(jerseyRequestMock).post(null);
619630

620631
final Callback<OperationResult<ClientResource>, Void> callback = Mockito.spy(new Callback<OperationResult<ClientResource>, Void>() {
@@ -660,7 +671,10 @@ public void should_create_new_resource_asynchronously() throws InterruptedExcept
660671
ClientVirtualDataSource source = new ClientVirtualDataSource();
661672

662673
mockStatic(JerseyRequest.class);
663-
when(buildRequest(eq(sessionStorageMock), eq(ClientVirtualDataSource.class), eq(new String[]{"/resources", resourceUri}), any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
674+
when(buildRequest(eq(sessionStorageMock),
675+
eq(ClientVirtualDataSource.class),
676+
eq(new String[]{"resources", resourceUri}),
677+
any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
664678

665679
doReturn(operationResultMock).when(virtualDataSourceJerseyRequestMock).post(source);
666680
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -714,7 +728,10 @@ public void should_create_new_resource() {
714728
ClientVirtualDataSource source = new ClientVirtualDataSource();
715729

716730
mockStatic(JerseyRequest.class);
717-
when(buildRequest(eq(sessionStorageMock), eq(ClientVirtualDataSource.class), eq(new String[]{"/resources", resourceUri}), any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
731+
when(buildRequest(eq(sessionStorageMock),
732+
eq(ClientVirtualDataSource.class),
733+
eq(new String[]{"resources", resourceUri}),
734+
any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
718735

719736
doReturn(operationResultMock).when(virtualDataSourceJerseyRequestMock).post(source);
720737
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -745,7 +762,10 @@ public void should_update_resource() throws InterruptedException {
745762
ClientVirtualDataSource source = new ClientVirtualDataSource();
746763

747764
mockStatic(JerseyRequest.class);
748-
when(buildRequest(eq(sessionStorageMock), eq(ClientVirtualDataSource.class), eq(new String[]{"/resources", resourceUri}), any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
765+
when(buildRequest(eq(sessionStorageMock),
766+
eq(ClientVirtualDataSource.class),
767+
eq(new String[]{"resources", resourceUri}),
768+
any(ResourceValidationErrorHandler.class))).thenReturn(virtualDataSourceJerseyRequestMock);
749769

750770
doReturn(operationResultMock).when(virtualDataSourceJerseyRequestMock).put(source);
751771
doReturn(configurationMock).when(sessionStorageMock).getConfiguration();
@@ -777,7 +797,9 @@ public void should_upload_file() throws InterruptedException {
777797
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
778798

779799
mockStatic(JerseyRequest.class);
780-
when(buildRequest(eq(sessionStorageMock), eq(ClientFile.class), eq(new String[]{"/resources", resourceUri}))).thenReturn(clientFileJerseyRequestMock);
800+
when(buildRequest(eq(sessionStorageMock),
801+
eq(ClientFile.class),
802+
eq(new String[]{"resources", resourceUri}))).thenReturn(clientFileJerseyRequestMock);
781803
doReturn(clientFileOperationResultMock).when(clientFileJerseyRequestMock).post(anyObject());
782804

783805

@@ -805,7 +827,10 @@ public void should_move_resource() throws InterruptedException {
805827
String resourceUri = "uri";
806828

807829
mockStatic(JerseyRequest.class);
808-
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class), eq(new String[]{"/resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
830+
when(buildRequest(eq(sessionStorageMock),
831+
eq(ClientResource.class),
832+
eq(new String[]{"resources", resourceUri}),
833+
any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
809834
doReturn(operationResultMock).when(jerseyRequestMock).put("");
810835

811836
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);
@@ -832,7 +857,9 @@ public void should_copy_resource() throws InterruptedException {
832857
String resourceUri = "uri";
833858

834859
mockStatic(JerseyRequest.class);
835-
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class), eq(new String[]{"/resources", resourceUri}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
860+
when(buildRequest(eq(sessionStorageMock), eq(ClientResource.class),
861+
eq(new String[]{"resources", resourceUri}),
862+
any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
836863
doReturn(operationResultMock).when(jerseyRequestMock).post(null);
837864

838865
SingleResourceAdapter adapter = new SingleResourceAdapter(sessionStorageMock, resourceUri);

0 commit comments

Comments
 (0)