Updated unit tests

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/SingleAttributeAdapter.java

@@ -41,7 +41,6 @@
 
 public class SingleAttributeAdapter extends AbstractAdapter {
 
-    private String attributeName;
     private Boolean includePermissions = false;
     private ArrayList<String> path = new ArrayList<String>();
 

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

@@ -149,7 +149,7 @@ public SingleUserRequestAdapter(String userId, String organizationId, SessionSto
      */
     public OperationResult<ClientUser> get(String userId) {
 
-        if (compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
+        if (compile("^.*?users([^/]+)$").matcher(uri.toString()).find()) {
             return request().get();
         }
 
@@ -171,7 +171,7 @@ private JerseyRequest<ClientUser> request() {
      * @deprecated Replaced by {@link SingleUserRequestAdapter#asyncGet(Callback)}.
      */
     public <R> RequestExecution asyncGet(final Callback<OperationResult<ClientUser>, R> callback, String userId) {
-        if (!compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
+        if (uri.contains("users")) {
             uri.add(userId);
         }
         final JerseyRequest<ClientUser> request = request();
@@ -201,7 +201,7 @@ public OperationResult<ClientUser> updateOrCreate(ClientUser user) {
      * @deprecated Replaced by {@link SingleUserRequestAdapter#asyncCreateOrUpdate(ClientUser, Callback)}.
      */
     public <R> RequestExecution asyncCreateOrUpdate(final ClientUser user, final Callback<OperationResult<ClientUser>, R> callback, final String userId) {
-        if (!compile("^.*?users/([^/]+)$").matcher(uri.toString()).find()) {
+        if (uri.contains("users")) {
             uri.add(userId);
         }
         final JerseyRequest<ClientUser> request = request();

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/BatchAttributeAdapterTest.java

@@ -75,7 +75,7 @@ public void should_run_get_method_asynchronously() throws Exception {
 
         // Given
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"/organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(operationResultMock).when(requestMock).get();
         BatchOrganizationsAdapter adapterSpy = spy(new BatchOrganizationsAdapter(sessionStorageMock));
 
@@ -133,7 +133,7 @@ public void should_add_parameter_to_map() throws Exception {
     public void should_get_resource() {
 
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"/organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(operationResultMock).when(requestMock).get();
         BatchOrganizationsAdapter adapterSpy = spy(new BatchOrganizationsAdapter(sessionStorageMock));
 
@@ -149,7 +149,7 @@ public void should_get_resource_with_params() {
 
         BatchOrganizationsAdapter adapterSpy = spy(new BatchOrganizationsAdapter(sessionStorageMock));
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"/organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(OrganizationsListWrapper.class), eq(new String[]{"organizations"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(adapterSpy).when(adapterSpy).parameter(OrganizationParameter.INCLUDE_PARENTS, true);
         doReturn(operationResultMock).when(requestMock).get();
 

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/SingleAttributeAdapterTest.java

@@ -100,7 +100,7 @@ public void should_invoke_private_method() {
         SingleOrganizationAdapter adapter = spy(new SingleOrganizationAdapter(sessionStorageMock, clientTenantMock));
         mockStatic(JerseyRequest.class);
         when(buildRequest(eq(sessionStorageMock), eq(ClientTenant.class),
-                eq(new String[]{"/organizations", "myOrg"}), any(DefaultErrorHandler.class)))
+                eq(new String[]{"organizations", "myOrg"}), any(DefaultErrorHandler.class)))
                 .thenReturn(requestMock);
         doReturn("myOrg").when(clientTenantMock).getId();
         doReturn(resultMock).when(requestMock).put(clientTenantMock);
@@ -111,7 +111,7 @@ public void should_invoke_private_method() {
         // Then
         assertNotNull(retrieved);
         verifyStatic(times(1));
-        buildRequest(eq(sessionStorageMock), eq(ClientTenant.class), eq(new String[]{"/organizations", "myOrg"}), any(DefaultErrorHandler.class));
+        buildRequest(eq(sessionStorageMock), eq(ClientTenant.class), eq(new String[]{"organizations", "myOrg"}), any(DefaultErrorHandler.class));
         verify(requestMock, times(1)).put(clientTenantMock);
     }
 

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

@@ -7,6 +7,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.ws.rs.core.MultivaluedHashMap;
 import org.mockito.Mock;
@@ -29,7 +30,6 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.doReturn;
 import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNotSame;
 
@@ -71,13 +71,6 @@ public void before() {
         initMocks(this);
     }
 
-    @Test
-    public void constructor() {
-        SingleRoleRequestAdapter adapterSpy = spy(new SingleRoleRequestAdapter(sessionStorageMock, null, "roleName"));
-        String roleUriPrefix = (String) Whitebox.getInternalState(adapterSpy, "roleUriPrefix");
-        assertEquals(roleUriPrefix, "/roles/roleName");
-    }
-
     @Test(enabled = false)
     public void should_delete_role_in_separate_thread() throws Exception {
 
@@ -250,8 +243,8 @@ public void should_invoke_private_logic_while_invocation_of_delete() throws Exce
         PowerMockito.mockStatic(JerseyRequest.class);
         SingleRoleRequestAdapter adapterSpy = spy(new SingleRoleRequestAdapter(sessionStorageMock,
                 "orgId", "roleName"));
-        String roleUriPrefix = (String) Whitebox.getInternalState(adapterSpy, "roleUriPrefix");
-        PowerMockito.when(buildRequest(eq(sessionStorageMock), eq(ClientRole.class), eq(new String[]{roleUriPrefix}),
+        ArrayList<String> roleUri = (ArrayList<String>) Whitebox.getInternalState(adapterSpy, "roleUri");
+        PowerMockito.when(buildRequest(eq(sessionStorageMock), eq(ClientRole.class), eq(roleUri.toArray(new String[roleUri.size()])),
                 any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
         PowerMockito.doReturn(expectedOpResultMock).when(jerseyRequestMock).delete();
 
@@ -260,7 +253,7 @@ public void should_invoke_private_logic_while_invocation_of_delete() throws Exce
 
         // Then
         PowerMockito.verifyStatic(times(1));
-        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(ClientRole.class), eq(new String[]{roleUriPrefix}),
+        JerseyRequest.buildRequest(eq(sessionStorageMock), eq(ClientRole.class), eq(roleUri.toArray(new String[roleUri.size()])),
                 any(DefaultErrorHandler.class));
         PowerMockito.verifyPrivate(adapterSpy, times(1)).invoke("buildRequest");
         Assert.assertNotNull(retrieved);
@@ -274,7 +267,8 @@ public void should_retrieve_role_asynchronously_() throws Exception {
         final int currentThreadId = (int) Thread.currentThread().getId();
 
         PowerMockito.mockStatic(JerseyRequest.class);
-        PowerMockito.when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(ClientRole.class),eq(new String[]{"/organizations/orgId/roles/roleName"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
+        PowerMockito.when(JerseyRequest.buildRequest(eq(sessionStorageMock), eq(ClientRole.class),
+                eq(new String[]{"organizations", "orgId", "roles", "roleName"}), any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
 
         SingleRoleRequestAdapter adapterSpy = PowerMockito.spy(new SingleRoleRequestAdapter(sessionStorageMock, "orgId", "roleName"));
 

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

@@ -73,7 +73,7 @@ public void should_run_get_method_asynchronously() throws Exception {
 
         // Given
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users/"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(operationResultMock).when(requestMock).get();
         BatchUsersRequestAdapter adapterSpy = spy(new BatchUsersRequestAdapter(sessionStorageMock, null));
 
@@ -112,7 +112,7 @@ public void should_get_resource() {
         // Given
         MultivaluedMap<String, String> params = new MultivaluedHashMap<String, String>();
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users/"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(operationResultMock).when(requestMock).get();
         doReturn(requestMock).when(requestMock).addParams(params);
         BatchUsersRequestAdapter adapterSpy = spy(new BatchUsersRequestAdapter(sessionStorageMock, null));
@@ -128,7 +128,7 @@ public void should_refuse_wrong_organization_and_get_resource() {
         // Given
         MultivaluedMap<String, String> params = new MultivaluedHashMap<String, String>();
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users/"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(operationResultMock).when(requestMock).get();
         doReturn(requestMock).when(requestMock).addParams(params);
         BatchUsersRequestAdapter adapterSpy = spy(new BatchUsersRequestAdapter(sessionStorageMock, ""));
@@ -145,7 +145,7 @@ public void should_get_resource_with_params() {
         // Given
         BatchUsersRequestAdapter adapterSpy = spy(new BatchUsersRequestAdapter(sessionStorageMock, null));
         mockStatic(JerseyRequest.class);
-        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users/"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class), eq(new String[]{"users"}), any(DefaultErrorHandler.class))).thenReturn(requestMock);
         doReturn(requestMock).when(requestMock).addParams(any(MultivaluedHashMap.class));
         doReturn(operationResultMock).when(requestMock).get();
         // When