Merge pull request #28 from sbtqa/arraysFix

clicman · web-flow · commit 41ebab7dc270 · 2018-10-05T12:40:11.000+07:00
Array deep reference fix
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
@@ -207,8 +207,19 @@ private Object parseArray(BasicDBObject basicO, String key) throws DataException
         if (!isArray(key)) {
             throw new DataException(String.format("%s.%s is not an array!", this.collectionName, key));
         }
+
         String arrayKey = key.split("\\[")[0];
         String arrayIndex = key.split("\\[")[1].split("\\]")[0];
+
+        // If object passed by key is a reference to array, extract reference and replace current context by it
+        if (basicO.get(arrayKey) instanceof BasicDBObject && isReference((BasicDBObject) basicO.get(arrayKey))) {
+            basicO = ((AbstractDataProvider) get(arrayKey)).basicObject;
+            arrayKey = basicO.keySet().iterator().next();
+            way = key;
+        } else {
+            way += "." + key;
+        }
+
         Object listCandidate = basicO.get(arrayKey);
 
         if (!(listCandidate instanceof BasicDBList)) {
@@ -230,6 +241,7 @@ private BasicDBObject parseComplexDBObject(String key) throws DataException {
 
             if (isArray(partialKey)) {
                 currentBasicObject = (BasicDBObject) parseArray(currentBasicObject, partialKey);
+                partialBuiltPath.append(".");
                 continue;
             }
 
@@ -241,6 +253,7 @@ private BasicDBObject parseComplexDBObject(String key) throws DataException {
             }
 
             Object currentValue = currentBasicObject.get(partialKey);
+            this.way += "." + partialKey;
             if (!(currentValue instanceof BasicDBObject)) {
                 if (null == currentValue || i < keys.length - 1) {
                     String lastKey = keys[keys.length - 1];
@@ -352,11 +365,7 @@ public void applyGenerator(Class<? extends GeneratorCallback> callback) {
      */
     @Override
     public boolean isReference() {
-        Object value = this.basicObject.get(VALUE_TPL);
-        if (!(value instanceof BasicDBObject)) {
-            return false;
-        }
-        return ((BasicDBObject) value).containsField(COLLECTION_TPL) && ((BasicDBObject) value).containsField("path");
+        return isReference(this.basicObject);
     }
 
     private boolean isReference(BasicDBObject basicDBObject) {
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
@@ -75,6 +75,34 @@ public void arrayReferenceTest() throws DataException {
                 testDataProvider.get("array[3].ref").getValue());
     }
 
+    @Test
+    public void arrayReferencedTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new JsonDataProvider(JSON_DATA_PATH, collectionName);
+
+        assertEquals("a",
+                testDataProvider.get("ref array[0]").getValue());
+    }
+
+    @Test
+    public void arrayDeepReferencedTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new JsonDataProvider(JSON_DATA_PATH, collectionName);
+
+        assertEquals("1",
+                testDataProvider.get("ref array[2].b[0].b.c").getValue());
+    }
+
+    @Test
+    public void arrayDeepReferencedToReferenceTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new JsonDataProvider(JSON_DATA_PATH, collectionName);
+
+        assertEquals("123qwe",
+                testDataProvider.get("ref array[2].b[0].b.d").getValue());
+    }
+
+
     @Test
     public void arrayGeneratorTest() throws DataException {
         String collectionName = "Tests";
diff --git a/providers/json-provider/src/test/resources/json/DataBlocks.json b/providers/json-provider/src/test/resources/json/DataBlocks.json
@@ -63,5 +63,11 @@
     "nestedObjectValue": {
       "innerValue": "This is string from nested object"
     }
+  },
+  "ref array": {
+    "value": {
+      "collection": "Tests",
+      "path": "array"
+    }
   }
 }
diff --git a/providers/json-provider/src/test/resources/json/Tests.json b/providers/json-provider/src/test/resources/json/Tests.json
@@ -37,7 +37,13 @@
       "b": [
         {
           "b": {
-            "c": 1
+            "c": 1,
+            "d": {
+              "value": {
+                "collection": "DataBlocks",
+                "path": "Params Group 1.password"
+              }
+            }
           }
         }
       ]
diff --git a/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java b/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java
@@ -79,6 +79,34 @@ public void arrayReferenceTest() throws DataException {
                 dataProvider.get("array[3].ref").getValue());
     }
 
+
+    @Test
+    public void arrayReferencedTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
+
+        assertEquals("a",
+                testDataProvider.get("ref array[0]").getValue());
+    }
+
+    @Test
+    public void arrayDeepReferencedTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
+
+        assertEquals("1",
+                testDataProvider.get("ref array[2].b[0].b.c").getValue());
+    }
+
+    @Test
+    public void arrayDeepReferencedToReferenceTest() throws DataException {
+        String collectionName = "DataBlocks";
+        TestDataProvider testDataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
+
+        assertEquals("123qwe",
+                testDataProvider.get("ref array[2].b[0].b.d").getValue());
+    }
+
     @Test
     public void arrayGeneratorTest() throws DataException {
         String collectionName = "Tests";
diff --git a/providers/properties-provider/src/test/resources/properties/DataBlocks.properties b/providers/properties-provider/src/test/resources/properties/DataBlocks.properties
@@ -31,4 +31,6 @@ MapTests.doubleValue=42.01
 MapTests.nestedObjectValue.innerValue=This is string from nested object
 MapTests.ref.value.collection=DataBlocks
 MapTests.ref.value.path=MapTests.stringValue
-MapTests.ref.value.comment=Пароль пользователя
+MapTests.ref.value.comment=Пароль пользователя
+ref\ array.value.collection= Tests
+ref\ array.value.path = array
diff --git a/providers/properties-provider/src/test/resources/properties/Tests.properties b/providers/properties-provider/src/test/resources/properties/Tests.properties
@@ -12,9 +12,11 @@ comment=Some comment
 array[0]=a
 array[1].b=1
 array[2].b[0].b.c=1
+array[2].b[0].b.d.value.collection=DataBlocks
+array[2].b[0].b.d.value.path=Params Group 1.password
 array[3].ref.value.collection=DataBlocks
 array[3].ref.value.path=Params Group 1.password
 array[3].genRef.value.collection=DataBlocks
 array[3].genRef.value.path=Common.gen gen.gendata
-array[3].refObj.value.collection=DataBlocks
-array[3].refObj.value.path=Common
+array[4].refObj.value.collection=DataBlocks
+array[4].refObj.value.path=Common

Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,11 @@`
`63`	`63`	`"nestedObjectValue": {`
`64`	`64`	`"innerValue": "This is string from nested object"`
`65`	`65`	`}`
	`66`	`+ },`
	`67`	`+ "ref array": {`
	`68`	`+ "value": {`
	`69`	`+ "collection": "Tests",`
	`70`	`+ "path": "array"`
	`71`	`+ }`
`66`	`72`	`}`
`67`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,13 @@`
`37`	`37`	`"b": [`
`38`	`38`	`{`
`39`	`39`	`"b": {`
`40`		`- "c": 1`
	`40`	`+ "c": 1,`
	`41`	`+ "d": {`
	`42`	`+ "value": {`
	`43`	`+ "collection": "DataBlocks",`
	`44`	`+ "path": "Params Group 1.password"`
	`45`	`+ }`
	`46`	`+ }`
`41`	`47`	`}`
`42`	`48`	`}`
`43`	`49`	`]`