From 0e3cc7113a33e6aa633d0d8cd55d4994f5945a28 Mon Sep 17 00:00:00 2001 From: Shiyu Liu Date: Mon, 4 Oct 2021 22:32:47 -0500 Subject: [PATCH 1/2] Update ServerSideTest.java --- src/test/java/com/facebook/ads/ServerSideTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/facebook/ads/ServerSideTest.java b/src/test/java/com/facebook/ads/ServerSideTest.java index cbd5ec33..7982b498 100644 --- a/src/test/java/com/facebook/ads/ServerSideTest.java +++ b/src/test/java/com/facebook/ads/ServerSideTest.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; public class ServerSideTest { @@ -85,10 +86,13 @@ public void CustomDataParametersTest() { String serializedPayload = eventRequest.getSerializedPayload(); // ASSERT - String cpString = (new Gson()).toJson(customProperties); String serializedContents = (new Gson()).toJson(contents); String serializedContentIds = (new Gson()).toJson(contentIds); - Assert.assertTrue(serializedPayload.contains(cpString.substring(1, cpString.length() - 1))); + + Map mp = customProperties; + mp.forEach((key, value) -> Assert.assertTrue(serializedPayload.contains( + "\"" + key + "\":" + "\"" + value + "\"" + ))); Assert.assertTrue(serializedPayload.contains(serializedContents)); Assert.assertTrue(serializedPayload.contains(serializedContentIds)); Assert.assertTrue(serializedPayload.contains(currency.toLowerCase())); From 142d95b72aea7f73639037d5157e40f09bb54506 Mon Sep 17 00:00:00 2001 From: Shiyu Liu Date: Mon, 4 Oct 2021 22:35:11 -0500 Subject: [PATCH 2/2] Update SignalTest.java --- src/test/java/com/facebook/ads/SignalTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/facebook/ads/SignalTest.java b/src/test/java/com/facebook/ads/SignalTest.java index 3a9476ac..61b4eef9 100644 --- a/src/test/java/com/facebook/ads/SignalTest.java +++ b/src/test/java/com/facebook/ads/SignalTest.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; public class SignalTest { @Test @@ -100,8 +101,9 @@ public void EventRequestTest() { Assert.assertTrue(bdapiDataJSON.contains("\"event_name\":\"Purchase\"")); String capiDataJSON = (new Gson()).toJson(capiEventRequest.getData()); - String customPropertiesJSON = (new Gson()).toJson(customProperties); - Assert.assertTrue(capiDataJSON - .contains(customPropertiesJSON.substring(1, customPropertiesJSON.length() - 1))); + Map mp = customProperties; + mp.forEach((key, value) -> Assert.assertTrue(capiDataJSON.contains( + "\"" + key + "\":" + "\"" + value + "\"" + ))); } }