Move common methods to TestServerHttpUtils

Change-Id: I6410dd4ec9e7e337dec4458f76e464e6bb2b32f5

Author: kgeisz

hbase-server/src/test/java/org/apache/hadoop/hbase/master/http/TestMasterStatusPage.java

@@ -21,10 +21,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +42,7 @@
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.CommonFSUtils;
+import org.apache.hadoop.hbase.util.TestServerHttpUtils;
 import org.apache.hadoop.hbase.util.VersionInfo;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -108,7 +106,9 @@ public void testMasterStatusPage() throws Exception {
 
     createTestTables(master);
 
-    String page = getMasterStatusPageContent();
+    URL url =
+      new URL(TestServerHttpUtils.getMasterInfoServerHostAndPort(CLUSTER) + "/master-status");
+    String page = TestServerHttpUtils.getPageContent(url, "text/html;charset=utf-8");
 
     String hostname = master.getServerName().getHostname();
     assertTrue(page.contains("<h1>Master <small>" + hostname + "</small></h1>"));
@@ -127,17 +127,6 @@ public void testMasterStatusPage() throws Exception {
     assertTrue(page.contains(VersionInfo.getVersion()));
   }
 
-  private String getMasterStatusPageContent() throws IOException {
-    URL url = new URL(getInfoServerHostAndPort() + "/master-status");
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    conn.connect();
-
-    assertEquals(200, conn.getResponseCode());
-    assertEquals("text/html;charset=utf-8", conn.getContentType());
-
-    return getResponseBody(conn);
-  }
-
   private static void createTestTables(HMaster master) throws IOException {
     ColumnFamilyDescriptor cf = ColumnFamilyDescriptorBuilder.of("CF");
     TableDescriptor tableDescriptor1 = TableDescriptorBuilder
@@ -149,20 +138,6 @@ private static void createTestTables(HMaster master) throws IOException {
     master.flushMasterStore();
   }
 
-  private String getInfoServerHostAndPort() {
-    return "http://localhost:" + CLUSTER.getActiveMaster().getInfoServer().getPort();
-  }
-
-  private static String getResponseBody(HttpURLConnection conn) throws IOException {
-    StringBuilder sb = new StringBuilder();
-    BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-    String output;
-    while ((output = br.readLine()) != null) {
-      sb.append(output);
-    }
-    return sb.toString();
-  }
-
   private static void assertRegionServerLinks(HMaster master, String responseBody) {
     ServerManager serverManager = master.getServerManager();
     List<ServerName> servers = serverManager.getOnlineServersList();

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java

@@ -20,10 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 import org.apache.hadoop.conf.Configuration;
@@ -43,6 +40,7 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.RegionServerTests;
 import org.apache.hadoop.hbase.util.CommonFSUtils;
+import org.apache.hadoop.hbase.util.TestServerHttpUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -123,7 +121,8 @@ public void testStatusPage() throws Exception {
     String hostname = firstServerName.getHostname();
     int port = firstServerName.getPort();
 
-    String page = getRegionServerStatusPageContent(hostname, infoPort);
+    URL url = new URL("http://" + hostname + ":" + infoPort + "/regionserver.jsp");
+    String page = TestServerHttpUtils.getPageContent(url, "text/html;charset=utf-8");
 
     assertTrue(page.contains("<title>HBase Region Server: " + masterHostname + "</title>"));
 
@@ -153,26 +152,4 @@ private static void createTestTables(HMaster master) throws IOException {
     master.createTable(tableDescriptor2, null, 0, 0);
     master.flushMasterStore();
   }
-
-  private static String getRegionServerStatusPageContent(String hostname, int infoPort)
-    throws IOException {
-    URL url = new URL("http://" + hostname + ":" + infoPort + "/regionserver.jsp");
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    conn.connect();
-
-    assertEquals(200, conn.getResponseCode());
-    assertEquals("text/html;charset=utf-8", conn.getContentType());
-
-    return getResponseBody(conn);
-  }
-
-  private static String getResponseBody(HttpURLConnection conn) throws IOException {
-    StringBuilder sb = new StringBuilder();
-    BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-    String output;
-    while ((output = br.readLine()) != null) {
-      sb.append(output);
-    }
-    return sb.toString();
-  }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestServerHttpUtils.java

@@ -27,18 +27,11 @@
 import org.apache.hadoop.hbase.LocalHBaseCluster;
 
 public class TestServerHttpUtils {
-  public static String getResponseBody(HttpURLConnection conn) throws IOException {
-    StringBuilder sb = new StringBuilder();
-    BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-    String output;
-    while ((output = br.readLine()) != null) {
-      sb.append(output);
-    }
-    return sb.toString();
+  public static String getMasterInfoServerHostAndPort(LocalHBaseCluster cluster) {
+    return "http://localhost:" + cluster.getActiveMaster().getInfoServer().getPort();
   }
 
-  public static String getPageContent(URL url, String mimeType)
-    throws IOException {
+  public static String getPageContent(URL url, String mimeType) throws IOException {
     HttpURLConnection conn = (HttpURLConnection) url.openConnection();
     conn.connect();
 
@@ -48,19 +41,13 @@ public static String getPageContent(URL url, String mimeType)
     return TestServerHttpUtils.getResponseBody(conn);
   }
 
-  public static String getRegionServerStatusPageContent(String hostname, int infoPort)
-    throws IOException {
-    URL url = new URL("http://" + hostname + ":" + infoPort + "/regionserver.jsp");
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    conn.connect();
-
-    assertEquals(200, conn.getResponseCode());
-    assertEquals("text/html;charset=utf-8", conn.getContentType());
-
-    return getResponseBody(conn);
-  }
-
-  public static String getInfoServerHostAndPort(LocalHBaseCluster cluster) {
-    return "http://localhost:" + cluster.getActiveMaster().getInfoServer().getPort();
+  private static String getResponseBody(HttpURLConnection conn) throws IOException {
+    StringBuilder sb = new StringBuilder();
+    BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+    String output;
+    while ((output = br.readLine()) != null) {
+      sb.append(output);
+    }
+    return sb.toString();
   }
 }