[rewrite] #1281 missed changes in previous commit

karatelabs · Oct 3, 2020 · 0396621 · 0396621
1 parent d44b9ef
commit 0396621
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/karate-core2/src/main/java/com/intuit/karate/data/Json.java b/karate-core2/src/main/java/com/intuit/karate/data/Json.java
@@ -54,8 +54,16 @@ public Json(String json) {
         this(JsonPath.parse(json));
     }
 
-    public Json(Object o) {
+    public Json(Map o) {
+        this(JsonPath.parse(o));
+    }
+
+    public Json(List o) {
         this(JsonPath.parse(o));
+    }    
+
+    public Json(Object o) {
+        this(JsonUtils.toJson(o));
     }
 
     private Json(DocumentContext doc) {

diff --git a/karate-core2/src/main/java/com/intuit/karate/match/MatchValue.java b/karate-core2/src/main/java/com/intuit/karate/match/MatchValue.java
@@ -24,6 +24,7 @@
 package com.intuit.karate.match;
 
 import com.intuit.karate.XmlUtils;
+import com.intuit.karate.data.Json;
 import com.intuit.karate.data.JsonUtils;
 import java.util.List;
 import java.util.Map;
@@ -126,6 +127,14 @@ public MatchResult is(MatchType mt, Object o) {
         return mo.pass ? MatchResult.PASS : MatchResult.fail(mo.getFailureReasons());
     }
 
+    public MatchResult isEqualTo(Object o) {
+        return is(MatchType.EQUALS, o);
+    }
+
+    public MatchResult isEqualToJson(String s) {
+        return is(MatchType.EQUALS, new Json(s).asMapOrList());
+    }
+
     public String getAsXmlString() {
         if (type == Type.MAP) {
             Node node = XmlUtils.fromMap(getValue());

diff --git a/karate-core2/src/main/java/com/intuit/karate/runtime/Variable.java b/karate-core2/src/main/java/com/intuit/karate/runtime/Variable.java
@@ -27,6 +27,7 @@
 import com.intuit.karate.XmlUtils;
 import com.intuit.karate.graal.JsValue;
 import com.intuit.karate.core.Feature;
+import com.intuit.karate.data.Json;
 import com.intuit.karate.data.JsonUtils;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -183,6 +184,8 @@ public Object getValueForJsonConversion() {
                 return JsonUtils.fromJsonString(json);
             case XML:
                 return XmlUtils.toObject(getValue());
+            case OTHER: // pojo
+                return new Json(value).asMapOrList();
             default:
                 throw new RuntimeException("cannot convert to json: " + this);
         }

diff --git a/karate-core2/src/test/java/com/intuit/karate/data/JsonUtilsTest.java b/karate-core2/src/test/java/com/intuit/karate/data/JsonUtilsTest.java
@@ -1,5 +1,8 @@
 package com.intuit.karate.data;
 
+import com.intuit.karate.match.Match;
+import com.intuit.karate.runtime.SimplePojo;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import org.slf4j.Logger;
@@ -28,5 +31,14 @@ void testDetect() {
         assertFalse(JsonUtils.isJson(null));
         assertFalse(JsonUtils.isJson(""));
     }
+
+    @Test
+    void testBeanConversion() {
+        SimplePojo pojo = new SimplePojo();
+        String s = JsonUtils.toJson(pojo);
+        assertEquals("{\"bar\":0,\"foo\":null}", s);
+        Map<String, Object> map = new Json(pojo).asMap();
+        assertTrue(Match.that(map).isEqualToJson("{ foo: null, bar: 0 }").pass);
+    }
 
 }