diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupLoanIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupLoanIntegrationTest.java index 8e216d82b..b309d9852 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupLoanIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupLoanIntegrationTest.java @@ -2,7 +2,6 @@ package org.mifosplatform.integrationtests; import static org.junit.Assert.assertEquals; -import java.lang.System; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -46,7 +45,7 @@ public class GroupLoanIntegrationTest { loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec); Integer clientID = ClientHelper.createClient(requestSpec, responseSpec); - Integer groupID = GroupHelper.createGroup(requestSpec, responseSpec,true); + Integer groupID = GroupHelper.createGroup(requestSpec, responseSpec, true); groupID = GroupHelper.associateClient(requestSpec, responseSpec, groupID.toString(),clientID.toString()); Integer loanProductID = createLoanProduct(); 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 8785a2b6a..4b8374474 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupTest.java @@ -1,19 +1,10 @@ package org.mifosplatform.integrationtests; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; - import org.junit.Before; import org.junit.Test; import org.mifosplatform.integrationtests.common.ClientHelper; import org.mifosplatform.integrationtests.common.GroupHelper; import org.mifosplatform.integrationtests.common.Utils; -import org.mifosplatform.integrationtests.common.loans.LoanApplicationTestBuilder; -import org.mifosplatform.integrationtests.common.loans.LoanProductTestBuilder; -import org.mifosplatform.integrationtests.common.loans.LoanTransactionHelper; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.builder.ResponseSpecBuilder; @@ -22,15 +13,13 @@ import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.ResponseSpecification; /** - * Group Test for checking Group: - * Creation, Activation, Client Association, Updating & Deletion + * Group Test for checking Group: Creation, Activation, Client Association, + * Updating & Deletion */ -@SuppressWarnings({ "rawtypes", "unchecked" }) public class GroupTest { private ResponseSpecification responseSpec; private RequestSpecification requestSpec; - private LoanTransactionHelper loanTransactionHelper; @Before public void setup() { @@ -49,15 +38,15 @@ public class GroupTest { groupID = GroupHelper.activateGroup(requestSpec, responseSpec, groupID.toString()); GroupHelper.verifyGroupActivatedOnServer(requestSpec, responseSpec, groupID, true); - groupID = GroupHelper.associateClient(requestSpec, responseSpec, groupID.toString(),clientID.toString()); - GroupHelper.verifyGroupMembers(requestSpec,responseSpec,groupID, clientID); + groupID = GroupHelper.associateClient(requestSpec, responseSpec, groupID.toString(), clientID.toString()); + GroupHelper.verifyGroupMembers(requestSpec, responseSpec, groupID, clientID); - groupID = GroupHelper.disAssociateClient(requestSpec, responseSpec, groupID.toString(),clientID.toString()); - GroupHelper.verifyEmptyGroupMembers(requestSpec,responseSpec,groupID); + groupID = GroupHelper.disAssociateClient(requestSpec, responseSpec, groupID.toString(), clientID.toString()); + GroupHelper.verifyEmptyGroupMembers(requestSpec, responseSpec, groupID); - String updatedGroupName=GroupHelper.randomNameGenerator("Group-",5); + String updatedGroupName = GroupHelper.randomNameGenerator("Group-", 5); groupID = GroupHelper.updateGroup(requestSpec, responseSpec, updatedGroupName, groupID.toString()); - GroupHelper.verifyGroupDetails(requestSpec, responseSpec, groupID,"name",updatedGroupName); + GroupHelper.verifyGroupDetails(requestSpec, responseSpec, groupID, "name", updatedGroupName); groupID = GroupHelper.createGroup(requestSpec, responseSpec); GroupHelper.deleteGroup(requestSpec, responseSpec, groupID.toString()); 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 374aa9779..973da206c 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 @@ -1,13 +1,13 @@ package org.mifosplatform.integrationtests.common; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import java.lang.Boolean; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; + import com.google.gson.Gson; import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.ResponseSpecification; @@ -17,77 +17,73 @@ public class GroupHelper { private static final String CREATE_GROUP_URL = "/mifosng-provider/api/v1/groups?tenantIdentifier=default"; public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final boolean active) { + @SuppressWarnings("unused") final boolean active) { System.out.println("---------------------------------CREATING A GROUP---------------------------------------------"); return createGroup(requestSpec, responseSpec, "04 March 2011"); } public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final String activationDate) { + final String activationDate) { System.out.println("---------------------------------CREATING A GROUP---------------------------------------------"); - return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(true,activationDate), "groupId"); + return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(true, activationDate), "groupId"); } public static Integer createGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { System.out.println("---------------------------------CREATING A GROUP---------------------------------------------"); - return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false,""), "groupId"); + return Utils.performServerPost(requestSpec, responseSpec, CREATE_GROUP_URL, getTestGroupAsJSON(false, ""), "groupId"); } public static Integer associateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final String groupId, final String clientMember) { + final String groupId, final String clientMember) { String GROUP_ASSOCIATE_URL = "/mifosng-provider/api/v1/groups/" + groupId + "?command=associateClients&tenantIdentifier=default"; System.out.println("---------------------------------Associate Client To A GROUP---------------------------------------------"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId"); } public static Integer disAssociateClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final String groupId, final String clientMember) { + final String groupId, final String clientMember) { String GROUP_ASSOCIATE_URL = "/mifosng-provider/api/v1/groups/" + groupId + "?command=disassociateClients&tenantIdentifier=default"; System.out.println("---------------------------------Disassociate Client To A GROUP---------------------------------------------"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, associateClientAsJSON(clientMember), "groupId"); } public static Integer activateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final String groupId) { + final String groupId) { String GROUP_ASSOCIATE_URL = "/mifosng-provider/api/v1/groups/" + groupId + "?command=activate&tenantIdentifier=default"; System.out.println("---------------------------------Activate A GROUP---------------------------------------------"); return Utils.performServerPost(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, activateGroupAsJSON(""), "groupId"); } - public static Integer updateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - String name, final String groupId) { + public static Integer updateGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String name, + final String groupId) { String GROUP_ASSOCIATE_URL = "/mifosng-provider/api/v1/groups/" + groupId + "?tenantIdentifier=default"; System.out.println("---------------------------------UPDATE GROUP---------------------------------------------"); return Utils.performServerPut(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, updateGroupAsJSON(name), "groupId"); } - public static Integer deleteGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final String groupId) { + public static Integer deleteGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, final String groupId) { String GROUP_ASSOCIATE_URL = "/mifosng-provider/api/v1/groups/" + groupId + "?tenantIdentifier=default"; System.out.println("---------------------------------DELETE GROUP---------------------------------------------"); return Utils.performServerDelete(requestSpec, responseSpec, GROUP_ASSOCIATE_URL, "groupId"); } - public static String getTestGroupAsJSON(final boolean active, final String activationDate) { HashMap map = new HashMap(); map.put("officeId", "1"); map.put("name", randomNameGenerator("Group_Name_", 5)); map.put("externalId", randomIDGenerator("ID_", 7)); - if (active==true){ + if (active == true) { map.put("active", "true"); map.put("dateFormat", "dd MMMM yyyy"); map.put("locale", "en"); map.put("activationDate", activationDate); - } - else + } else map.put("active", "false"); System.out.println("map : " + map); return new Gson().toJson(map); } - public static String associateClientAsJSON(final String clientMember) { HashMap> map = new HashMap>(); List list = new ArrayList(); @@ -117,55 +113,55 @@ public class GroupHelper { } public static void verifyGroupCreatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID) { + final Integer generatedGroupID) { System.out.println("------------------------------CHECK GROUP DETAILS------------------------------------\n"); String GROUP_URL = "/mifosng-provider/api/v1/groups/" + generatedGroupID + "?tenantIdentifier=default"; Integer responseGroupID = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, "id"); - assertEquals("ERROR IN CREATING THE GROUP",generatedGroupID, responseGroupID); + assertEquals("ERROR IN CREATING THE GROUP", generatedGroupID, responseGroupID); } public static void verifyGroupDetails(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID, final String field, final String expectedValue) { + final Integer generatedGroupID, final String field, final String expectedValue) { System.out.println("------------------------------CHECK GROUP DETAILS------------------------------------\n"); String GROUP_URL = "/mifosng-provider/api/v1/groups/" + generatedGroupID + "?tenantIdentifier=default"; String responseValue = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, field); - assertEquals("ERROR IN CREATING THE GROUP",expectedValue, responseValue); + assertEquals("ERROR IN CREATING THE GROUP", expectedValue, responseValue); } public static void verifyGroupActivatedOnServer(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID, final boolean generatedGroupStatus) { + final Integer generatedGroupID, final boolean generatedGroupStatus) { System.out.println("------------------------------CHECK GROUP STATUS------------------------------------\n"); String GROUP_URL = "/mifosng-provider/api/v1/groups/" + generatedGroupID + "?tenantIdentifier=default"; Boolean responseGroupStatus = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, "active"); - assertEquals("ERROR IN ACTIVATING THE GROUP",generatedGroupStatus, responseGroupStatus); + assertEquals("ERROR IN ACTIVATING THE GROUP", generatedGroupStatus, responseGroupStatus); } public static void verifyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID, final Integer groupMember) { + final Integer generatedGroupID, final Integer groupMember) { List list = new ArrayList(); System.out.println("------------------------------CHECK GROUP MEMBERS------------------------------------\n"); String GROUP_URL = "/mifosng-provider/api/v1/groups/" + generatedGroupID + "?associations=clientMembers&tenantIdentifier=default"; list = Utils.performServerGet(requestSpec, responseSpec, GROUP_URL, "clientMembers"); - assertTrue("ERROR IN GROUP MEMBER",list.toString().contains("id=" + groupMember.toString())); + assertTrue("ERROR IN GROUP MEMBER", list.toString().contains("id=" + groupMember.toString())); } public static void verifyEmptyGroupMembers(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID) { + final Integer generatedGroupID) { List list = new ArrayList(); 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"); - assertEquals("GROUP MEMBER LIST NOT EMPTY",list, null); + assertEquals("GROUP MEMBER LIST NOT EMPTY", list, null); } public static void verifyGroupDeleted(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, - final Integer generatedGroupID) { + 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())); + + assertFalse("GROUP NOT DELETED", list.toString().contains("id=" + generatedGroupID.toString())); } public static String randomNameGenerator(final String prefix, final int lenOfRandomSuffix) {