Merge pull request #38 from Sergo101010100/fix_311

fix issue 311

Author: clicman

datajack-api/src/main/java/ru/sbtqa/tag/datajack/providers/AbstractDataProvider.java

@@ -256,14 +256,17 @@ private BasicDBObject parseComplexDBObject(String key) throws DataException {
             partialBuiltPath.append(partialKey);
 
             if (isArray(partialKey)) {
-                currentBasicObject = (BasicDBObject) parseArray(currentBasicObject, partialKey);
+                Object basicObject = parseArray(currentBasicObject, partialKey);
+                currentBasicObject = !(basicObject instanceof BasicDBObject)
+                        ? new BasicDBObject(partialKey, basicObject)
+                        : (BasicDBObject) basicObject;
                 partialBuiltPath.append(".");
                 continue;
             }
 
             if (isReference(currentBasicObject)) {
                 AbstractDataProvider dataProvider = (AbstractDataProvider) createInstance(currentBasicObject, collectionName);
-                currentBasicObject = ((AbstractDataProvider)dataProvider.getReference()).basicObject;
+                currentBasicObject = ((AbstractDataProvider) dataProvider.getReference()).basicObject;
             }
 
             Object currentValue = currentBasicObject.get(partialKey);

providers/excel-provider/src/test/resources/excell/TestData.xlsx

@@ -425,4 +425,15 @@ public void relativeParentTest() throws DataException {
         String expected = "20.91";
         Assert.assertEquals(expected, relativeValue);
     }
+
+    @Test
+    public void containsArrayTest() throws DataException {
+        String collectionName = "Tests";
+        TestDataProvider tdo = new JsonDataProvider(JSON_DATA_PATH, collectionName);
+
+        assertEquals("a",
+                tdo.get("containsArray.array[0]").getValue());
+        assertEquals("1",
+                tdo.get("containsArray.array[1]").getValue());
+    }
 }

providers/json-provider/src/test/java/ru/sbtqa/tag/datajack/providers/json/JsonDataTest.java

@@ -47,5 +47,11 @@
         "$ref": "DataBlocks:Common.gen gen.gendata"
       }
     }
-  ]
+  ],
+  "containsArray": {
+    "array": [
+      "a",
+      1
+    ]
+  }
 }

providers/json-provider/src/test/resources/json/Tests.json

@@ -325,4 +325,15 @@ public void getJsonTest() throws DataException {
         String expectedJson = "{ \"login\" : 123 , \"password\" : 123}";
         assertEquals(expectedJson, stringJson);
     }
+
+    @Test
+    public void containsArrayTest() throws DataException {
+        String collectionName = "Tests";
+        TestDataProvider tdo = new MongoDataProvider(mongoDb, collectionName);
+
+        assertEquals("a",
+                tdo.get("containsArray.array[0]").getValue());
+        assertEquals("1",
+                tdo.get("containsArray.array[1]").getValue());
+    }
 }

providers/mongo-provider/src/test/java/ru/sbtqa/tag/datajack/providers/mongo/MongoDataTest.java

@@ -1 +1 @@
-{"_id": "5785f724ecbafd5014e6dfd8" , "Common": { "ref object data":{ "value": { "collection": "DataBlocks", "path": "Common" } }, "ref data": { "value": { "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" , "path": "testId" } }, "ref data gen": { "value": { "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" , "path": "Common.gen gen.gendata" } }, "ref cyclic refid": { "value": { "path": "Common.failCyclicReferenceDifferentCollectionWithRefId", "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" } }, "gendata": "generate:Numeric:16", "gen gen": { "gendata": { "value": { "collection": "DataBlocks", "path": "Common.gen gen.gendata" } } } }, "id": 123123, "client": 123123123, "dataBlocks": { "Common": { "login": { "value": "2login", "comment": "Ну еще один паоль" }, "password": 123 } }, "comment": "Some comment" }
+{"_id": "5785f724ecbafd5014e6dfd8" , "Common": { "ref object data":{ "value": { "collection": "DataBlocks", "path": "Common" } }, "ref data": { "value": { "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" , "path": "testId" } }, "ref data gen": { "value": { "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" , "path": "Common.gen gen.gendata" } }, "ref cyclic refid": { "value": { "path": "Common.failCyclicReferenceDifferentCollectionWithRefId", "collection": "DataBlocks", "refId": "57a94a160a279ec293f61665" } }, "gendata": "generate:Numeric:16", "gen gen": { "gendata": { "value": { "collection": "DataBlocks", "path": "Common.gen gen.gendata" } } } }, "id": 123123, "client": 123123123, "dataBlocks": { "Common": { "login": { "value": "2login", "comment": "Ну еще один паоль" }, "password": 123 } }, "comment": "Some comment","containsArray": {  "array": [    "a",    1  ]} }

providers/mongo-provider/src/test/resources/mongo/Tests.json

@@ -442,4 +442,15 @@ public void issue290Test() throws Exception {
         Assert.assertArrayEquals(expectedValues, stringValues.toArray(new String[0]));
 
     }
+
+    @Test
+    public void containsArrayTest() throws DataException {
+        String collectionName = "Tests";
+        TestDataProvider dataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
+
+        assertEquals("a",
+                dataProvider.get("containsArray.array[0]").getValue());
+        assertEquals("1",
+                dataProvider.get("containsArray.array[1]").getValue());
+    }
 }

providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java

@@ -13,4 +13,5 @@ array[2].b[0].b.c=1
 array[2].b[0].b.d.$ref=DataBlocks:Params Group 1.password
 array[3].ref.$ref=DataBlocks:Params Group 1.password
 array[3].genRef.$ref=DataBlocks:Common.gen gen.gendata
-array[4].refObj.$ref=DataBlocks:Common
+array[4].refObj.$ref=DataBlocks:Common
+containsArray.array=a,1