From bbb32f501f777da1debafed6b80765f1301746d0 Mon Sep 17 00:00:00 2001 From: Awasum Yannick Date: Fri, 26 Apr 2019 13:35:45 +0100 Subject: [PATCH] FINERACT-751 Fix CenterIntegrationTest Case --- .../CenterIntegrationTest.java | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java index d923ee570..77ca0154c 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java @@ -199,61 +199,64 @@ public class CenterIntegrationTest { @Test public void testStaffAssignmentDuringCenterCreation() { - Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); + final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); System.out.println("--------------creating first staff with id-------------" + staffId); Assert.assertNotNull(staffId); - int centerWithStaffId = CenterHelper.createCenterWithStaffId(this.requestSpec, this.responseSpec, staffId); - CenterDomain center = CenterHelper.retrieveByID(centerWithStaffId, requestSpec, responseSpec); + final int centerWithStaffId = CenterHelper.createCenterWithStaffId(this.requestSpec, this.responseSpec, staffId); + final CenterDomain center = CenterHelper.retrieveByID(centerWithStaffId, requestSpec, responseSpec); Assert.assertNotNull(center); Assert.assertTrue(center.getId() == centerWithStaffId); - Assert.assertTrue(center.getStaffId() == staffId); + Assert.assertTrue(center.getStaffId().intValue() == staffId); Assert.assertTrue(center.isActive() == true); } @Test public void testAssignStaffToCenter() { - Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); + final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); System.out.println("--------------creating first staff with id-------------" + staffId); Assert.assertNotNull(staffId); - Integer groupID = CenterHelper.createCenter(this.requestSpec, this.responseSpec); + final Integer groupID = CenterHelper.createCenter(this.requestSpec, this.responseSpec); CenterHelper.verifyCenterCreatedOnServer(this.requestSpec, this.responseSpec, groupID); - HashMap assignStaffToCenterResponseMap = (HashMap) CenterHelper.assignStaff(this.requestSpec, this.responseSpec, groupID.toString(), + final HashMap assignStaffToCenterResponseMap = (HashMap) CenterHelper.assignStaff(this.requestSpec, + this.responseSpec, groupID.toString(), staffId.longValue()); assertEquals("Verify assigned staff id is the same as id sent", assignStaffToCenterResponseMap.get("staffId"), staffId); - CenterDomain center = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); + final CenterDomain center = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); Assert.assertNotNull(center); - Assert.assertTrue(center.getId() == groupID); - Assert.assertTrue(center.getStaffId() == staffId); + Assert.assertTrue(center.getId().intValue() == groupID); + Assert.assertTrue(center.getStaffId().intValue() == staffId); } @Test public void testUnassignStaffToCenter() { - Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); + final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); System.out.println("--------------creating first staff with id-------------" + staffId); Assert.assertNotNull(staffId); - Integer groupID = CenterHelper.createCenter(this.requestSpec, this.responseSpec); + final Integer groupID = CenterHelper.createCenter(this.requestSpec, this.responseSpec); CenterHelper.verifyCenterCreatedOnServer(this.requestSpec, this.responseSpec, groupID); - HashMap assignStaffToCenterResponseMap = (HashMap) CenterHelper.assignStaff(this.requestSpec, this.responseSpec, groupID.toString(), + final HashMap assignStaffToCenterResponseMap = (HashMap) CenterHelper.assignStaff(this.requestSpec, + this.responseSpec, groupID.toString(), staffId.longValue()); assertEquals("Verify assigned staff id is the same as id sent", assignStaffToCenterResponseMap.get("staffId"), staffId); - CenterDomain centerWithStaffAssigned = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); + final CenterDomain centerWithStaffAssigned = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); Assert.assertNotNull(centerWithStaffAssigned); - Assert.assertTrue(centerWithStaffAssigned.getId() == groupID); - Assert.assertTrue(centerWithStaffAssigned.getStaffId() == staffId); + Assert.assertTrue(centerWithStaffAssigned.getId().intValue() == groupID); + Assert.assertTrue(centerWithStaffAssigned.getStaffId().intValue() == staffId); - HashMap unassignStaffToCenterResponseMap = (HashMap) CenterHelper.unassignStaff(this.requestSpec, this.responseSpec, groupID.toString(), + final HashMap unassignStaffToCenterResponseMap = (HashMap) CenterHelper.unassignStaff(this.requestSpec, + this.responseSpec, groupID.toString(), staffId.longValue()); assertEquals("Verify staffId is null after unassigning ", unassignStaffToCenterResponseMap.get("staffId"), null); - CenterDomain centerWithStaffUnssigned = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); + final CenterDomain centerWithStaffUnssigned = CenterHelper.retrieveByID(groupID, requestSpec, responseSpec); Assert.assertNotNull(centerWithStaffUnssigned); - Assert.assertTrue(centerWithStaffUnssigned.getId() == groupID); + Assert.assertTrue(centerWithStaffUnssigned.getId().intValue() == groupID); Assert.assertTrue(centerWithStaffUnssigned.getStaffId() == null); }