Added unit tests

Author: TanyaEf

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

@@ -327,6 +327,63 @@ public void should_set_internal_state_with_parameters_with_holder() {
             assertEquals(params.get("limit").get(0), "20");
         }
 
+    @Test
+    public void should_search_server_attributes_with_proper_user_in_tenant_holder_via_parameter() {
+
+        // Given
+        MultivaluedHashMap<String, String> map = new MultivaluedHashMap<String, String>();
+        map.add("group", "custom");
+        map.add("holder", "user:/myOrg/user");
+        map.add("recursive", "true");
+        map.add("includeInherited", "true");
+        map.add("offset", "10");
+        map.add("limit", "20");
+
+        mockStatic(JerseyRequest.class);
+        when(buildRequest(
+                eq(sessionStorageMock),
+                eq(HypermediaAttributesListWrapper.class),
+                eq(new String[]{"attributes"}),
+                any(DefaultErrorHandler.class))).thenReturn(jerseyRequestMock);
+        RestClientConfiguration configurationMock = mock(RestClientConfiguration.class);
+        when(sessionStorageMock.getConfiguration()).thenReturn(configurationMock);
+        when(configurationMock.getAcceptMimeType()).thenReturn(MimeType.JSON);
+
+        when(jerseyRequestMock.addParam(anyString(), anyString())).thenReturn(jerseyRequestMock);
+
+        when(jerseyRequestMock.addParams(map)).thenReturn(jerseyRequestMock);
+        when(jerseyRequestMock.get()).thenReturn(operationResultMock);
+
+        // When
+        AttributesService service = new AttributesService(sessionStorageMock);
+
+        OperationResult<HypermediaAttributesListWrapper> retrieved = service
+                .allAttributes()
+                .parameter(AttributesSearchParameter.GROUP, AttributesGroupParameter.CUSTOM)
+                .parameter(AttributesSearchParameter.HOLDER, "myOrg/user")
+                .parameter(AttributesSearchParameter.RECURSIVE, Boolean.TRUE)
+                .parameter(AttributesSearchParameter.INCLUDE_INHERITED, Boolean.TRUE)
+                .parameter(AttributesSearchParameter.OFFSET, 10)
+                .parameter(AttributesSearchParameter.LIMIT, 20)
+                .setIncludePermissions(true)
+                .search();
+
+        // Then
+        assertNotNull(retrieved);
+        assertSame(retrieved, operationResultMock);
+        verifyStatic(times(1));
+        buildRequest(
+                eq(sessionStorageMock),
+                eq(HypermediaAttributesListWrapper.class),
+                eq(new String[]{"attributes"}),
+                any(DefaultErrorHandler.class));
+        verify(jerseyRequestMock, times(1)).addParams(map);
+        verify(jerseyRequestMock, times(1)).get();
+        verify(jerseyRequestMock, times(1)).addParam("_embedded", "permission");
+        verify(jerseyRequestMock, times(1)).setAccept("application/attributes.collection+json");
+        verifyNoMoreInteractions(jerseyRequestMock);
+    }
+
    @Test
     public void should_search_server_attributes_with_parameters() {
 

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

@@ -157,6 +157,25 @@ public void should_get_resource_with_params() {
         verify(requestMock, times(1)).addParams(any(MultivaluedHashMap.class));
     }
 
+    @Test
+    public void should_get_resource_with_params_for_user_in_organization() {
+        // Given
+        BatchUsersRequestAdapter adapterSpy = spy(new BatchUsersRequestAdapter(sessionStorageMock, "myOrg"));
+        mockStatic(JerseyRequest.class);
+        when(buildRequest(eq(sessionStorageMock), eq(UsersListWrapper.class),
+                eq(new String[]{"organizations", "myOrg", "users"}),
+                any(DefaultErrorHandler.class))).thenReturn(requestMock);
+        doReturn(requestMock).when(requestMock).addParams(any(MultivaluedHashMap.class));
+        doReturn(operationResultMock).when(requestMock).get();
+        // When
+        OperationResult<UsersListWrapper> retrievedResult = adapterSpy.param(UsersParameter.INCLUDE_SUB_ORGS, "true").get();
+        // Then
+        assertSame(retrievedResult, operationResultMock);
+        verify(requestMock, times(1)).get();
+        assertTrue(((MultivaluedHashMap<String, String>)getInternalState(adapterSpy, "params")).size()== 1);
+        verify(requestMock, times(1)).addParams(any(MultivaluedHashMap.class));
+    }
+
     @AfterMethod
     public void after() {
         sessionStorageMock = null;