From ada127fbdf3074741803ef1708ea0bb7e4d74dc8 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Mon, 18 Nov 2013 08:25:46 +0000
Subject: [PATCH] fix failing integrated test around groups.

---
 .../integrationtests/common/GroupHelper.java           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 ce81e2ee7..15dc601bb 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
@@ -8,6 +8,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
@@ -74,14 +76,15 @@ public class GroupHelper {
         map.put("officeId", "1");
         map.put("name", randomNameGenerator("Group_Name_", 5));
         map.put("externalId", randomIDGenerator("ID_", 7));
+        map.put("dateFormat", "dd MMMM yyyy");
+        map.put("locale", "en");
         if (active) {
             map.put("active", "true");
-            map.put("dateFormat", "dd MMMM yyyy");
-            map.put("locale", "en");
             map.put("activationDate", activationDate);
         } else {
             map.put("active", "false");
             map.put("submittedOnDate", "04 March 2011");
+            System.out.println("defaulting to inactive group: 04 March 2011");
         }
 
         System.out.println("map : " + map);
@@ -101,10 +104,11 @@ public class GroupHelper {
         final HashMap<String, String> map = new HashMap<String, String>();
         map.put("dateFormat", "dd MMMM yyyy");
         map.put("locale", "en");
-        if (activationDate != "") {
+        if (StringUtils.isNotEmpty(activationDate)) {
             map.put("activationDate", activationDate);
         } else {
             map.put("activationDate", "04 March 2011");
+            System.out.println("defaulting to fixed date: 04 March 2011");
         }
         System.out.println("map : " + map);
         return new Gson().toJson(map);