Clean-up Unit tests

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

src/integrationTest/java/com/salesforce/revoman/input/json/JsonReaderUtilsTest.java renamed to src/integrationTest/java/com/salesforce/revoman/input/json/JsonPojoUtils2Test.java

@@ -8,17 +8,37 @@
 package com.salesforce.revoman.input.json;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.salesforce.revoman.input.FileUtils.readFileInResourcesToString;
 import static com.salesforce.revoman.integration.core.pq.adapters.ConnectInputRepWithGraphAdapter.adapter;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.salesforce.revoman.integration.core.pq.connect.request.PlaceQuoteInputRepresentation;
 import com.salesforce.revoman.integration.core.pq.connect.request.PricingPreferenceEnum;
 import com.squareup.moshi.JsonDataException;
 import java.util.List;
+import org.json.JSONException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
-class JsonReaderUtilsTest {
+class JsonPojoUtils2Test {
+
+  @Test
+  @DisplayName("toJson: PQ Payload JSON -> PlaceQuoteInputRep -> PQ Payload JSON")
+  void pqInputRepToPQPayloadJson() throws JSONException {
+    final var pqAdapter = adapter(PlaceQuoteInputRepresentation.class);
+    final var pqPayloadJsonFilePath = "json/pq-payload.json";
+    final var pqInputRep =
+        JsonPojoUtils.<PlaceQuoteInputRepresentation>jsonFileToPojo(
+            PlaceQuoteInputRepresentation.class, pqPayloadJsonFilePath, List.of(pqAdapter));
+    assertThat(pqInputRep).isNotNull();
+    final var pqPayloadJsonStr =
+        JsonPojoUtils.pojoToJson(
+            PlaceQuoteInputRepresentation.class, pqInputRep, List.of(pqAdapter));
+    final var expectedPQPayload = readFileInResourcesToString(pqPayloadJsonFilePath);
+    JSONAssert.assertEquals(expectedPQPayload, pqPayloadJsonStr, JSONCompareMode.STRICT);
+  }
 
   @Test
   @DisplayName("fromJson: PQ payload JSON --> PlaceQuoteInputRep")

src/integrationTest/java/com/salesforce/revoman/input/json/JsonWriterUtilsTest.java

@@ -64,6 +64,18 @@ inline fun <reified PojoT : Any> jsonToPojo(
 ): PojoT? =
   jsonToPojo(PojoT::class.java, jsonStr, customAdapters, customAdaptersWithType, typesToIgnore)
 
+/**
+ * Generate a JSON string from a POJO object.
+ *
+ * @param pojoType The type of the POJO object.
+ * @param pojo The POJO object to be converted to JSON.
+ * @param customAdapters A list of custom adapters for Moshi to use during the conversion.
+ * @param customAdaptersWithType A map of custom adapters with their respective types.
+ * @param typesToIgnore A set of classes to ignore during the conversion.
+ * @param indent An optional string for pretty-printing the JSON output.
+ * @param <PojoT> The type of the POJO object.
+ * @return A JSON string or null if the input is null.
+ */
 @JvmOverloads
 fun <PojoT : Any> pojoToJson(
   pojoType: Type,

src/main/kotlin/com/salesforce/revoman/input/json/JsonPojoUtils.kt

@@ -8,14 +8,97 @@
 package com.salesforce.revoman.input.json;
 
 import static com.google.common.truth.Truth.assertThat;
-
+import static com.salesforce.revoman.input.FileUtils.readFileInResourcesToString;
+
+import com.salesforce.revoman.input.json.adapters.CompositeGraphResponse;
+import com.salesforce.revoman.input.json.adapters.CompositeGraphResponse.Graph.ErrorGraph;
+import com.salesforce.revoman.input.json.adapters.CompositeGraphResponse.Graph.SuccessGraph;
+import com.salesforce.revoman.input.json.adapters.SObjectGraphRequestMarshaller;
+import com.salesforce.revoman.input.json.pojo.SObjectGraphRequest;
+import com.salesforce.revoman.input.json.pojo.SObjectGraphRequest.Entity;
+import com.salesforce.revoman.input.json.pojo.SObjectGraphRequest.SObjectWithReferenceRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import org.json.JSONException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 class JsonPojoUtilsTest {
 
+  @Test
+  @DisplayName("DiMorphic CompositeGraph Success Response --> POJO --> JSON")
+  void compositeGraphSuccessResponseMarshallUnmarshall() throws JSONException {
+    final var graphSuccessResponseJsonStr =
+        readFileInResourcesToString("composite/graph/resp/graph-success-response.json");
+    final var successGraphResponse =
+        JsonPojoUtils.<CompositeGraphResponse>jsonToPojo(
+            CompositeGraphResponse.class,
+            graphSuccessResponseJsonStr,
+            List.of(CompositeGraphResponse.ADAPTER));
+    assertThat(successGraphResponse.getGraphs().get(0)).isInstanceOf(SuccessGraph.class);
+    final var successGraphResponseUnmarshalled =
+        JsonPojoUtils.pojoToJson(
+            CompositeGraphResponse.class,
+            successGraphResponse,
+            List.of(CompositeGraphResponse.ADAPTER));
+    JSONAssert.assertEquals(
+        graphSuccessResponseJsonStr, successGraphResponseUnmarshalled, JSONCompareMode.STRICT);
+  }
+
+  @Test
+  @DisplayName("DiMorphic CompositeGraph Error Response --> POJO --> JSON")
+  void compositeGraphErrorResponseMarshallUnmarshall() throws JSONException {
+    final var graphErrorResponseJsonStr =
+        readFileInResourcesToString("composite/graph/resp/graph-error-response.json");
+    final var errorGraphResponse =
+        JsonPojoUtils.<CompositeGraphResponse>jsonToPojo(
+            CompositeGraphResponse.class,
+            graphErrorResponseJsonStr,
+            List.of(CompositeGraphResponse.ADAPTER));
+    assertThat(errorGraphResponse.getGraphs().get(0)).isInstanceOf(ErrorGraph.class);
+    final var errorGraphResponseUnmarshalled =
+        JsonPojoUtils.pojoToJson(
+            CompositeGraphResponse.class,
+            errorGraphResponse,
+            List.of(CompositeGraphResponse.ADAPTER));
+    JSONAssert.assertEquals(
+        graphErrorResponseJsonStr, errorGraphResponseUnmarshalled, JSONCompareMode.STRICT);
+  }
+
+  @DisplayName("toJson: SObjectGraphRequest POJO --> PQ Payload JSON")
+  @Test
+  void sObjectGraphMarshallToPQPayload() throws JSONException {
+    final var pqTestInputRepMarshaller =
+        SObjectGraphRequestMarshaller.adapter(
+            Map.of("pricingPref", "skip", "configurationInput", "skip"));
+    final var pqPayloadJsonStr =
+        JsonPojoUtils.pojoToJson(
+            SObjectGraphRequest.class,
+            prepareSObjectGraphReqPojo(),
+            List.of(pqTestInputRepMarshaller));
+    final var expectedPQPayload = readFileInResourcesToString("json/pq-graph-req.json");
+    JSONAssert.assertEquals(expectedPQPayload, pqPayloadJsonStr, JSONCompareMode.STRICT);
+  }
+
+  static SObjectGraphRequest prepareSObjectGraphReqPojo() {
+    return new SObjectGraphRequest(
+        "pq-update-quote",
+        List.of(
+            new SObjectWithReferenceRequest(
+                "refQuote",
+                new Entity(
+                    Map.of(
+                        "attributes",
+                        Map.of("type", "Quote", "method", "PATCH", "id", "quoteId"),
+                        "Name",
+                        "Overfullstack")))));
+  }
+
   @Test
   @DisplayName("json file To Pojo")
   void jsonFileToPojo() {
@@ -29,19 +112,22 @@ void jsonFileToPojo() {
   @Test
   @DisplayName("json with Epoch Date To Pojo")
   void jsonWithEpochDateToPojo() {
+    final var epochDate = 1604216172747L;
     final var beanWithDate =
-        JsonPojoUtils.<BeanWithDate>jsonToPojo(BeanWithDate.class, "{\"date\": 1604216172813}");
+        JsonPojoUtils.<BeanWithDate>jsonToPojo(BeanWithDate.class, "{\"date\": " + epochDate + "}");
     assertThat(beanWithDate).isNotNull();
-    assertThat(beanWithDate.date).isNotNull();
+    assertThat(beanWithDate.date.toInstant().toEpochMilli()).isEqualTo(epochDate);
   }
 
   @Test
   @DisplayName("json with ISO Date To Pojo")
-  void jsonWithISODateToPojo() {
+  void jsonWithISODateToPojo() throws ParseException {
+    final var date = "2015-09-01";
     final var beanWithDate =
-        JsonPojoUtils.<BeanWithDate>jsonToPojo(BeanWithDate.class, "{\"date\": \"2015-09-01\"}");
+        JsonPojoUtils.<BeanWithDate>jsonToPojo(BeanWithDate.class, "{\"date\": \"" + date + "\"}");
     assertThat(beanWithDate).isNotNull();
-    assertThat(beanWithDate.date).isNotNull();
+    final var formatter = new SimpleDateFormat("yyyy-MM-dd");
+    assertThat(beanWithDate.date).isEqualTo(formatter.parse(date));
   }
 
   @Test

src/test/java/com/salesforce/revoman/input/json/JsonPojoUtilsTest.java

@@ -8,6 +8,7 @@
 package com.salesforce.revoman.input.json.pojo;
 
 import java.util.List;
+import java.util.Map;
 
 public class SObjectGraphRequest {
 
@@ -26,4 +27,34 @@ public String getGraphId() {
   public List<SObjectWithReferenceRequest> getRecords() {
     return this.records;
   }
+
+  public static class Entity {
+    private final Map<String, Object> fields;
+
+    public Entity(Map<String, Object> fields) {
+      this.fields = fields;
+    }
+
+    public Map<String, Object> getFields() {
+      return fields;
+    }
+  }
+
+  public static class SObjectWithReferenceRequest {
+    private final String referenceId;
+    private final Entity record;
+
+    public SObjectWithReferenceRequest(String referenceId, Entity record) {
+      this.referenceId = referenceId;
+      this.record = record;
+    }
+
+    public String getReferenceId() {
+      return this.referenceId;
+    }
+
+    public Entity getRecord() {
+      return this.record;
+    }
+  }
 }