From 774d031e3805fe933074a0e6f8e3bd8d8cf8e865 Mon Sep 17 00:00:00 2001
From: Tatsuya Shimoda <tatsuya.fuga@gmail.com>
Date: Mon, 21 Sep 2020 00:51:14 +0900
Subject: [PATCH 1/2] added tests for parsing package

---
 .../ibatis/parsing/XPathParserTest.java       | 37 ++++++++++++++-----
 src/test/java/resources/nodelet_test.xml      |  4 +-
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java b/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
index c9771b5add9..336a82a4a2f 100644
--- a/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
+++ b/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
@@ -179,14 +179,31 @@ private String getXmlString(String resource) throws IOException {
     }
   }
 
+  enum EnumTest {
+    YES, NO
+  }
+
   private void testEvalMethod(XPathParser parser) {
     assertEquals((Long) 1970L, parser.evalLong("/employee/birth_date/year"));
+    assertEquals((Long) 1970L, parser.evalNode("/employee/birth_date/year").getLongBody());
     assertEquals((short) 6, (short) parser.evalShort("/employee/birth_date/month"));
     assertEquals((Integer) 15, parser.evalInteger("/employee/birth_date/day"));
+    assertEquals((Integer) 15, parser.evalNode("/employee/birth_date/day").getIntBody());
     assertEquals((Float) 5.8f, parser.evalFloat("/employee/height"));
+    assertEquals((Float) 5.8f, parser.evalNode("/employee/height").getFloatBody());
     assertEquals((Double) 5.8d, parser.evalDouble("/employee/height"));
+    assertEquals((Double) 5.8d, parser.evalNode("/employee/height").getDoubleBody());
+    assertEquals((Double) 5.8d, parser.evalNode("/employee").evalDouble("height"));
     assertEquals("${id_var}", parser.evalString("/employee/@id"));
+    assertEquals("${id_var}", parser.evalNode("/employee/@id").getStringBody());
+    assertEquals("${id_var}", parser.evalNode("/employee").evalString("@id"));
     assertEquals(Boolean.TRUE, parser.evalBoolean("/employee/active"));
+    assertEquals(Boolean.TRUE, parser.evalNode("/employee/active").getBooleanBody());
+    assertEquals(Boolean.TRUE, parser.evalNode("/employee").evalBoolean("active"));
+    assertEquals(EnumTest.YES, parser.evalNode("/employee/active").getEnumAttribute(EnumTest.class, "bot"));
+    assertEquals((Float) 3.2f, parser.evalNode("/employee/active").getFloatAttribute("score"));
+    assertEquals((Double) 3.2d, parser.evalNode("/employee/active").getDoubleAttribute("score"));
+
     assertEquals("<id>${id_var}</id>", parser.evalNode("/employee/@id").toString().trim());
     assertEquals(7, parser.evalNodes("/employee/*").size());
     XNode node = parser.evalNode("/employee/height");
@@ -196,7 +213,7 @@ private void testEvalMethod(XPathParser parser) {
 
   @Test
   void formatXNodeToString() {
-    XPathParser parser = new XPathParser("<users><user><id>100</id><name>Tom</name><age>30</age><cars><car>BMW</car><car>Audi</car><car>Benz</car></cars></user></users>");
+    XPathParser parser = new XPathParser("<users><user><id>100</id><name>Tom</name><age>30</age><cars><car index=\"1\">BMW</car><car index=\"2\">Audi</car><car index=\"3\">Benz</car></cars></user></users>");
     String usersNodeToString = parser.evalNode("/users").toString();
     String userNodeToString = parser.evalNode("/users/user").toString();
     String carsNodeToString = parser.evalNode("/users/user/cars").toString();
@@ -208,9 +225,9 @@ void formatXNodeToString() {
       "        <name>Tom</name>\n" +
       "        <age>30</age>\n" +
       "        <cars>\n" +
-      "            <car>BMW</car>\n" +
-      "            <car>Audi</car>\n" +
-      "            <car>Benz</car>\n" +
+      "            <car index=\"1\">BMW</car>\n" +
+      "            <car index=\"2\">Audi</car>\n" +
+      "            <car index=\"3\">Benz</car>\n" +
       "        </cars>\n" +
       "    </user>\n" +
       "</users>\n";
@@ -221,17 +238,17 @@ void formatXNodeToString() {
       "    <name>Tom</name>\n" +
       "    <age>30</age>\n" +
       "    <cars>\n" +
-      "        <car>BMW</car>\n" +
-      "        <car>Audi</car>\n" +
-      "        <car>Benz</car>\n" +
+      "        <car index=\"1\">BMW</car>\n" +
+      "        <car index=\"2\">Audi</car>\n" +
+      "        <car index=\"3\">Benz</car>\n" +
       "    </cars>\n" +
       "</user>\n";
 
   String carsNodeToStringExpect =
       "<cars>\n" +
-      "    <car>BMW</car>\n" +
-      "    <car>Audi</car>\n" +
-      "    <car>Benz</car>\n" +
+      "    <car index=\"1\">BMW</car>\n" +
+      "    <car index=\"2\">Audi</car>\n" +
+      "    <car index=\"3\">Benz</car>\n" +
       "</cars>\n";
 
     assertEquals(usersNodeToStringExpect, usersNodeToString);
diff --git a/src/test/java/resources/nodelet_test.xml b/src/test/java/resources/nodelet_test.xml
index 5a1a7272b66..427ab1bd5d9 100644
--- a/src/test/java/resources/nodelet_test.xml
+++ b/src/test/java/resources/nodelet_test.xml
@@ -26,5 +26,5 @@
   </birth_date>
   <height units="ft">5.8</height>
   <weight units="lbs">200</weight>
-  <active>true</active>
-</employee>
\ No newline at end of file
+  <active bot="YES" score="3.2">true</active>
+</employee>

From 368c785df0cec1943015a947549f8e90f807b62c Mon Sep 17 00:00:00 2001
From: Iwao AVE! <harawata@gmail.com>
Date: Sun, 27 Sep 2020 00:53:25 +0900
Subject: [PATCH 2/2] Updated license year

---
 src/test/java/resources/nodelet_test.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/resources/nodelet_test.xml b/src/test/java/resources/nodelet_test.xml
index 427ab1bd5d9..2c1b444a1df 100644
--- a/src/test/java/resources/nodelet_test.xml
+++ b/src/test/java/resources/nodelet_test.xml
@@ -1,6 +1,6 @@
 <!--
 
-       Copyright 2009-2016 the original author or authors.
+       Copyright 2009-2020 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.