Only start testing server once per class

gerashegalov · Feb 11, 2014 · d8ad60f · d8ad60f
1 parent 70105e0
commit d8ad60f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java
@@ -16,8 +16,8 @@
 import com.facebook.presto.server.testing.TestingPrestoServer;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -43,14 +43,14 @@ public class TestDriver
 {
  private TestingPrestoServer server;
 
- @BeforeMethod
+ @BeforeClass
  public void setup()
  throws Exception
  {
  server = new TestingPrestoServer();
  }
 
- @AfterMethod
+ @AfterClass
  public void teardown()
  {
  closeQuietly(server);

diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
@@ -14,7 +14,9 @@
 package com.facebook.presto.jdbc;
 
 import com.facebook.presto.server.testing.TestingPrestoServer;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -38,12 +40,24 @@ public class TestJdbcResultSet
  private Connection connection;
  private Statement statement;
 
+ @BeforeClass
+ public void setupServer()
+ throws Exception
+ {
+ server = new TestingPrestoServer();
+ }
+
+ @AfterClass
+ public void teardownServer()
+ {
+ closeQuietly(server);
+ }
+
  @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
  @BeforeMethod
  public void setup()
  throws Exception
  {
- server = new TestingPrestoServer();
  connection = createConnection();
  statement = connection.createStatement();
  }
@@ -53,7 +67,6 @@ public void teardown()
  {
  closeQuietly(statement);
  closeQuietly(connection);
- closeQuietly(server);
  }
 
  @Test