fix ut and code style

Author: zhengchenyu

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java

@@ -50,6 +50,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.hadoop.classification.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.http.HttpServer2;
@@ -63,6 +64,7 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
 import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.util.StringHelper;
 import org.apache.hadoop.yarn.webapp.MimeType;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 import org.eclipse.jetty.server.ServerConnector;
@@ -363,6 +365,7 @@ public void testAppReportForEmptyTrackingUrl() throws Exception {
     //set AHS_ENBALED = true to simulate getting the app report from AHS
     configuration.setBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED,
         true);
+    proxy.proxy.appReportFetcher.setAhsAppPageUrlBase(configuration);
     proxyConn = (HttpURLConnection) url.openConnection();
     proxyConn.connect();
     try {
@@ -375,8 +378,8 @@ public void testAppReportForEmptyTrackingUrl() throws Exception {
     String appAddressInAhs = WebAppUtils.getHttpSchemePrefix(configuration) +
         WebAppUtils.getAHSWebAppURLWithoutScheme(configuration) +
         "/applicationhistory" + "/app/" + app.toString();
-    assertTrue("Webapp proxy servlet should have redirected to AHS",
-        proxyConn.getURL().toString().equals(appAddressInAhs));
+    assertEquals("Webapp proxy servlet should have redirected to AHS",
+        appAddressInAhs, proxyConn.getURL().toString());
     }
     finally {
       proxy.close();
@@ -602,6 +605,7 @@ protected void serviceStart() throws Exception {
 
   private class AppReportFetcherForTest extends DefaultAppReportFetcher {
     int answer = 0;
+    private String ahsAppPageUrlBase = null;
 
     public AppReportFetcherForTest(Configuration conf) {
       super(conf);
@@ -672,5 +676,19 @@ private FetchedAppReport getDefaultApplicationReport(ApplicationId appId,
     private FetchedAppReport getDefaultApplicationReport(ApplicationId appId) {
       return getDefaultApplicationReport(appId, true);
     }
+
+    @VisibleForTesting
+    public String getAhsAppPageUrlBase() {
+      return ahsAppPageUrlBase != null ? ahsAppPageUrlBase
+          : super.getAhsAppPageUrlBase();
+    }
+
+    @VisibleForTesting
+    public void setAhsAppPageUrlBase(Configuration conf) {
+      this.ahsAppPageUrlBase =
+          StringHelper.pjoin(WebAppUtils.getHttpSchemePrefix(conf)
+                  + WebAppUtils.getAHSWebAppURLWithoutScheme(conf),
+              "applicationhistory", "app");
+    }
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServletFed.java

@@ -118,7 +118,7 @@ public static void tearDown() throws Exception {
   }
 
   @Test
-  public void TestWebServlet() throws IOException {
+  public void testWebServlet() throws IOException {
     HttpURLConnection conn;
     // 1. Mocked AppMaster web Test
     URL url = new URL("http://localhost:" + mockServerPort + "/amweb/apptest");
@@ -148,7 +148,7 @@ public void TestWebServlet() throws IOException {
   }
 
   @Test(timeout=5000)
-  public void TestWebAppProxyServletFed() throws Exception {
+  public void testWebAppProxyServletFed() throws Exception {
 
     Configuration conf = new Configuration();
     conf.set(YarnConfiguration.PROXY_ADDRESS, "localhost:9090");
@@ -163,10 +163,10 @@ public void TestWebAppProxyServletFed() throws Exception {
     SubClusterId subClusterId1 = SubClusterId.newInstance("scid1");
     SubClusterId subClusterId2 = SubClusterId.newInstance("scid2");
     SubClusterInfo subClusterInfo1 = SubClusterInfo.newInstance(subClusterId1,
-        "10.0.0.1:1","10.0.0.1:1","10.0.0.1:1",
+        "10.0.0.1:1", "10.0.0.1:1", "10.0.0.1:1",
         "localhost:" + mockServerPort, SubClusterState.SC_RUNNING, 0, "");
     SubClusterInfo subClusterInfo2 = SubClusterInfo.newInstance(subClusterId2,
-        "10.0.0.2:1","10.0.0.2:1","10.0.0.2:1",
+        "10.0.0.2:1", "10.0.0.2:1", "10.0.0.2:1",
         "10.0.0.2:1", SubClusterState.SC_RUNNING, 0, "");
 
     // App1 and App2 is running applications.
@@ -302,12 +302,12 @@ private class WebAppProxyServerForTest extends CompositeService {
 
     private WebAppProxyForTest proxy = null;
 
-    public WebAppProxyServerForTest() {
+    WebAppProxyServerForTest() {
       super(WebAppProxyServer.class.getName());
     }
 
     @Override
-    public synchronized void serviceInit(Configuration conf) throws Exception {
+    protected synchronized void serviceInit(Configuration conf) throws Exception {
       proxy = new WebAppProxyForTest();
       addService(proxy);
       super.serviceInit(conf);
@@ -353,8 +353,8 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 
   private class WebAppProxyForTest extends WebAppProxy {
 
-    HttpServer2 proxyServer;
-    FedAppReportFetcher appReportFetcher;
+    private HttpServer2 proxyServer;
+    private FedAppReportFetcher appReportFetcher;
 
     @Override
     protected void serviceStart() throws Exception {