diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java index 3dc206122..877cbbba2 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java @@ -41,7 +41,7 @@ public class GroupTest { } @Test - public void checkGroupLoanCreateAndDisburseFlow() { + public void checkGroupFunctions() { Integer clientID = ClientHelper.createClient(requestSpec, responseSpec); Integer groupID = GroupHelper.createGroup(requestSpec, responseSpec); GroupHelper.verifyGroupCreatedOnServer(requestSpec, responseSpec, groupID); @@ -60,8 +60,7 @@ public class GroupTest { GroupHelper.verifyGroupDetails(requestSpec, responseSpec, groupID,"name",updatedGroupName); groupID = GroupHelper.createGroup(requestSpec, responseSpec); - groupID = GroupHelper.deleteGroup(requestSpec, responseSpec, groupID.toString()); - GroupHelper.verifyGroupCreatedOnServer(requestSpec, responseSpec, groupID); - + Integer groupID2 = GroupHelper.deleteGroup(requestSpec, responseSpec, groupID.toString()); + GroupHelper.verifyGroupDeleted(requestSpec, responseSpec, groupID); } } \ No newline at end of file diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/GroupHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/GroupHelper.java index 4695352e8..6ba7a0a35 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/GroupHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/GroupHelper.java @@ -2,6 +2,7 @@ package org.mifosplatform.integrationtests.common; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; import java.util.HashMap; import java.util.ArrayList; @@ -153,10 +154,19 @@ public class GroupHelper { System.out.println("------------------------------CHECK EMPTY GROUP MEMBER LIST------------------------------------\n"); String GROUP_URL = "/mifosng-provider/api/v1/groups/" + generatedGroupID + "?associations=clientMembers&tenantIdentifier=default"; list = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, "clientMembers"); - System.out.println(list); assertEquals("GROUP MEMBER LIST NOT EMPTY",list, null); } + public static void verifyGroupDeleted(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, + final Integer generatedGroupID) { + List list = new ArrayList(); + System.out.println("------------------------------CHECK GROUP DELETED------------------------------------\n"); + String GROUP_URL = "/mifosng-provider/api/v1/groups/?tenantIdentifier=default"; + list = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, "pageItems"); + + assertFalse("GROUP NOT DELETED",list.toString().contains("id=" + generatedGroupID.toString())); + } + public static String randomNameGenerator(final String prefix, final int lenOfRandomSuffix) { return Utils.randomStringGenerator(prefix, lenOfRandomSuffix); }