Add typed access test for ElementAdapter.

gk-brown · gk-brown · commit fc0683ac587d · 2020-11-08T09:40:21.000-05:00
diff --git a/httprpc-client/src/test/java/org/httprpc/xml/ElementAdapterTest.java b/httprpc-client/src/test/java/org/httprpc/xml/ElementAdapterTest.java
@@ -14,6 +14,7 @@
 
 package org.httprpc.xml;
 
+import org.httprpc.beans.BeanAdapter;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -30,7 +31,6 @@
 
 public class ElementAdapterTest {
     @Test
-    @SuppressWarnings("unchecked")
     public void testElementAdapter() throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 
@@ -46,6 +46,12 @@ public void testElementAdapter() throws ParserConfigurationException, SAXExcepti
 
         ElementAdapter elementAdapter = new ElementAdapter(document.getDocumentElement());
 
+        testUntypedAccess(elementAdapter);
+        testTypedAccess(elementAdapter);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void testUntypedAccess(ElementAdapter elementAdapter) {
         assertEquals("A", elementAdapter.get("@a"));
 
         Map<String, ?> map = (Map<String, ?>)elementAdapter.get("map");
@@ -75,7 +81,36 @@ public void testElementAdapter() throws ParserConfigurationException, SAXExcepti
 
         assertEquals("3", item3.get("@d"));
         assertEquals("ghi", item3.toString());
+    }
+
+    private void testTypedAccess(ElementAdapter elementAdapter) {
+        TestInterface testInterface = BeanAdapter.adapt(elementAdapter, TestInterface.class);
+
+        assertEquals("A", testInterface.getA());
+
+        TestInterface.MapInterface map = testInterface.getMap();
+
+        assertEquals("B", map.getB1());
+        assertEquals("two", map.getB2());
+
+        TestInterface.MapInterface.ListInterface list = map.getList();
+
+        assertEquals("C", list.getC());
+
+        List<String> stringItems = list.getStringItems();
+
+        assertEquals(3, stringItems.size());
+
+        assertEquals("abc", stringItems.get(0));
+        assertEquals("déf", stringItems.get(1));
+        assertEquals("ghi", stringItems.get(2));
+
+        List<Map<String, ?>> mapItems = list.getMapItems();
+
+        assertEquals(3, mapItems.size());
 
-        // TODO Test interface binding
+        assertEquals("1", mapItems.get(0).get("@d"));
+        assertEquals("2", mapItems.get(1).get("@d"));
+        assertEquals("3", mapItems.get(2).get("@d"));
     }
 }
diff --git a/httprpc-client/src/test/java/org/httprpc/xml/TestInterface.java b/httprpc-client/src/test/java/org/httprpc/xml/TestInterface.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.httprpc.xml;
+
+import org.httprpc.beans.Key;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TestInterface {
+    interface MapInterface {
+        interface ListInterface {
+            @Key("@c")
+            String getC();
+
+            @Key("item*")
+            List<String> getStringItems();
+
+            @Key("item*")
+            List<Map<String, ?>> getMapItems();
+        }
+
+        @Key("@b")
+        String getB1();
+
+        @Key("b")
+        String getB2();
+
+        ListInterface getList();
+    }
+
+    @Key("@a")
+    String getA();
+
+    MapInterface getMap();
+}
