reverting change

Author: prachi-okta

integration-tests/src/test/groovy/com/okta/sdk/tests/it/GroupsIT.groovy

@@ -15,20 +15,22 @@
  */
 package com.okta.sdk.tests.it
 
-import com.okta.sdk.resource.api.GroupApi
-import com.okta.sdk.resource.api.UserApi
-import com.okta.sdk.resource.group.GroupBuilder
 import com.okta.sdk.resource.model.AddGroupRequest
-import com.okta.sdk.resource.model.Group
 import com.okta.sdk.resource.model.OktaUserGroupProfile
-import com.okta.sdk.resource.user.UserBuilder
 import com.okta.sdk.tests.Scenario
 import com.okta.sdk.tests.it.util.ITSupport
+import com.okta.sdk.resource.group.GroupBuilder
+import com.okta.sdk.resource.user.UserBuilder
+import com.okta.sdk.resource.api.GroupApi
+import com.okta.sdk.resource.api.UserApi
+import com.okta.sdk.resource.model.Group
 import org.testng.annotations.Test
 
-import static com.okta.sdk.tests.it.util.Util.*
-import static org.awaitility.Awaitility.await
-import static java.util.concurrent.TimeUnit.SECONDS
+import static com.okta.sdk.tests.it.util.Util.assertGroupPresent
+import static com.okta.sdk.tests.it.util.Util.assertUserInGroup
+import static com.okta.sdk.tests.it.util.Util.assertUserNotInGroup
+import static com.okta.sdk.tests.it.util.Util.validateGroup
+import static com.okta.sdk.tests.it.util.Util.validateUser
 
 /**
  * Tests for {@code /api/v1/apps}.
@@ -119,7 +121,7 @@ class GroupsIT extends ITSupport {
         validateGroup(group, groupNameUpdated, 'Description updated')
     }
 
-    @Test(groups = "group1")
+    @Test (groups = "group1")
     @Scenario("group-user-operations")
     void groupUserOperationsTest() {
 
@@ -128,7 +130,7 @@ class GroupsIT extends ITSupport {
         def lastName = 'With-Group'
         def email = "john-with-group-${uniqueTestName}@example.com"
 
-        // 1. Create a user
+        // 1. Create a user and a group
         def user = UserBuilder.instance()
             .setEmail(email)
             .setFirstName(firstName)
@@ -139,26 +141,22 @@ class GroupsIT extends ITSupport {
         registerForCleanup(user)
         validateUser(user, firstName, lastName, email)
 
-        // 2. Create a group
-        def groupName = "Group-Member API Test Group ${uniqueTestName}"
-        def group = GroupBuilder.instance()
+        String groupName = "Group-Member API Test Group ${uniqueTestName}"
+
+        Group group = GroupBuilder.instance()
             .setName(groupName)
             .buildAndCreate(groupApi)
         registerForCleanup(group)
         validateGroup(group, groupName)
 
-        // 3. Add user to the group and wait until user is actually present
-        groupApi.assignUserToGroup(group.id, user.id)
-        await().atMost(60, SECONDS).pollInterval(2, SECONDS).untilAsserted {
-            def found = groupApi.listGroupUsers(group.id, null, null).any { it.id == user.id }
-            assertThat("User should be present in the group", found, is(true))
-        }
-
-        // 4. Remove user from the group and wait until user is actually absent
-        groupApi.unassignUserFromGroup(group.id, user.id)
-        await().atMost(60, SECONDS).pollInterval(2, SECONDS).untilAsserted {
-            def found = groupApi.listGroupUsers(group.id, null, null).any { it.id == user.id }
-            assertThat("User should not be present in the group", found, is(false))
-        }
+        // 2. Add user to the group and validate user present in group
+        groupApi.assignUserToGroup(group.getId(), user.getId())
+        sleep(3000)
+        assertUserInGroup(user, group, groupApi, 10, getTestOperationDelay())
+
+        // 3. Remove user from group and validate user removed
+        groupApi.unassignUserFromGroup(group.getId(), user.getId())
+
+        assertUserNotInGroup(user, group, groupApi,10, getTestOperationDelay())
     }
 }