From 77c36d2ed34cbba73fd6824af026e2295771c106 Mon Sep 17 00:00:00 2001
From: Brian Chan <brian.chan@liferay.com>
Date: Thu, 2 Jul 2020 09:01:17 -0700
Subject: [PATCH] LPS-115820 Simplify, no need to be so fancy - Hugo SF, always
 call toString instead of toJSONString (impl is the same thing)

---
 ...heckboxMultipleDDMFormFieldTypeReportProcessorTest.java | 6 +++---
 .../report/GridDDMFormFieldTypeReportProcessorTest.java    | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java
index 09a8e3bd9ec5c7..eb1bb39dc26adf 100644
--- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java
+++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/CheckboxMultipleDDMFormFieldTypeReportProcessorTest.java
@@ -70,7 +70,7 @@ public void testProcessDDMFormInstanceReportOnDeleteEvent()
 			value.getDefaultLocale(),
 			JSONUtil.put(
 				"option1"
-			).toJSONString());
+			).toString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(
@@ -120,7 +120,7 @@ public void testProcessDDMFormInstanceReportWithEmptyData()
 			value.getDefaultLocale(),
 			JSONUtil.put(
 				"option1"
-			).toJSONString());
+			).toString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(
@@ -173,7 +173,7 @@ public void testProcessDDMFormInstanceReportWithExistingData()
 			value.getDefaultLocale(),
 			JSONUtil.putAll(
 				"option1", "option2"
-			).toJSONString());
+			).toString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(
diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java
index 30d73e34e0d14e..3b4ff79b84619e 100644
--- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java
+++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/test/java/com/liferay/dynamic/data/mapping/internal/report/GridDDMFormFieldTypeReportProcessorTest.java
@@ -200,12 +200,12 @@ private void _assertStructure(JSONObject structureJSONObject) {
 			"columns");
 
 		Assert.assertEquals(
-			expectedJSONArray.toJSONString(), columnsJSONArray.toJSONString());
+			expectedJSONArray.toString(), columnsJSONArray.toString());
 
 		JSONArray rowsJSONArray = structureJSONObject.getJSONArray("rows");
 
 		Assert.assertEquals(
-			expectedJSONArray.toJSONString(), rowsJSONArray.toJSONString());
+			expectedJSONArray.toString(), rowsJSONArray.toString());
 	}
 
 	private DDMFormFieldOptions _createDDMFormOptions() {
@@ -236,8 +236,7 @@ private DDMFormFieldValue _mockDDMFormFieldValue(
 
 		Value value = new LocalizedValue();
 
-		value.addString(
-			value.getDefaultLocale(), valueJSONObject.toJSONString());
+		value.addString(value.getDefaultLocale(), valueJSONObject.toString());
 		value.setDefaultLocale(LocaleUtil.US);
 
 		when(