Adds another subquery test scenario.

Author: Eric Meyer

src/test/java/com/t11e/discovery/datatool/SubqueryTest.java

@@ -121,6 +121,14 @@ public void testSubQueryWithMultipleColumn()
       Arrays.asList("1", "2", "3"),
       Arrays.asList("4", "5"),
       false);
+    Assert.assertEquals("red",
+      doc.selectSingleNode(
+      "/changeset/set-item[@id='1']/properties/struct/entry[@name='name']/string/text()")
+      .getText());
+    Assert.assertEquals("10",
+      doc.selectSingleNode(
+      "/changeset/set-item[@id='1']/properties/struct/entry[@name='renamed']/string/text()")
+      .getText());
     Assert.assertEquals("red",
       doc.selectSingleNode(
       "/changeset/set-item[@id='1']/properties/struct/entry[@name='color']/struct/entry[@name='name']/string/text()")
@@ -138,6 +146,29 @@ public void testSubQueryWithMultipleColumn()
         "/changeset/set-item[@id='1']/properties/struct/entry[@name='color_delimited_renamed']/string/text()")
         .getText());
 
+    Assert.assertEquals(2,
+      doc.selectNodes("/changeset/set-item[@id='2']/properties/struct/entry[@name='name']/array/element").size());
+    Assert.assertEquals(2,
+      doc.selectNodes("/changeset/set-item[@id='2']/properties/struct/entry[@name='renamed']/array/element").size());
+
+    Assert.assertEquals("orange",
+      doc.selectSingleNode(
+        "/changeset/set-item[@id='2']/properties/struct/entry[@name='name']/array/element[1]/string/text()")
+        .getText());
+    Assert.assertEquals("yellow",
+      doc.selectSingleNode(
+        "/changeset/set-item[@id='2']/properties/struct/entry[@name='name']/array/element[2]/string/text()")
+        .getText());
+
+    Assert.assertEquals("20",
+      doc.selectSingleNode(
+        "/changeset/set-item[@id='2']/properties/struct/entry[@name='renamed']/array/element[1]/string/text()")
+        .getText());
+    Assert.assertEquals("30",
+      doc.selectSingleNode(
+        "/changeset/set-item[@id='2']/properties/struct/entry[@name='renamed']/array/element[2]/string/text()")
+        .getText());
+
     Assert.assertEquals(2,
       doc.selectNodes("/changeset/set-item[@id='2']/properties/struct/entry[@name='color']/array/element").size());
 

src/test/java/com/t11e/discovery/datatool/SubqueryTest.xml

@@ -72,11 +72,14 @@
           <query><![CDATA[
           select * from SubqueryContent
         ]]></query>
-          <subquery property="color"><![CDATA[
+          <subquery><![CDATA[
           select name, asnumber as renamed from SubqueryColors where parent_id=:id order by name
         ]]></subquery>
           <subquery propertyPrefix="color_delimited_" delimiter="," type="delimited"><![CDATA[
         select name, asnumber as renamed from SubqueryColors where parent_id=:id order by name
+        ]]></subquery>
+          <subquery property="color"><![CDATA[
+          select name, asnumber as renamed from SubqueryColors where parent_id=:id order by name
         ]]></subquery>
         </set-item>
         <remove-item idColumn="id">