refactor: migrate MultiHostsConnectionTest to JUnit4 (#886)

pgjdbc · Jun 1, 2018 · 17a4d6a · 17a4d6a
1 parent 9b6506d
commit 17a4d6a
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 153 deletions.
diff --git a/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java
@@ -5,102 +5,13 @@
 
 package org.postgresql.test.hostchooser;
 
-import org.postgresql.test.TestUtil;
-import org.postgresql.util.PSQLException;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.Properties;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /*
  * Executes multi host tests (aka master/slave connectivity selection).
  */
-public class MultiHostTestSuite extends TestSuite {
-
-  public static java.sql.Connection openSecondaryDB() throws Exception {
-    TestUtil.initDriver();
-
-    Properties props = new Properties();
-
-    props.setProperty("user", TestUtil.getUser());
-    props.setProperty("password", TestUtil.getPassword());
-
-    return DriverManager.getConnection(TestUtil.getURL(getSecondaryServer(), getSecondaryPort()), props);
-  }
-
-  public static java.sql.Connection openSecondaryDB2() throws Exception {
-    TestUtil.initDriver();
-
-    Properties props = new Properties();
-
-    props.setProperty("user", TestUtil.getUser());
-    props.setProperty("password", TestUtil.getPassword());
-
-    return DriverManager.getConnection(TestUtil.getURL(getSecondaryServer2(), getSecondaryPort2()), props);
-  }
-
-  /*
-   * Returns the Test server
-   */
-  public static String getSecondaryServer() {
-    return System.getProperty("secondaryServer", TestUtil.getServer());
-  }
-
-  /*
-   * Returns the Test port
-   */
-  public static int getSecondaryPort() {
-    return Integer
-        .parseInt(System.getProperty("secondaryPort", String.valueOf(TestUtil.getPort() + 1)));
-  }
-
-  /*
-   * Returns the Test server
-   */
-  public static String getSecondaryServer2() {
-    return System.getProperty("secondaryServer2", TestUtil.getServer());
-  }
-
-  /*
-   * Returns the Test port
-   */
-  public static int getSecondaryPort2() {
-    return Integer
-        .parseInt(System.getProperty("secondaryPort2", String.valueOf(TestUtil.getPort() + 2)));
-  }
-
-  /*
-   * The main entry point for JUnit
-   */
-  public static TestSuite suite() throws Exception {
-    TestSuite suite = new TestSuite();
-
-    try {
-      Connection connection = openSecondaryDB();
-      TestUtil.closeDB(connection);
-
-      connection = openSecondaryDB2();
-      TestUtil.closeDB(connection);
-    } catch (PSQLException ex) {
-      // replication instance is not available, but suite must have at lest one test case
-      suite.addTestSuite(DummyTest.class);
-      return suite;
-    }
-
-    suite.addTestSuite(MultiHostsConnectionTest.class);
-    return suite;
-  }
-
-  public static class DummyTest extends TestCase {
-    public DummyTest(String name) {
-      super(name);
-    }
-
-    public void testDummy() {
-    }
-  }
+@RunWith(Suite.class)
+@Suite.SuiteClasses(MultiHostsConnectionTest.class)
+public class MultiHostTestSuite {
 }
-