Merge pull request #240 from cloudinary/fix/fix_tests_user_deletion

Added users deletion at the end of tests

Author: asisayag2

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java

@@ -38,6 +38,7 @@ public void setUp() throws Exception {
 
     @AfterClass
     public static void tearDownClass() {
+        System.out.println("Start TearDownClass");
         Account account = new Account(new Cloudinary());
         for (String createdSubAccountId : createdSubAccountIds) {
             try {
@@ -62,6 +63,7 @@ public static void tearDownClass() {
                 e.printStackTrace();
             }
         }
+        System.out.println("### Deleted - SubAccounts:"+createdSubAccountIds.size()+", Users:"+createdUserIds.size()+ ", UserGroups:"+createdGroupIds.size());
     }
 
     @Test
@@ -151,16 +153,18 @@ public void testDeleteSubAccount() throws Exception {
     @Test
     public void testGetUser() throws Exception {
         ApiResponse user = createUser();
-        String id = user.get("id").toString();
-        ApiResponse result = account.user(id, null);
+        String userId = user.get("id").toString();
+        ApiResponse result = account.user(userId, null);
+
         assertNotNull(result);
+        deleteUser(userId);
     }
 
     @Test
     public void testGetUsers() throws Exception {
-        String id1 = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
-        String id2 = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
-        ApiResponse result = account.users(null, Arrays.asList(id1, id2), null, null, null);
+        String user1Id = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
+        String user2Id = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
+        ApiResponse result = account.users(null, Arrays.asList(user1Id, user2Id), null, null, null);
         assertNotNull(result);
         final ArrayList users = (ArrayList) result.get("users");
         ArrayList<String> returnedIds = new ArrayList<String>(2);
@@ -170,8 +174,10 @@ public void testGetUsers() throws Exception {
         returnedIds.add(((Map) users.get(0)).get("id").toString());
         returnedIds.add(((Map) users.get(1)).get("id").toString());
 
-        assertTrue("User1 id should be in the result set", returnedIds.contains(id1));
-        assertTrue("User2 id should be in the result set", returnedIds.contains(id2));
+        assertTrue("User1 id should be in the result set", returnedIds.contains(user1Id));
+        assertTrue("User2 id should be in the result set", returnedIds.contains(user2Id));
+        deleteUser(user1Id);
+        deleteUser(user2Id);
     }
 
     @Test
@@ -184,11 +190,13 @@ public void testCreateUser() throws Exception {
     @Test
     public void testUpdateUser() throws Exception {
         ApiResponse user = createUser(Account.Role.ADMIN);
-        String id = user.get("id").toString();
+        String userId = user.get("id").toString();
         String newName = randomLetters();
-        ApiResponse result = account.updateUser(id, newName, null, null, null, null);
+        ApiResponse result = account.updateUser(userId, newName, null, null, null, null);
+
         assertNotNull(result);
         assertEquals(result.get("name"), newName);
+        deleteUser(userId);
     }
 
     @Test
@@ -232,6 +240,7 @@ public void testAddUserToUserGroup() throws Exception {
         String userId = user.get("id").toString();
         ApiResponse result = account.addUserToGroup(group.get("id").toString(), userId, null);
         assertNotNull(result);
+        deleteUser(userId);
     }
 
     @Test
@@ -243,6 +252,7 @@ public void testRemoveUserFromUserGroup() throws Exception {
         account.addUserToGroup(groupId, userId, null);
         ApiResponse result = account.removeUserFromGroup(groupId, userId, null);
         assertNotNull(result);
+        deleteUser(userId);
     }
 
     @Test
@@ -273,6 +283,8 @@ public void testListUsersInGroup() throws Exception {
         ApiResponse result = account.userGroupUsers(groupId, null);
         assertNotNull(result);
         assertTrue(((List) result.get("users")).size() >= 2);
+        deleteUser(user1Id);
+        deleteUser(user2Id);
     }
 
 
@@ -298,11 +310,21 @@ 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("TestName", email, role, subAccountsIds, null);
+        ApiResponse user = account.createUser("TestUserJava"+new Date().toString(), email, role, subAccountsIds, null);
         createdUserIds.add(user.get("id").toString());
         return user;
     }
 
+    private void deleteUser(String userId){
+        try {
+            account.deleteUser(userId, null);
+            createdUserIds.remove(userId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
     private ApiResponse createSubAccount() throws Exception {
         ApiResponse subAccount = account.createSubAccount(randomLetters(), null, emptyMap(), true, null);
         createdSubAccountIds.add(subAccount.get("id").toString());