LPS-115820 use JSONUtil to define DDMFormFieldValue values in tests

liferay · Jul 2, 2020 · 2dd0514 · 2dd0514
1 parent e7db052
commit 2dd0514
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/...mic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java b/...mic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java
@@ -66,7 +66,11 @@ public void testProcessDDMFormInstanceReportOnDeleteEvent()
 
 		Value value = new LocalizedValue();
 
-		value.addString(value.getDefaultLocale(), "[\"option1\"]");
+		value.addString(
+			value.getDefaultLocale(),
+			JSONUtil.put(
+				"option1"
+			).toJSONString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(
@@ -112,7 +116,11 @@ public void testProcessDDMFormInstanceReportWithEmptyData()
 
 		Value value = new LocalizedValue();
 
-		value.addString(value.getDefaultLocale(), "[\"option1\"]");
+		value.addString(
+			value.getDefaultLocale(),
+			JSONUtil.put(
+				"option1"
+			).toJSONString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(
@@ -161,7 +169,11 @@ public void testProcessDDMFormInstanceReportWithExistingData()
 
 		Value value = new LocalizedValue();
 
-		value.addString(value.getDefaultLocale(), "[\"option1\", \"option2\"]");
+		value.addString(
+			value.getDefaultLocale(),
+			JSONUtil.putAll(
+				"option1", "option2"
+			).toJSONString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(

diff --git a/...liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java b/...liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java
@@ -64,7 +64,7 @@ public void testProcessDDMFormInstanceReportOnDeleteEvent()
 		throws Exception {
 
 		DDMFormFieldValue ddmFormFieldValue = _mockDDMFormFieldValue(
-			"field1", "{\"option1\":\"option2\"}");
+			"field1", JSONUtil.put("option1", "option2"));
 
 		JSONObject processedFieldJSONObject =
 			_gridDDMFormFieldTypeReportProcessor.process(
@@ -98,7 +98,7 @@ public void testProcessDDMFormInstanceReportWithEmptyData()
 		throws Exception {
 
 		DDMFormFieldValue ddmFormFieldValue = _mockDDMFormFieldValue(
-			"field1", "{\"option1\":\"option2\"}");
+			"field1", JSONUtil.put("option1", "option2"));
 
 		JSONObject processedFieldJSONObject =
 			_gridDDMFormFieldTypeReportProcessor.process(
@@ -132,7 +132,7 @@ public void testProcessDDMFormInstanceReportWithEmptyField()
 		throws Exception {
 
 		DDMFormFieldValue ddmFormFieldValue = _mockDDMFormFieldValue(
-			"field1", "");
+			"field1", JSONFactoryUtil.createJSONObject());
 
 		JSONObject processedFieldJSONObject =
 			_gridDDMFormFieldTypeReportProcessor.process(
@@ -164,7 +164,7 @@ public void testProcessDDMFormInstanceReportWithExistingData()
 		throws Exception {
 
 		DDMFormFieldValue ddmFormFieldValue = _mockDDMFormFieldValue(
-			"field1", "{\"option1\":\"option2\"}");
+			"field1", JSONUtil.put("option1", "option2"));
 
 		JSONObject processedFieldJSONObject =
 			_gridDDMFormFieldTypeReportProcessor.process(
@@ -194,16 +194,18 @@ public void testProcessDDMFormInstanceReportWithExistingData()
 	}
 
 	private void _assertStructure(JSONObject structureJSONObject) {
+		JSONArray expectedJSONArray = JSONUtil.putAll("option1", "option2");
+
 		JSONArray columnsJSONArray = structureJSONObject.getJSONArray(
 			"columns");
 
 		Assert.assertEquals(
-			"[\"option1\",\"option2\"]", columnsJSONArray.toJSONString());
+			expectedJSONArray.toJSONString(), columnsJSONArray.toJSONString());
 
 		JSONArray rowsJSONArray = structureJSONObject.getJSONArray("rows");
 
 		Assert.assertEquals(
-			"[\"option1\",\"option2\"]", rowsJSONArray.toJSONString());
+			expectedJSONArray.toJSONString(), rowsJSONArray.toJSONString());
 	}
 
 	private DDMFormFieldOptions _createDDMFormOptions() {
@@ -216,7 +218,7 @@ private DDMFormFieldOptions _createDDMFormOptions() {
 	}
 
 	private DDMFormFieldValue _mockDDMFormFieldValue(
-		String name, String valueString) {
+		String name, JSONObject valueJSONObject) {
 
 		DDMFormFieldValue ddmFormFieldValue = mock(DDMFormFieldValue.class);
 
@@ -234,7 +236,8 @@ private DDMFormFieldValue _mockDDMFormFieldValue(
 
 		Value value = new LocalizedValue();
 
-		value.addString(value.getDefaultLocale(), valueString);
+		value.addString(
+			value.getDefaultLocale(), valueJSONObject.toJSONString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(