CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

fix failing integrated test around groups.

Browse Source
This commit is contained in:
Keith Woodlock
2013-11-18 08:25:46 +00:00
parent 4975c1c18f
commit ada127fbdf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/GroupHelper.java
+7 -3
View File
@@ -8,6 +8,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import com.jayway.restassured.specification.ResponseSpecification;
@@ -74,14 +76,15 @@ public class GroupHelper {
map.put("officeId", "1"); map.put("officeId", "1");
map.put("name", randomNameGenerator("Group_Name_", 5)); map.put("name", randomNameGenerator("Group_Name_", 5));
map.put("externalId", randomIDGenerator("ID_", 7)); map.put("externalId", randomIDGenerator("ID_", 7));
map.put("dateFormat", "dd MMMM yyyy");
map.put("locale", "en");
if (active) { if (active) {
map.put("active", "true"); map.put("active", "true");
map.put("dateFormat", "dd MMMM yyyy");
map.put("locale", "en");
map.put("activationDate", activationDate); map.put("activationDate", activationDate);
} else { } else {
map.put("active", "false"); map.put("active", "false");
map.put("submittedOnDate", "04 March 2011"); map.put("submittedOnDate", "04 March 2011");
System.out.println("defaulting to inactive group: 04 March 2011");
} }
System.out.println("map : " + map); System.out.println("map : " + map);
@@ -101,10 +104,11 @@ public class GroupHelper {
final HashMap<String, String> map = new HashMap<String, String>(); final HashMap<String, String> map = new HashMap<String, String>();
map.put("dateFormat", "dd MMMM yyyy"); map.put("dateFormat", "dd MMMM yyyy");
map.put("locale", "en"); map.put("locale", "en");
if (activationDate != "") { if (StringUtils.isNotEmpty(activationDate)) {
map.put("activationDate", activationDate); map.put("activationDate", activationDate);
} else { } else {
map.put("activationDate", "04 March 2011"); map.put("activationDate", "04 March 2011");
System.out.println("defaulting to fixed date: 04 March 2011");
} }
System.out.println("map : " + map); System.out.println("map : " + map);
return new Gson().toJson(map); return new Gson().toJson(map);