HADOOP-19405. Fix Junit Tests.

Author: slfan1989

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

@@ -28,13 +28,13 @@
 import java.util.Set;
 
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.NotAcceptableException;
 import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ServiceUnavailableException;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Response;
+import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
 import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -231,15 +231,15 @@ public void testInvalidUri2() throws JSONException, Exception {
 
   @Test
   public void testInvalidAccept() throws JSONException, Exception {
-    WebTarget r = target();
+    WebTarget r = targetWithJsonObject();
     String responseStr = "";
     try {
       responseStr = r.path("ws").path("v1").path("mapreduce")
           .request(MediaType.TEXT_PLAIN).get(String.class);
       fail("should have thrown exception on invalid uri");
-    } catch (ServiceUnavailableException sue) {
+    } catch (NotAcceptableException sue) {
       Response response = sue.getResponse();
-      assertResponseStatusCode(SERVICE_UNAVAILABLE, response.getStatusInfo());
+      assertResponseStatusCode(NOT_ACCEPTABLE, response.getStatusInfo());
       WebServicesTestUtils.checkStringMatch(
           "error string exists and shouldn't", "", responseStr);
     }

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

@@ -20,13 +20,14 @@
 
 import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import java.io.StringReader;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.NotAcceptableException;
 import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ServiceUnavailableException;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.MediaType;
@@ -232,12 +233,12 @@ public void testInvalidAccept() throws JSONException, Exception {
     WebTarget r = target();
     String responseStr = "";
     try {
-      Response response =
-          r.path("ws").path("v1").path("history").request(MediaType.TEXT_PLAIN).get();
-      throw new ServiceUnavailableException(response);
-    } catch (ServiceUnavailableException ue) {
+      responseStr = r.path("ws").path("v1").path("history").
+          request(MediaType.TEXT_PLAIN).get(String.class);
+      fail("should have thrown exception on invalid uri");
+    } catch (NotAcceptableException ue) {
       Response response = ue.getResponse();
-      assertResponseStatusCode(Response.Status.SERVICE_UNAVAILABLE,
+      assertResponseStatusCode(Response.Status.NOT_ACCEPTABLE,
           response.getStatusInfo());
       WebServicesTestUtils.checkStringMatch(
           "error string exists and shouldn't", "", responseStr);

hadoop-project/pom.xml

@@ -185,7 +185,7 @@
       --add-opens=java.base/sun.security.x509=ALL-UNNAMED
     </extraJavaTestArgs>
     <!-- Plugin versions and config -->
-    <maven-surefire-plugin.argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError ${extraJavaTestArgs}</maven-surefire-plugin.argLine>
+    <maven-surefire-plugin.argLine>-Xmx2048m -Xss2m -XX:+HeapDumpOnOutOfMemoryError ${extraJavaTestArgs}</maven-surefire-plugin.argLine>
     <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
     <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/ApplicationEntity.java

@@ -43,7 +43,12 @@ public ApplicationEntity(TimelineEntity entity) {
   }
 
   public String getQueue() {
-    return getInfo().get(QUEUE_INFO_KEY).toString();
+    if (getInfo() != null) {
+      if (getInfo().containsKey(QUEUE_INFO_KEY)) {
+        return getInfo().get(QUEUE_INFO_KEY).toString();
+      }
+    }
+    return "";
   }
 
   public void setQueue(String queue) {