chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r784328 - in /hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa: database/ rest/
Date Sat, 13 Jun 2009 01:39:08 GMT
Author: eyang
Date: Sat Jun 13 01:39:07 2009
New Revision: 784328

URL: http://svn.apache.org/viewvc?rev=784328&view=rev
Log:
CHUKWA-95. Update test case for REST API startup and teardown function to include jetty server
startup. (Eric Yang)

Added:
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/DatabaseSetup.java
      - copied, changed from r783884, hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseSetup.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/DatabaseRestServerSetup.java
      - copied, changed from r783884, hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseBaseTestCase.java
Removed:
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseSetup.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseBaseTestCase.java
Modified:
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClientTraceTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterDiskTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterHadoopRpcTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsDataNodeTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsFsNameSystemTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsNameNodeTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsThroughputTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDiskTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopJvmTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopRpcTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobConfTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrTaskTest.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseSystemMetricsTest.java

Copied: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/DatabaseSetup.java
(from r783884, hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseSetup.java)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/DatabaseSetup.java?p2=hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/DatabaseSetup.java&p1=hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseSetup.java&r1=783884&r2=784328&rev=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseSetup.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/DatabaseSetup.java Sat
Jun 13 01:39:07 2009
@@ -23,73 +23,73 @@
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 import org.apache.hadoop.chukwa.database.TableCreator;
 
-public class TestDatabaseSetup {
-    public long[] timeWindow = {7, 30, 91, 365, 3650};
-    public String[] tables = {"system_metrics","disk","cluster_system_metrics","cluster_disk","mr_job","mr_task","dfs_namenode","dfs_datanode","dfs_fsnamesystem","dfs_throughput","hadoop_jvm","hadoop_mapred","hdfs_usage"};
-    public String cluster = "demo";
-    public long current = Calendar.getInstance().getTimeInMillis();
+public class DatabaseSetup {
+  public long[] timeWindow = {7, 30, 91, 365, 3650};
+  public String[] tables = {"system_metrics","disk","cluster_system_metrics","cluster_disk","mr_job","mr_task","dfs_namenode","dfs_datanode","dfs_fsnamesystem","dfs_throughput","hadoop_jvm","hadoop_mapred","hdfs_usage"};
+  public String cluster = "demo";
+  public long current = Calendar.getInstance().getTimeInMillis();
 
-    public void setUpDatabase() {
-	System.setProperty("CLUSTER","demo");
-	DatabaseWriter db = new DatabaseWriter(cluster);
-	String buffer = "";
-	File aFile = new File(System.getenv("CHUKWA_CONF_DIR")
-			      + File.separator + "database_create_tables.sql");
-	buffer = readFile(aFile);
-	String tables[] = buffer.split(";");
-	for(String table : tables) {
-	    if(table.length()>5) {
-		db.execute(table);
-	    }
-	}
-	db.close();
-	for(int i=0;i<timeWindow.length;i++) {
-	    TableCreator tc = new TableCreator();
-	    long start = current;
-	    long end = current + (timeWindow[i]*1440*60*1000);
-	    tc.createTables(start, end);
-	}
+  public void setUpDatabase() {
+    System.setProperty("CLUSTER","demo");
+    DatabaseWriter db = new DatabaseWriter(cluster);
+    String buffer = "";
+    File aFile = new File(System.getenv("CHUKWA_CONF_DIR")
+        + File.separator + "database_create_tables.sql");
+    buffer = readFile(aFile);
+    String tables[] = buffer.split(";");
+    for(String table : tables) {
+      if(table.length()>5) {
+        db.execute(table);
+      }
     }
-    
-    public void tearDownDatabase() {
-	DatabaseWriter db = null;
-	try {
-	    db = new DatabaseWriter(cluster);
-	    ResultSet rs = db.query("show tables");
-	    ArrayList<String> list = new ArrayList<String>();
-	    while(rs.next()) {
-		String table = rs.getString(1);
-		list.add(table);
-	    }
-	    for(String table : list) {
-		db.execute("drop table "+table);
-	    }
-	} catch(Throwable ex) {
-	} finally {
-	    if(db!=null) {
-		db.close();
-	    }
-	}
+    db.close();
+    for(int i=0;i<timeWindow.length;i++) {
+      TableCreator tc = new TableCreator();
+      long start = current;
+      long end = current + (timeWindow[i]*1440*60*1000);
+      tc.createTables(start, end);
+    }
+  }
+
+  public void tearDownDatabase() {
+    DatabaseWriter db = null;
+    try {
+      db = new DatabaseWriter(cluster);
+      ResultSet rs = db.query("show tables");
+      ArrayList<String> list = new ArrayList<String>();
+      while(rs.next()) {
+        String table = rs.getString(1);
+        list.add(table);
+      }
+      for(String table : list) {
+        db.execute("drop table "+table);
+      }
+    } catch(Throwable ex) {
+    } finally {
+      if(db!=null) {
+        db.close();
+      }
     }
+  }
 
-    public String readFile(File aFile) {
-	StringBuffer contents = new StringBuffer();
-	try {
-	    BufferedReader input = new BufferedReader(new FileReader(aFile));
-	    try {
-		String line = null; // not declared within while loop
-		while ((line = input.readLine()) != null) {
-		    contents.append(line);
-		    contents.append(System.getProperty("line.separator"));
-		}
-	    } finally {
-		input.close();
-	    }
-	} catch (IOException ex) {
-	    ex.printStackTrace();
-	}
-	return contents.toString();
+  public String readFile(File aFile) {
+    StringBuffer contents = new StringBuffer();
+    try {
+      BufferedReader input = new BufferedReader(new FileReader(aFile));
+      try {
+        String line = null; // not declared within while loop
+        while ((line = input.readLine()) != null) {
+          contents.append(line);
+          contents.append(System.getProperty("line.separator"));
+        }
+      } finally {
+        input.close();
+      }
+    } catch (IOException ex) {
+      ex.printStackTrace();
     }
+    return contents.toString();
+  }
     
 }
 

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseAggregator.java
Sat Jun 13 01:39:07 2009
@@ -34,7 +34,7 @@
 import java.util.ArrayList;
 
 public class TestDatabaseAggregator extends TestCase {
-    public TestDatabaseSetup dbSetup = new TestDatabaseSetup();
+    public DatabaseSetup dbSetup = new DatabaseSetup();
 
     public void setUp() {
 	dbSetup.setUpDatabase();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java
Sat Jun 13 01:39:07 2009
@@ -143,7 +143,7 @@
       Context root = new Context(jettyCollector, "/", Context.SESSIONS);
       root.addServlet(new ServletHolder(new ServletCollector(conf)), "/*");
       jettyCollector.start();
-      jettyCollector.setStopAtShutdown(false);
+      jettyCollector.setStopAtShutdown(true);
       Thread.sleep(10000);
     } catch(Exception e) {
       fail("Fail to startup collector.");

Copied: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/DatabaseRestServerSetup.java
(from r783884, hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseBaseTestCase.java)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/DatabaseRestServerSetup.java?p2=hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/DatabaseRestServerSetup.java&p1=hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseBaseTestCase.java&r1=783884&r2=784328&rev=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseBaseTestCase.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/DatabaseRestServerSetup.java
Sat Jun 13 01:39:07 2009
@@ -24,92 +24,125 @@
 import org.apache.commons.logging.*;
 import org.apache.hadoop.chukwa.database.*;
 import org.apache.hadoop.chukwa.util.*;
-import org.apache.hadoop.chukwa.database.TestDatabaseSetup;
-
+import org.apache.hadoop.chukwa.database.DatabaseSetup;
+import org.apache.hadoop.chukwa.datacollection.collector.servlet.ServletCollector;
+import org.apache.hadoop.chukwa.rest.actions.*;
+import org.apache.hadoop.chukwa.rest.objects.*;
+import org.apache.hadoop.chukwa.rest.services.*;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
 import junit.framework.TestCase;
 
 import com.sun.jersey.api.client.*;
 import com.sun.jersey.api.client.filter.*;
+import com.sun.jersey.spi.container.servlet.ServletContainer;
 
-public class TestDatabaseBaseTestCase extends TestCase {
-    public static String DATE_FORMAT_NOW="yyy-MM-dd HH:mm:ss";
-    public Timestamp time;
-    public String tableName;
-    public String dateString;
-    public String insertString;
-    public String deleteString;
-    WebResource resource;
-    Client client;
-    public TestDatabaseSetup dbSetup = new TestDatabaseSetup();
-
-    public TestDatabaseBaseTestCase() {
-	Calendar calendar = Calendar.getInstance();
-	this.time = new Timestamp(calendar.getTimeInMillis());
-	SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
-	this.dateString = sdf.format(this.time.getTime());
-	client = Client.create();
-	resource = client.resource("http://localhost:8080/chukwa/v1/");
-	resource.addFilter(new LoggingFilter());
-	System.err.println("done logging filter");
-    }
-
-    protected String getCluster() {
-	// insert record into database	
-	String cluster=System.getProperty("CLUSTER", "");
-	if (cluster.compareTo("")==0)  {
+public class DatabaseRestServerSetup extends TestCase {
+  public static String DATE_FORMAT_NOW="yyy-MM-dd HH:mm:ss";
+  public Timestamp time;
+  public String tableName;
+  public String dateString;
+  public String insertString;
+  public String deleteString;
+  WebResource resource;
+  Client client;
+  public DatabaseSetup dbSetup = new DatabaseSetup();
+  int THREADS = 2;
+  int restPort = 8080;
+  private Server jettyServer = null;
+
+  public DatabaseRestServerSetup() {
+	  Calendar calendar = Calendar.getInstance();
+	  this.time = new Timestamp(calendar.getTimeInMillis());
+	  SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
+	  this.dateString = sdf.format(this.time.getTime());
+	  client = Client.create();
+	  resource = client.resource("http://localhost:"+restPort+"/chukwa/v1/");
+	  resource.addFilter(new LoggingFilter());
+	  System.err.println("done logging filter");
+  }
+
+  protected String getCluster() {
+	  // insert record into database	
+	  String cluster=System.getProperty("CLUSTER", "");
+	  if (cluster.compareTo("")==0)  {
 	    ClusterConfig cc=new ClusterConfig();
 	    Iterator<String> keys = cc.getClusters();
 	    if (keys.hasNext()) {
-		cluster=keys.next();
+		    cluster=keys.next();
 	    }
 	    System.setProperty("CLUSTER",cluster);
-	}
+	  }
 
-        if (cluster == null) {
+    if (cluster == null) {
 	    cluster = "demo";
-	}
+	  }
 
-	return cluster;
-    }
+	  return cluster;
+  }
 
-    protected void setUp() {
-	dbSetup.setUpDatabase();
-	String cluster = getCluster();
-	DatabaseWriter dbw = new DatabaseWriter(cluster);
-	long startTime = this.time.getTime();
-	long endTime = this.time.getTime();
-
-	String query=this.insertString;
-	Macro mp = new Macro(startTime, endTime, query, null);
-	query = mp.toString();
-	try {
+  protected void setUp() {
+	  dbSetup.setUpDatabase();
+	  String cluster = getCluster();
+	  DatabaseWriter dbw = new DatabaseWriter(cluster);
+	  long startTime = this.time.getTime();
+	  long endTime = this.time.getTime();
+
+	  String query=this.insertString;
+	  Macro mp = new Macro(startTime, endTime, query, null);
+	  query = mp.toString();
+	  try {
 	    dbw.execute(query);
-	} catch (Exception e) {
+	  } catch (Exception e) {
 	    System.err.println(e.toString());
-	}
-    }
-
-    protected void tearDown() {
-	/*
-	dbSetup.tearDownDatabase();
-	*/
-    }
-
-    // check the return string for the specified format
-
-    protected void checkXML(String string) {
-	System.err.println("xml:"+string);
-	assertTrue(string.indexOf("item")>=0);
-    }
+	  }
+    SelectChannelConnector jettyConnector = new SelectChannelConnector();
+    jettyConnector.setLowResourcesConnections(THREADS-1);
+    jettyConnector.setLowResourceMaxIdleTime(1500);
+    jettyConnector.setPort(restPort);
     
-    protected void checkJson(String string) {
-	System.err.println("json:"+string);
-	assertTrue(string.indexOf("{")>=0);
-    }
-
-    protected void checkCsv(String string) {
-	System.err.println("csv:"+string);
-	assertTrue((string.toLowerCase().indexOf("timestamp")>=0) || 
-		   (string.toLowerCase().indexOf("job")>=0));
-    }
+    ServletHolder sh = new ServletHolder(ServletContainer.class);
+    sh.setInitParameter("com.sun.jersey.config.property.resourceConfigClass", "com.sun.jersey.api.core.PackagesResourceConfig");
+    sh.setInitParameter("com.sun.jersey.config.property.packages", "org.apache.hadoop.chukwa.rest.actions");
+    
+    // Set up jetty server proper, using connector
+    jettyServer = new Server(restPort);
+    Context root = new Context(jettyServer, "/", Context.SESSIONS);
+    root.addServlet(sh, "/chukwa/v1/*");
+    try {
+    jettyServer.start();
+    jettyServer.setStopAtShutdown(true);
+    } catch(Throwable e) {
+      fail("Fail to start chukwa REST API");
+    }
+  }
+
+  protected void tearDown() {
+    try {
+      jettyServer.stop();
+    } catch (Exception e) {
+      fail("Fail to stop chukwa REST API");
+    }
+  }
+
+  // check the return string for the specified format
+
+  protected void checkXML(String string) {
+    System.err.println("xml:"+string);
+    assertTrue(string.indexOf("item")>=0);
+  }
+
+  protected void checkJson(String string) {
+    System.err.println("json:"+string);
+    assertTrue(string.indexOf("{")>=0);
+  }
+
+  protected void checkCsv(String string) {
+    System.err.println("csv:"+string);
+    assertTrue((string.toLowerCase().indexOf("timestamp")>=0) || 
+        (string.toLowerCase().indexOf("job")>=0));
+  }
 }

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClientTraceTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClientTraceTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClientTraceTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClientTraceTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseClientTraceTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseClientTraceTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseClientTraceTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterDiskTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterDiskTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterDiskTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterDiskTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseClusterDiskTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseClusterDiskTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseClusterDiskTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterHadoopRpcTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterHadoopRpcTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterHadoopRpcTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseClusterHadoopRpcTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseClusterHadoopRpcTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseClusterHadoopRpcTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseClusterHadoopRpcTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsDataNodeTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsDataNodeTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsDataNodeTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsDataNodeTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseDfsDataNodeTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseDfsDataNodeTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseDfsDataNodeTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsFsNameSystemTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsFsNameSystemTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsFsNameSystemTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsFsNameSystemTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseDfsFsNameSystemTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseDfsFsNameSystemTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseDfsFsNameSystemTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsNameNodeTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsNameNodeTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsNameNodeTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsNameNodeTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseDfsNameNodeTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseDfsNameNodeTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseDfsNameNodeTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsThroughputTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsThroughputTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsThroughputTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDfsThroughputTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseDfsThroughputTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseDfsThroughputTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseDfsThroughputTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDiskTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDiskTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDiskTest.java (original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseDiskTest.java Sat
Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseDiskTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseDiskTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseDiskTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopJvmTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopJvmTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopJvmTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopJvmTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseHadoopJvmTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseHadoopJvmTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseHadoopJvmTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopRpcTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopRpcTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopRpcTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseHadoopRpcTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseHadoopRpcTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseHadoopRpcTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseHadoopRpcTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobConfTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobConfTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobConfTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobConfTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseMrJobConfTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseMrJobConfTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseMrJobConfTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrJobTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseMrJobTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseMrJobTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseMrJobTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrTaskTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrTaskTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrTaskTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseMrTaskTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseMrTaskTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseMrTaskTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseMrTaskTest() {
 	super();

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseSystemMetricsTest.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseSystemMetricsTest.java?rev=784328&r1=784327&r2=784328&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseSystemMetricsTest.java
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/TestDatabaseSystemMetricsTest.java
Sat Jun 13 01:39:07 2009
@@ -28,7 +28,7 @@
 import org.apache.hadoop.chukwa.database.Macro;
 import org.apache.hadoop.chukwa.util.DatabaseWriter;
 
-public class TestDatabaseSystemMetricsTest extends TestDatabaseBaseTestCase {
+public class TestDatabaseSystemMetricsTest extends DatabaseRestServerSetup {
     /* testing setup */
     public TestDatabaseSystemMetricsTest() {
 	super();



Mime
View raw message