Merge pull request #43 from sbtqa/issue42

Fix array wrong stringify
sbtqa · Jul 14, 2023 · 6100da9 · 6100da9
2 parents b5e6d0c + f30394a
commit 6100da9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/datajack-api/src/main/java/ru/sbtqa/tag/datajack/providers/AbstractDataProvider.java b/datajack-api/src/main/java/ru/sbtqa/tag/datajack/providers/AbstractDataProvider.java
@@ -471,6 +471,9 @@ private DBObject resolveDbObject() throws DataException {
                 if (instance.basicObject.keySet().contains(key) && instance
                         .basicObject.get(key) == null) {
                     resolvedDbObject.put(key, null);
+                }else if(basicObject.get(key) instanceof BasicDBList){
+                    BasicDBList array = (BasicDBList) basicObject.get(key);
+                    resolvedDbObject.put(key, array);
                 } else {
                     resolvedDbObject.put(key, instance.getValue());
                 }

diff --git a/providers/json-provider/src/test/java/ru/sbtqa/tag/datajack/providers/json/JsonDataTest.java b/providers/json-provider/src/test/java/ru/sbtqa/tag/datajack/providers/json/JsonDataTest.java
@@ -40,6 +40,14 @@ public void differentExtensionTest() throws DataException {
                 testDataProvider.get("Common.password2").getValue());
     }
 
+    @Test
+    public void issue42() throws DataException {
+        String collectionName = "issue";
+        TestDataProvider testDataProvider = new JsonDataProvider(JSON_DATA_PATH, collectionName, "json");
+        assertEquals("{ \"systemId\" : \"QJ160\" , \"customerIds\" : [ { \"id\" : \"93V\" , \"branch\" : \"Cu19\"}]}",
+                testDataProvider.get("X-User").getValue());
+    }
+
     @Test
     public void simpleArrayTest() throws DataException {
         String collectionName = "Tests";

diff --git a/providers/json-provider/src/test/resources/json/issue.json b/providers/json-provider/src/test/resources/json/issue.json
@@ -0,0 +1,11 @@
+{
+  "X-User": {
+    "systemId": "QJ160",
+    "customerIds": [
+      {
+        "id": "93V",
+        "branch": "Cu19"
+      }
+    ]
+  }
+}