Fixed assertionComparision failure by resolving xml path for 'name'

Author: kavvya-ramarathnam

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java

@@ -32,6 +32,9 @@
 import javax.ws.rs.core.MediaType;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.http.JettyUtils;
@@ -483,10 +486,12 @@ public void verifyAMJob(JSONObject info, Job job) throws JSONException {
 
   }
 
-  public void verifyAMJobXML(NodeList nodes, AppContext appContext) {
-
+  public void verifyAMJobXML(NodeList nodes, AppContext appContext) throws XPathExpressionException {
     assertEquals("incorrect number of elements", 1, nodes.getLength());
 
+    XPathFactory xPathfactory = XPathFactory.newInstance();
+    XPath xpath = xPathfactory.newXPath();
+
     for (int i = 0; i < nodes.getLength(); i++) {
       Element element = (Element) nodes.item(i);
 
@@ -496,7 +501,7 @@ public void verifyAMJobXML(NodeList nodes, AppContext appContext) {
 
       verifyAMJobGeneric(job, WebServicesTestUtils.getXmlString(element, "id"),
           WebServicesTestUtils.getXmlString(element, "user"),
-          WebServicesTestUtils.getXmlString(element, "name"),
+          xpath.evaluate("name", element),
           WebServicesTestUtils.getXmlString(element, "state"),
           WebServicesTestUtils.getXmlLong(element, "startTime"),
           WebServicesTestUtils.getXmlLong(element, "finishTime"),

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java

@@ -34,6 +34,9 @@
 import javax.ws.rs.core.MediaType;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
 
 import com.google.inject.util.Providers;
 import org.apache.hadoop.conf.Configuration;
@@ -229,9 +232,11 @@ public void verifyHsJobPartialXML(NodeList nodes, MockHistoryContext appContext)
     }
   }
 
-  public void verifyHsJobXML(NodeList nodes, AppContext appContext) {
+  public void verifyHsJobXML(NodeList nodes, AppContext appContext) throws XPathExpressionException {
 
     assertEquals("incorrect number of elements", 1, nodes.getLength());
+    XPathFactory xPathfactory = XPathFactory.newInstance();
+    XPath xpath = xPathfactory.newXPath();
 
     for (int i = 0; i < nodes.getLength(); i++) {
       Element element = (Element) nodes.item(i);
@@ -243,7 +248,7 @@ public void verifyHsJobXML(NodeList nodes, AppContext appContext) {
       VerifyJobsUtils.verifyHsJobGeneric(job,
           WebServicesTestUtils.getXmlString(element, "id"),
           WebServicesTestUtils.getXmlString(element, "user"),
-          WebServicesTestUtils.getXmlString(element, "name"),
+          xpath.evaluate("name", element),
           WebServicesTestUtils.getXmlString(element, "state"),
           WebServicesTestUtils.getXmlString(element, "queue"),
           WebServicesTestUtils.getXmlLong(element, "startTime"),