From 4cffa7cc50090aedf75f4845db96b39a462b9e9d Mon Sep 17 00:00:00 2001
From: aefimov <unknown>
Date: Sun, 31 May 2015 18:55:35 +0300
Subject: [PATCH] 8081392: getNodeValue should return 'null' value for Element
 nodes Reviewed-by: joehw

---
 test/javax/xml/jaxp/common/8032908/TestFunc.java           | 5 +++--
 test/javax/xml/jaxp/common/8032908/XSLT.java               | 7 ++++---
 test/javax/xml/jaxp/transform/8062518/DocumentExtFunc.java | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/javax/xml/jaxp/common/8032908/TestFunc.java b/test/javax/xml/jaxp/common/8032908/TestFunc.java
index 20eb23fa5..62a18f777 100644
--- a/test/javax/xml/jaxp/common/8032908/TestFunc.java
+++ b/test/javax/xml/jaxp/common/8032908/TestFunc.java
@@ -26,8 +26,9 @@ import org.w3c.dom.Node;
 public class TestFunc {
 
     public static String test(Node node) {
-        String s = node.getTextContent();
-        return s;
+        String textContent = node.getTextContent();
+        String nodeValue   = node.getNodeValue();
+        return textContent + ":" + nodeValue;
     }
 
 }
diff --git a/test/javax/xml/jaxp/common/8032908/XSLT.java b/test/javax/xml/jaxp/common/8032908/XSLT.java
index 77ddcbcfa..22a4346ed 100644
--- a/test/javax/xml/jaxp/common/8032908/XSLT.java
+++ b/test/javax/xml/jaxp/common/8032908/XSLT.java
@@ -23,9 +23,10 @@
 
 /**
  * @test
- * @bug 8032908
+ * @bug 8032908 8081392
  * @summary Test if Node.getTextContent() function correctly returns children
- * content
+ * content and also check that Node.getNodeValue() returns null value for
+ * Element nodes
  * @compile TestFunc.java XSLT.java
  * @run main/othervm XSLT
  */
@@ -40,7 +41,7 @@ public class XSLT {
 
     static final String XMLTOTRANSFORM = "/in.xml";
     static final String XSLTRANSFORMER = "/test.xsl";
-    static final String EXPECTEDRESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>ABCDEFG";
+    static final String EXPECTEDRESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>ABCDEFG:null";
 
     public static void main(String[] args) throws TransformerException {
         ByteArrayOutputStream resStream = new ByteArrayOutputStream();
diff --git a/test/javax/xml/jaxp/transform/8062518/DocumentExtFunc.java b/test/javax/xml/jaxp/transform/8062518/DocumentExtFunc.java
index e811aed4b..677e5dbc7 100644
--- a/test/javax/xml/jaxp/transform/8062518/DocumentExtFunc.java
+++ b/test/javax/xml/jaxp/transform/8062518/DocumentExtFunc.java
@@ -27,6 +27,6 @@ public class DocumentExtFunc {
 
     public static String test(NodeList list) {
         Node node = list.item(0);
-        return "["+node.getNodeName() + ":" + node.getNodeValue()+"]";
+        return "[" + node.getNodeName() + ":" + node.getTextContent() + "]";
     }
 }
-- 
GitLab