From f9a57a53ba19458522c84c49682786a8fee821a1 Mon Sep 17 00:00:00 2001 From: varunVNnayar Date: Wed, 10 Dec 2014 18:43:40 +0530 Subject: [PATCH] Test case 1 for Office creation. --- .../integrationtests/OfficeIntegrationsTest | 31 ++++++++++++++++++- .../common/office/OfficeHelper | 6 +++- .../common/office/OfficeResourceHandler | 4 +-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/OfficeIntegrationsTest b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/OfficeIntegrationsTest index 118e6d854..85216d61e 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/OfficeIntegrationsTest +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/OfficeIntegrationsTest @@ -13,6 +13,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mifosplatform.integrationtests.common.Utils; +import org.mifosplatform.integrationtests.common.office.OfficeHelper; +import org.mifosplatform.integrationtests.common.office.OfficeResourceHandler; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.builder.ResponseSpecBuilder; @@ -33,5 +35,32 @@ public class OfficeIntegrationsTest { this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); this.statusOkResponseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); } -} + @Test + public void testCreateOffice() + { + int random_array = {1997, 26, 12}; + OfficeHelper oh = OfficeHelper // oh ---> Office Helper + .create(Utils.randomNameGenerator("", 5)) + .externalId(Utils.randomNameGenerator("offices-", 7)) + .nameDecorated(Utils.randomNameGenerator("", 8)) + .openingDate(random_array) + .hierarchy(".") + .build(); + String JsonData = oh.toJSON(); + final Long officeID = createOfficeID(JsonData, this.requestSpec, this.statusOkResponseSpec); + Assert.assertNotNull(officeID); + + } + private Long createOffice(final String officeJSON, + final RequestSpecification requestSpec, + final ResponseSpecification responseSpec) { + String officeId = String.valueOf(OfficeResourceHandler.createOffice(officeJSON, requestSpec, responseSpec)); + if (officeId.equals("null")) { + // Invalid JSON data parameters + return null; + } + + return new Long(officeId); +} +} diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeHelper b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeHelper index 02368d7ea..6ca1074b1 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeHelper +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeHelper @@ -36,7 +36,7 @@ public class OfficeHelper { this.hierarchy = hierarchy; } public OfficeHelper build() { - return new OfficeHelper(this.name, this.externalId, this.id, this.nameDecorated, this.openingDate, this.hierarchy); + return new OfficeHelper(this.name, this.externalId, this.nameDecorated, this.openingDate, this.hierarchy); } } @@ -96,6 +96,10 @@ public class OfficeHelper { return this.openingDate; } + public static Builder create(final String name) { + return new Builder(name); + } + } diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeResourceHandler b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeResourceHandler index bc79caf88..6fa6d354d 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeResourceHandler +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/office/OfficeResourceHandler @@ -14,10 +14,10 @@ public class OfficeResourceHandler { private static final String OFFICES_URL = "/mifosng-provider/api/v1/offices"; private static final String CREATE_OFFICES_URL = OFFICES_URL + "?" + Utils.TENANT_IDENTIFIER; - public static Integer createFund(final String fundJSON, + public static Integer createOffice(final String officeJSON, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { - return Utils.performServerPost(requestSpec, responseSpec, CREATE_FUNDS_URL, fundJSON, "resourceId"); + return Utils.performServerPost(requestSpec, responseSpec, CREATE_OFFICES_URL, officeJSON, "resourceId"); } public Integer createOffice(final String openingDate) {