Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E53EE200B36 for ; Wed, 22 Jun 2016 02:26:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E3CAF160A69; Wed, 22 Jun 2016 00:26:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 67AD1160A60 for ; Wed, 22 Jun 2016 02:26:13 +0200 (CEST) Received: (qmail 65159 invoked by uid 500); 22 Jun 2016 00:26:01 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 62547 invoked by uid 99); 22 Jun 2016 00:25:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2016 00:25:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C18DBE78B2; Wed, 22 Jun 2016 00:25:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: subru@apache.org To: common-commits@hadoop.apache.org Date: Wed, 22 Jun 2016 00:26:40 -0000 Message-Id: In-Reply-To: <85a9aecfdfad441186f9f7f2137dd235@git.apache.org> References: <85a9aecfdfad441186f9f7f2137dd235@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/51] [abbrv] hadoop git commit: HADOOP-9613. [JDK8] Update jersey version to latest 1.x release. archived-at: Wed, 22 Jun 2016 00:26:16 -0000 http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java index 71b0275..3428323 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -67,6 +68,7 @@ import org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager; import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; @@ -75,15 +77,14 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import com.google.inject.Guice; -import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -132,6 +133,8 @@ public class TestAHSWebServices extends JerseyTestBase { historyClientService.start(); ahsWebservice = new AHSWebServices(historyClientService, conf); fs = FileSystem.get(conf); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass @@ -148,8 +151,7 @@ public class TestAHSWebServices extends JerseyTestBase { return Arrays.asList(new Object[][] { { 0 }, { 1 } }); } - private Injector injector = Guice.createInjector(new ServletModule() { - + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -159,7 +161,14 @@ public class TestAHSWebServices extends JerseyTestBase { serve("/*").with(GuiceContainer.class); filter("/*").through(TestSimpleAuthFilter.class); } - }); + } + + @Before + public void setUp() throws Exception { + super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); + } @Singleton public static class TestSimpleAuthFilter extends AuthenticationFilter { @@ -174,14 +183,6 @@ public class TestAHSWebServices extends JerseyTestBase { } } - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - private int round; public TestAHSWebServices(int round) { @@ -203,8 +204,8 @@ public class TestAHSWebServices extends JerseyTestBase { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -221,11 +222,11 @@ public class TestAHSWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -245,12 +246,11 @@ public class TestAHSWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -265,7 +265,7 @@ public class TestAHSWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -282,7 +282,7 @@ public class TestAHSWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -300,8 +300,8 @@ public class TestAHSWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -388,8 +388,7 @@ public class TestAHSWebServices extends JerseyTestBase { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -415,8 +414,7 @@ public class TestAHSWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -445,8 +443,7 @@ public class TestAHSWebServices extends JerseyTestBase { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -474,8 +471,7 @@ public class TestAHSWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java index 74466a8..6fd39dc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.timeline.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; @@ -61,14 +62,14 @@ import org.apache.hadoop.yarn.server.timeline.security.TimelineAuthenticationFil import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -81,10 +82,9 @@ public class TestTimelineWebServices extends JerseyTestBase { private static TimelineStore store; private static TimelineACLsManager timelineACLsManager; private static AdminACLsManager adminACLsManager; - private long beforeTime; - - private Injector injector = Guice.createInjector(new ServletModule() { + private static long beforeTime; + private static class WebServletModule extends ServletModule { @SuppressWarnings("unchecked") @Override protected void configureServlets() { @@ -129,7 +129,7 @@ public class TestTimelineWebServices extends JerseyTestBase { when(filterConfig.getInitParameterNames()).thenReturn(names); when(filterConfig.getInitParameter( DelegationTokenAuthenticationHandler.TOKEN_KIND)).thenReturn( - TimelineDelegationTokenIdentifier.KIND_NAME.toString()); + TimelineDelegationTokenIdentifier.KIND_NAME.toString()); try { taFilter.init(filterConfig); } catch (ServletException e) { @@ -146,18 +146,21 @@ public class TestTimelineWebServices extends JerseyTestBase { } filter("/*").through(taFilter); } + } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); + } - @Override - protected Injector getInjector() { - return injector; - } + @Before + public void setUp() throws Exception { + super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } - private TimelineStore mockTimelineStore() + private static TimelineStore mockTimelineStore() throws Exception { beforeTime = System.currentTimeMillis() - 1; TestMemoryTimelineStore store = @@ -477,8 +480,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .type(MediaType.APPLICATION_JSON) .post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); response = r.path("ws").path("v1").path("timeline") .queryParam("user.name", "tester") @@ -519,8 +521,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .queryParam("user.name", "tester").accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON).post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.BAD_REQUEST, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); } @Test @@ -703,8 +704,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.NOT_FOUND, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -869,8 +869,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); Assert.assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - Assert.assertEquals(ClientResponse.Status.NOT_FOUND, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -938,8 +937,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); response = r.path("ws").path("v1") .path("timeline").path("domain") @@ -947,8 +945,8 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); - + assertResponseStatusCode(Status.OK, response.getStatusInfo()); + // Verify the domain exists response = r.path("ws").path("v1").path("timeline") .path("domain").path("test_domain_id") @@ -969,7 +967,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); // Verify the domain is updated response = r.path("ws").path("v1").path("timeline") @@ -997,7 +995,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); // Update the domain by another user response = r.path("ws").path("v1") @@ -1006,7 +1004,7 @@ public class TestTimelineWebServices extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.FORBIDDEN.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index a4305da..75619f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -30,6 +31,7 @@ import javax.ws.rs.core.MediaType; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; @@ -69,8 +71,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -95,7 +95,7 @@ public class TestNMWebServices extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServices.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { @@ -148,14 +148,11 @@ public class TestNMWebServices extends JerseyTestBase { serve("/*").with(GuiceContainer.class); } - }); + }; - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @@ -164,6 +161,8 @@ public class TestNMWebServices extends JerseyTestBase { super.setUp(); testRootDir.mkdirs(); testLogDir.mkdir(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass @@ -190,7 +189,7 @@ public class TestNMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -206,8 +205,8 @@ public class TestNMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -222,7 +221,7 @@ public class TestNMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -418,7 +417,7 @@ public class TestNMWebServices extends JerseyTestBase { response = r.path("ws").path("v1").path("node") .path("containerlogs").path(containerIdStr).path("uhhh") .accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); - Assert.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); responseText = response.getEntity(String.class); assertTrue(responseText.contains("Cannot find this log on the local disk.")); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java index b95b180..1c34b44 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -33,7 +34,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.util.NodeHealthScriptRunner; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -51,6 +51,7 @@ import org.apache.hadoop.yarn.server.nodemanager.webapp.WebServer.NMWebApp; import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -67,8 +68,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -91,8 +90,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServicesApps.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { - + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { conf.set(YarnConfiguration.NM_LOCAL_DIRS, testRootDir.getAbsolutePath()); @@ -148,20 +146,19 @@ public class TestNMWebServicesApps extends JerseyTestBase { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); testRootDir.mkdirs(); testLogDir.mkdir(); } @@ -187,7 +184,8 @@ public class TestNMWebServicesApps extends JerseyTestBase { .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps isn't NULL", JSONObject.NULL, json.get("apps")); + assertEquals("apps isn't empty", + new JSONObject().toString(), json.get("apps").toString()); } private HashMap addAppContainers(Application app) @@ -297,7 +295,8 @@ public class TestNMWebServicesApps extends JerseyTestBase { .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); } @Test @@ -317,7 +316,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -379,7 +378,8 @@ public class TestNMWebServicesApps extends JerseyTestBase { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); } @Test @@ -400,7 +400,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -430,7 +430,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -461,7 +461,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); @@ -556,7 +556,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -593,7 +593,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java index 7ec8f27..bec448d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.apache.hadoop.yarn.util.StringHelper.ujoin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,7 +39,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import com.sun.jersey.api.client.filter.LoggingFilter; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.util.NodeHealthScriptRunner; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; @@ -58,6 +58,7 @@ import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -73,8 +74,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -97,7 +96,7 @@ public class TestNMWebServicesContainers extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServicesContainers.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { resourceView = new ResourceView() { @@ -158,20 +157,19 @@ public class TestNMWebServicesContainers extends JerseyTestBase { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); testRootDir.mkdirs(); testLogDir.mkdir(); } @@ -198,7 +196,8 @@ public class TestNMWebServicesContainers extends JerseyTestBase { .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps isn't NULL", JSONObject.NULL, json.get("containers")); + assertEquals("apps isn't empty", + new JSONObject().toString(), json.get("containers").toString()); } private HashMap addAppContainers(Application app) @@ -337,7 +336,7 @@ public class TestNMWebServicesContainers extends JerseyTestBase { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -371,7 +370,7 @@ public class TestNMWebServicesContainers extends JerseyTestBase { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -405,7 +404,7 @@ public class TestNMWebServicesContainers extends JerseyTestBase { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index 50a4849..082d043 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -41,9 +42,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.io.TwoDArrayWritable; import org.apache.hadoop.service.Service.STATE; -import org.apache.hadoop.test.GenericTestUtils.SleepAnswer; import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse; @@ -68,6 +67,7 @@ import org.apache.hadoop.yarn.util.AdHocLogDumper; import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.webapp.ForbiddenException; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -81,8 +81,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -95,7 +93,7 @@ public class TestRMWebServices extends JerseyTestBase { private static MockRM rm; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -108,20 +106,19 @@ public class TestRMWebServices extends JerseyTestBase { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServices() { @@ -162,7 +159,7 @@ public class TestRMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -178,7 +175,7 @@ public class TestRMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -194,8 +191,8 @@ public class TestRMWebServices extends JerseyTestBase { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 9ba5233..4f99c5c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -46,6 +47,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptS import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -59,8 +61,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -76,7 +76,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { private static final int CONTAINER_MB = 1024; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -91,20 +91,19 @@ public class TestRMWebServicesApps extends JerseyTestBase { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesApps() { @@ -350,7 +349,8 @@ public class TestRMWebServicesApps extends JerseyTestBase { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -369,7 +369,8 @@ public class TestRMWebServicesApps extends JerseyTestBase { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -388,7 +389,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -425,7 +426,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -484,7 +485,8 @@ public class TestRMWebServicesApps extends JerseyTestBase { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not null", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -503,7 +505,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -660,7 +662,8 @@ public class TestRMWebServicesApps extends JerseyTestBase { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -1070,7 +1073,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { .path("appstatistics") .queryParam("applicationTypes", "MAPREDUCE,OTHER") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1117,7 +1120,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { response = r.path("ws").path("v1").path("cluster") .path("appstatistics").queryParam("states", "wrong_state") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1185,7 +1188,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1223,7 +1226,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); @@ -1515,7 +1518,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1554,7 +1557,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1592,7 +1595,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 682ed75..53ef031 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -87,6 +88,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInf import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -107,7 +109,6 @@ import org.xml.sax.SAXException; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -126,7 +127,6 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { private static final int CONTAINER_MB = 1024; - private static Injector injector; private String webserviceUserName = "testuser"; private boolean setAuthFilter = false; @@ -136,14 +136,6 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { private static final String FS_ALLOC_FILE = new File(TEST_DIR, "test-fs-queues.xml").getAbsolutePath(); - public static class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - /* * Helper class to allow testing of RM web services which require * authorization Add this class as a filter in the Guice injector for the @@ -298,19 +290,19 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { case 0: default: // No Auth Capacity Scheduler - injector = getNoAuthInjectorCap(); + GuiceServletConfig.setInjector(getNoAuthInjectorCap()); break; case 1: // Simple Auth Capacity Scheduler - injector = getSimpleAuthInjectorCap(); + GuiceServletConfig.setInjector(getSimpleAuthInjectorCap()); break; case 2: // No Auth Fair Scheduler - injector = getNoAuthInjectorFair(); + GuiceServletConfig.setInjector(getNoAuthInjectorFair()); break; case 3: // Simple Auth Fair Scheduler - injector = getSimpleAuthInjectorFair(); + GuiceServletConfig.setInjector(getSimpleAuthInjectorFair()); break; } } @@ -349,7 +341,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { this .constructWebResource("apps", app.getApplicationId().toString(), "state").accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.ACCEPTED); } else if (mediaType.equals(MediaType.APPLICATION_XML)) { @@ -388,10 +380,11 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.ACCEPTED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.ACCEPTED, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.FINAL_SAVING, RMAppState.KILLED, RMAppState.KILLING, RMAppState.ACCEPTED); @@ -408,7 +401,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { tmp = tmp.queryParam("user.name", webserviceUserName); } response = tmp.get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTrue(locationHeaderValue.endsWith("/ws/v1/cluster/apps/" + app.getApplicationId().toString() + "/state")); @@ -419,9 +412,13 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .constructWebResource("apps", app.getApplicationId().toString(), "state").accept(mediaType) .entity(entity, contentType).put(ClientResponse.class); - assertTrue((response.getClientResponseStatus() == Status.ACCEPTED) - || (response.getClientResponseStatus() == Status.OK)); - if (response.getClientResponseStatus() == Status.OK) { + assertTrue( + (response.getStatusInfo().getStatusCode() + == Status.ACCEPTED.getStatusCode()) + || (response.getStatusInfo().getStatusCode() + == Status.OK.getStatusCode())); + if (response.getStatusInfo().getStatusCode() + == Status.OK.getStatusCode()) { assertEquals(RMAppState.KILLED, app.getState()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.KILLED); @@ -470,11 +467,12 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); } } } @@ -588,13 +586,16 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .accept(MediaType.APPLICATION_XML) .entity(info, MediaType.APPLICATION_XML).put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } if (i == 0) { - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertResponseStatusCode(Status.NOT_FOUND, + response.getStatusInfo()); } else { - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); } } rm.stop(); @@ -641,9 +642,11 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { public void validateResponseStatus(ClientResponse response, Status expectedUnauthorizedMode, Status expectedAuthorizedMode) { if (!isAuthenticationEnabled()) { - assertEquals(expectedUnauthorizedMode, response.getClientResponseStatus()); + assertResponseStatusCode(expectedUnauthorizedMode, + response.getStatusInfo()); } else { - assertEquals(expectedAuthorizedMode, response.getClientResponseStatus()); + assertResponseStatusCode(expectedAuthorizedMode, + response.getStatusInfo()); } } @@ -845,10 +848,10 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .entity(appInfo, contentMedia).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return; } - assertEquals(Status.ACCEPTED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.ACCEPTED, response.getStatusInfo()); assertTrue(!response.getHeaders().getFirst(HttpHeaders.LOCATION).isEmpty()); String locURL = response.getHeaders().getFirst(HttpHeaders.LOCATION); assertTrue(locURL.contains("/apps/application")); @@ -857,7 +860,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { WebResource res = resource().uri(new URI(locURL)); res = res.queryParam("user.name", webserviceUserName); response = res.get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); RMApp app = rm.getRMContext().getRMApps() @@ -916,7 +919,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { response = this.constructWebResource("apps", appId).accept(acceptMedia) .get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); } public void testAppSubmitErrors(String acceptMedia, String contentMedia) @@ -1004,7 +1007,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { ClientResponse response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) .entity(body, MediaType.APPLICATION_XML).post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); body = "{\"a\" : \"b\"}"; response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) @@ -1029,7 +1032,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { this .constructWebResource("apps", app.getApplicationId().toString(), "queue").accept(contentType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); String expectedQueue = "default"; if(!isCapacityScheduler) { expectedQueue = "root." + webserviceUserName; @@ -1094,10 +1097,11 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1108,7 +1112,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .constructWebResource("apps", app.getApplicationId().toString(), "priority") .accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1123,7 +1127,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { "priority") .entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } } rm.stop(); @@ -1173,10 +1177,11 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); String expectedQueue = "test"; if(!isCapacityScheduler) { expectedQueue = "root.test"; @@ -1196,7 +1201,7 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { .constructWebResource("apps", app.getApplicationId().toString(), "queue").entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); if(isCapacityScheduler) { Assert.assertEquals("default", app.getQueue()); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 9379367..649d719 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Capacity import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -53,8 +54,6 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -64,8 +63,8 @@ import com.sun.jersey.test.framework.WebAppDescriptor; public class TestRMWebServicesCapacitySched extends JerseyTestBase { private static MockRM rm; - private CapacitySchedulerConfiguration csConf; - private YarnConfiguration conf; + private static CapacitySchedulerConfiguration csConf; + private static YarnConfiguration conf; private class QueueInfo { float capacity; @@ -89,7 +88,7 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase { float userLimitFactor; } - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -104,62 +103,62 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } private static void setupQueueConfiguration( - CapacitySchedulerConfiguration conf) { + CapacitySchedulerConfiguration config) { // Define top-level queues - conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { "a", "b" }); + config.setQueues(CapacitySchedulerConfiguration.ROOT, + new String[] {"a", "b"}); final String A = CapacitySchedulerConfiguration.ROOT + ".a"; - conf.setCapacity(A, 10.5f); - conf.setMaximumCapacity(A, 50); + config.setCapacity(A, 10.5f); + config.setMaximumCapacity(A, 50); final String B = CapacitySchedulerConfiguration.ROOT + ".b"; - conf.setCapacity(B, 89.5f); + config.setCapacity(B, 89.5f); // Define 2nd-level queues final String A1 = A + ".a1"; final String A2 = A + ".a2"; - conf.setQueues(A, new String[] { "a1", "a2" }); - conf.setCapacity(A1, 30); - conf.setMaximumCapacity(A1, 50); + config.setQueues(A, new String[] {"a1", "a2"}); + config.setCapacity(A1, 30); + config.setMaximumCapacity(A1, 50); - conf.setUserLimitFactor(A1, 100.0f); - conf.setCapacity(A2, 70); - conf.setUserLimitFactor(A2, 100.0f); + config.setUserLimitFactor(A1, 100.0f); + config.setCapacity(A2, 70); + config.setUserLimitFactor(A2, 100.0f); final String B1 = B + ".b1"; final String B2 = B + ".b2"; final String B3 = B + ".b3"; - conf.setQueues(B, new String[] { "b1", "b2", "b3" }); - conf.setCapacity(B1, 60); - conf.setUserLimitFactor(B1, 100.0f); - conf.setCapacity(B2, 39.5f); - conf.setUserLimitFactor(B2, 100.0f); - conf.setCapacity(B3, 0.5f); - conf.setUserLimitFactor(B3, 100.0f); + config.setQueues(B, new String[] {"b1", "b2", "b3"}); + config.setCapacity(B1, 60); + config.setUserLimitFactor(B1, 100.0f); + config.setCapacity(B2, 39.5f); + config.setUserLimitFactor(B2, 100.0f); + config.setCapacity(B3, 0.5f); + config.setUserLimitFactor(B3, 100.0f); - conf.setQueues(A1, new String[] {"a1a", "a1b"}); + config.setQueues(A1, new String[] {"a1a", "a1b"}); final String A1A = A1 + ".a1a"; - conf.setCapacity(A1A, 85); + config.setCapacity(A1A, 85); final String A1B = A1 + ".a1b"; - conf.setCapacity(A1B, 15); + config.setCapacity(A1B, 15); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesCapacitySched() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index a6d7744..fe01d28 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -18,6 +18,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; + import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -54,6 +56,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -79,7 +82,6 @@ import static org.junit.Assert.assertFalse; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -97,7 +99,6 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .getServerPrincipal(); private static MiniKdc testMiniKDC; private static MockRM rm; - private Injector injector; private boolean isKerberosAuth = false; // Make sure the test uses the published header string @@ -200,14 +201,6 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { }); } - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - @Parameters public static Collection guiceConfigs() { return Arrays.asList(new Object[][] { { 0 }, { 1 } }); @@ -222,10 +215,10 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { switch (run) { case 0: default: - injector = getKerberosAuthInjector(); + GuiceServletConfig.setInjector(getKerberosAuthInjector()); break; case 1: - injector = getSimpleAuthInjector(); + GuiceServletConfig.setInjector(getSimpleAuthInjector()); break; } } @@ -305,7 +298,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } private void verifyKerberosAuthCreate(String mType, String cType, @@ -321,7 +314,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(body, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); Token token = @@ -334,7 +327,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); token = new Token(); @@ -375,7 +368,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dummyToken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); String body = generateRenewTokenBody(mediaType, tok.getToken()); @@ -385,8 +378,8 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .header(yarnTokenHeader, tok.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, - response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); return tok; } }); @@ -406,7 +399,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); String message = "Expiration time not as expected: old = " + oldExpirationTime @@ -421,7 +414,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); tok = getDelegationTokenFromResponse(response); message = "Expiration time not as expected: old = " + oldExpirationTime @@ -443,7 +436,8 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); return null; } }); @@ -469,7 +463,8 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token").path("expiration") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); return null; } }); @@ -498,7 +493,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } // Test to verify cancel functionality - create a token and then try to cancel @@ -528,14 +523,14 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tok.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTokenCancelled(tok.getToken()); return null; } @@ -550,7 +545,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -564,7 +559,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTokenCancelled(tmpToken.getToken()); return null; } @@ -579,7 +574,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -593,7 +588,8 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token") .header(yarnTokenHeader, tmpToken2.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); assertValidRMToken(tmpToken2.getToken()); return null; } @@ -625,7 +621,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token") .header(yarnTokenHeader, "random-string").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } }); @@ -638,7 +634,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } @@ -653,7 +649,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -667,13 +663,13 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } }); @@ -686,7 +682,7 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .path("delegation-token").queryParam("user.name", "testuser") .header(RMWebServices.DELEGATION_TOKEN_HEADER, "random") .delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } private DelegationToken --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org