Implement missing tests Users API

YomesInc · web-flow · commit c721dff98b72 · 2022-03-10T11:10:51.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/provisioning/Account.java b/cloudinary-core/src/main/java/com/cloudinary/provisioning/Account.java
@@ -283,7 +283,7 @@ public ApiResponse user(String userId, Map<String, Object> options) throws Excep
     /**
      * Get a list of the users according to filters.
      *
-     * @param pending      Optional. Whether to fetch pending users. Default all.
+     * @param pending      Optional. Limit results to pending users (true), users that are not pending (false), or all users (null)
      * @param userIds      Optionals. List of user IDs. Up to 100
      * @param prefix       Optional. Search by prefix of the user's name or email. Case-insensitive
      * @param subAccountId Optional. Return only users who have access to the given sub-account
@@ -297,7 +297,7 @@ public ApiResponse users(Boolean pending, List<String> userIds, String prefix, S
     /**
      * Get a list of the users according to filters.
      *
-     * @param pending      Optional. Whether to fetch pending users. Default all.
+     * @param pending      Optional. Limit results to pending users (true), users that are not pending (false), or all users (null)
      * @param userIds      Optionals. List of user IDs. Up to 100
      * @param prefix       Optional. Search by prefix of the user's name or email. Case-insensitive
      * @param subAccountId Optional. Return only users who have access to the given sub-account
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java
@@ -5,6 +5,7 @@
 import com.cloudinary.api.ApiResponse;
 import com.cloudinary.provisioning.Account;
 import org.junit.*;
+import org.junit.rules.ExpectedException;
 import org.junit.rules.TestName;
 
 import java.util.*;
@@ -29,6 +30,8 @@ public static void setUpClass() {
 
     @Rule
     public TestName currentTest = new TestName();
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
 
     @Before
     public void setUp() throws Exception {
@@ -180,6 +183,63 @@ public void testGetUsers() throws Exception {
         deleteUser(user2Id);
     }
 
+    @Test
+    public void testGetPendingUsers() throws Exception {
+        String id = createUser(Account.Role.BILLING).get("id").toString();
+
+        ApiResponse pending = account.users(true, Collections.singletonList(id), null, null, null);
+        assertEquals(1, ((ArrayList) pending.get("users")).size());
+
+        ApiResponse notPending = account.users(false, Collections.singletonList(id), null, null, null);
+        assertEquals(0, ((ArrayList) notPending.get("users")).size());
+
+        ApiResponse all = account.users(null, Collections.singletonList(id), null, null, null);
+        assertEquals(1, ((ArrayList) all.get("users")).size());
+    }
+
+    @Test
+    public void testGetUsersByPrefix() throws Exception {
+        final long timeMillis = System.currentTimeMillis();
+        final String userName = String.format("SDK TEST Get Users By Prefix %d", timeMillis);
+        final String userEmail = String.format("sdk-test-get-users-by-prefix+%d@cloudinary.com", timeMillis);
+
+        createUser(userName,
+                userEmail,
+                Account.Role.BILLING,
+                Collections.<String>emptyList());
+
+        ApiResponse userByPrefix = account.users(true, null, userName.substring(0, userName.length() - 1), null, null);
+        assertEquals(1, ((ArrayList) userByPrefix.get("users")).size());
+
+        ApiResponse userByNonExistingPrefix = account.users(true, null, userName + "zzz", null, null);
+        assertEquals(0, ((ArrayList) userByNonExistingPrefix.get("users")).size());
+    }
+
+    @Test
+    public void testGetUsersBySubAccountIds() throws Exception {
+        ApiResponse subAccount = createSubAccount();
+        final String subAccountId = subAccount.get("id").toString();
+
+        final long timeMillis = System.currentTimeMillis();
+        final String userName = String.format("SDK TEST Get Users By Sub Account Ids %d", timeMillis);
+        final String userEmail = String.format("sdk-test-get-users-by-sub-account-ids+%d@cloudinary.com", timeMillis);
+
+        createUser(userName,
+                userEmail,
+                Account.Role.BILLING,
+                Collections.singletonList(subAccountId));
+
+        ApiResponse usersBySubAccount = account.users(true, null, userName, subAccountId, null);
+        assertEquals(1, ((ArrayList) usersBySubAccount.get("users")).size());
+    }
+
+    @Test
+    public void testGetUsersThrowsWhenSubAccountIdDoesntExist() throws Exception {
+        final String subAccountId = randomLetters();
+        expectedException.expectMessage("Cannot find sub account with id " + subAccountId);
+        account.users(true, null, null, subAccountId, null);
+    }
+
     @Test
     public void testCreateUser() throws Exception {
         ApiResponse createResult = createSubAccount();
@@ -294,6 +354,7 @@ private ApiResponse createGroup() throws Exception {
         ApiResponse userGroup = account.createUserGroup(name);
         createdGroupIds.add(userGroup.get("id").toString());
         return userGroup;
+
     }
 
     private ApiResponse createUser(Account.Role role) throws Exception {
@@ -310,7 +371,11 @@ private ApiResponse createUser(List<String> subAccountsIds) throws Exception {
 
     private ApiResponse createUser(List<String> subAccountsIds, Account.Role role) throws Exception {
         String email = String.format("%s@%s.com", randomLetters(), randomLetters());
-        ApiResponse user = account.createUser("TestUserJava"+new Date().toString(), email, role, subAccountsIds, null);
+        return createUser("TestName", email, role, subAccountsIds);
+    }
+
+    private ApiResponse createUser(final String name, String email, Account.Role role, List<String> subAccountsIds) throws Exception {
+        ApiResponse user = account.createUser(name, email, role, subAccountsIds, null);
         createdUserIds.add(user.get("id").toString());
         return user;
     }
@@ -336,6 +401,7 @@ private static String randomLetters() {
         for (int i = 0; i < 10; i++) {
             sb.append((char) ('a' + rand.nextInt('z' - 'a' + 1)));
         }
+
         return sb.toString();
     }
 }
