Moving to @michelleblom's abstraction for db setup

DemocracyDevelopers · Jun 22, 2024 · 781bd6a · 781bd6a
1 parent f787fb0
commit 781bd6a
Show file tree

Hide file tree

Showing 10 changed files with 865 additions and 319 deletions.
diff --git a/...r/eclipse-project/src/test/java/us/freeandfair/corla/controllers/BallotSelectionTest.java b/...r/eclipse-project/src/test/java/us/freeandfair/corla/controllers/BallotSelectionTest.java
@@ -31,56 +31,15 @@
 import org.hibernate.Session;
 import us.freeandfair.corla.query.CastVoteRecordQueries;
 import us.freeandfair.corla.query.Setup;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
-public class BallotSelectionTest {
+public class BallotSelectionTest extends TestClassWithDatabase {
 
   private BallotSelectionTest() {};
 
   private Boolean return_cvr = true;
 
-  /**
-   * Container for the mock-up database.
-   */
-  static PostgreSQLContainer<?> postgres
-          = new PostgreSQLContainer<>("postgres:15-alpine")
-          // None of these actually have to be the same as the real database (except its name), but this
-          // makes it easy to match the setup scripts.
-          .withDatabaseName("corla")
-          .withUsername("corlaadmin")
-          .withPassword("corlasecret")
-          // .withInitScripts("corlaInit.sql","contest.sql");
-          .withInitScript("SQL/corlaInitEmpty.sql");
-
-  @BeforeClass
-  public static void beforeAll() {
-    postgres.start();
-    Properties hibernateProperties = new Properties();
-    hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-    hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-    hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-    hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-    hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-    Persistence.setProperties(hibernateProperties);
-    Persistence.beginTransaction();
-
-  }
-
-  @AfterClass
-  public static void afterAll() {
-    postgres.stop();
-  }
-
-  @BeforeMethod
-  public static void beforeEach() {
-    Persistence.beginTransaction();
-  }
-
-  @AfterMethod
-  public static void afterEach() {
-    Persistence.rollbackTransaction();
-  }
-
   @Test()
   public void testAuditedPrefixLengthWithNone() {
     List<Long> cvrIds = new ArrayList<>();

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/endpoint/StartAuditRoundTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/endpoint/StartAuditRoundTest.java
@@ -10,54 +10,14 @@
 import us.freeandfair.corla.model.CountyDashboard;
 import us.freeandfair.corla.persistence.Persistence;
 import us.freeandfair.corla.query.Setup;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 import java.util.Properties;
 
 @Test(groups = {"integration"})
-public class StartAuditRoundTest {
+public class StartAuditRoundTest extends TestClassWithDatabase {
 
   private StartAuditRoundTest() {};
-  /**
-   * Container for the mock-up database.
-   */
-  static PostgreSQLContainer<?> postgres
-          = new PostgreSQLContainer<>("postgres:15-alpine")
-          // None of these actually have to be the same as the real database (except its name), but this
-          // makes it easy to match the setup scripts.
-          .withDatabaseName("corla")
-          .withUsername("corlaadmin")
-          .withPassword("corlasecret")
-          // .withInitScripts("corlaInit.sql","contest.sql");
-          .withInitScript("SQL/corlaInitEmpty.sql");
-
-  @BeforeClass
-  public static void beforeAll() {
-    postgres.start();
-    Properties hibernateProperties = new Properties();
-    hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-    hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-    hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-    hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-    hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-    Persistence.setProperties(hibernateProperties);
-    Persistence.beginTransaction();
-
-  }
-
-  @AfterClass
-  public static void afterAll() {
-    postgres.stop();
-  }
-
-  @BeforeMethod
-  public static void beforeEach() {
-    Persistence.beginTransaction();
-  }
-
-  @AfterMethod
-  public static void afterEach() {
-    Persistence.rollbackTransaction();
-  }
 
   // this test doesn't do much yet
   @Test()

diff --git a/...er/eclipse-project/src/test/java/us/freeandfair/corla/query/AdministratorQueriesTest.java b/...er/eclipse-project/src/test/java/us/freeandfair/corla/query/AdministratorQueriesTest.java
@@ -5,49 +5,15 @@
 import us.freeandfair.corla.model.Administrator;
 import us.freeandfair.corla.model.County;
 import us.freeandfair.corla.persistence.Persistence;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 import java.util.Properties;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
 @Test
-public class AdministratorQueriesTest {
-
-    /**
-     * Container for the mock-up database.
-     */
-    private static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15-alpine")
-            .withDatabaseName("corla")
-            .withUsername("corlaadmin")
-            .withPassword("corlasecret")
-            .withInitScript("SQL/corlaInitEmpty.sql");
-
-    @BeforeClass
-    public static void beforeAll() {
-        postgres.start();
-        Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-        hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-        hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-        hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-        hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-        Persistence.setProperties(hibernateProperties);
-    }
-    @BeforeMethod
-    public static void beforeEach() {
-        Persistence.beginTransaction();
-    }
-
-    @AfterMethod
-    public static void afterEach() {
-        Persistence.rollbackTransaction();
-    }
-
-    @AfterClass
-    public static void afterall() {
-        postgres.stop();
-    }
+public class AdministratorQueriesTest extends TestClassWithDatabase {
 
     @Test
     public void testByUsernameState() {

diff --git a/...lipse-project/src/test/java/us/freeandfair/corla/query/BallotManifestInfoQueriesTest.java b/...lipse-project/src/test/java/us/freeandfair/corla/query/BallotManifestInfoQueriesTest.java
@@ -6,6 +6,7 @@
 import org.testng.annotations.*;
 import us.freeandfair.corla.model.*;
 import us.freeandfair.corla.persistence.Persistence;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 import javax.swing.text.html.Option;
 import java.util.*;
@@ -14,42 +15,7 @@
 import static org.testng.AssertJUnit.assertEquals;
 
 @Test
-public class BallotManifestInfoQueriesTest {
-
-    /**
-     * Container for the mock-up database.
-     */
-    private static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15-alpine")
-            .withDatabaseName("corla")
-            .withUsername("corlaadmin")
-            .withPassword("corlasecret")
-            .withInitScript("SQL/corlaInitEmpty.sql");
-
-    @BeforeClass
-    public static void beforeAll() {
-        postgres.start();
-        Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-        hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-        hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-        hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-        hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-        Persistence.setProperties(hibernateProperties);
-    }
-    @BeforeMethod
-    public static void beforeEach() {
-        Persistence.beginTransaction();
-    }
-
-    @AfterMethod
-    public static void afterEach() {
-        Persistence.rollbackTransaction();
-    }
-
-    @AfterClass
-    public static void afterall() {
-        postgres.stop();
-    }
+public class BallotManifestInfoQueriesTest extends TestClassWithDatabase {
 
     public BallotManifestInfo setupBMI() {
          return new BallotManifestInfo(1L,

diff --git a/...r/eclipse-project/src/test/java/us/freeandfair/corla/query/CastVoteRecordQueriesTest.java b/...r/eclipse-project/src/test/java/us/freeandfair/corla/query/CastVoteRecordQueriesTest.java
@@ -23,48 +23,10 @@
 import us.freeandfair.corla.model.*;
 import us.freeandfair.corla.persistence.Persistence;
 import us.freeandfair.corla.query.Setup;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
-public class CastVoteRecordQueriesTest {
-
-  /**
-   * Container for the mock-up database.
-   */
-  private static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15-alpine")
-          .withDatabaseName("corla")
-          .withUsername("corlaadmin")
-          .withPassword("corlasecret")
-          .withInitScript("SQL/corlaInitEmpty.sql");
-
-  @BeforeClass
-  public static void beforeAll() {
-    postgres.start();
-    Properties hibernateProperties = new Properties();
-    hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-    hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-    hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-    hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-    hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-    Persistence.setProperties(hibernateProperties);
-  }
-  @BeforeMethod
-  public static void beforeEach() {
-    Persistence.beginTransaction();
-  }
-
-  @AfterMethod
-  public static void afterEach() {
-    try {
-      Persistence.rollbackTransaction();
-    } catch (IllegalStateException e) {
-      // Sometimes our tests intentionally kill the DB.
-    }
-  }
-
-  @AfterClass
-  public static void afterall() {
-    postgres.stop();
-  }
+public class CastVoteRecordQueriesTest extends TestClassWithDatabase {
 
   public List<CVRContestInfo> noisyContestSetup(){
     return noisyContestSetup(1L);

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/query/ContestQueriesTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/query/ContestQueriesTest.java
@@ -8,6 +8,7 @@
 import us.freeandfair.corla.model.*;
 import us.freeandfair.corla.model.Choice;
 import us.freeandfair.corla.persistence.Persistence;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 import java.awt.*;
 import java.util.*;
@@ -16,42 +17,7 @@
 import static org.testng.Assert.*;
 
 @Test(groups = {"integration"})
-public class ContestQueriesTest {
-
-    /**
-     * Container for the mock-up database.
-     */
-    private static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15-alpine")
-            .withDatabaseName("corla")
-            .withUsername("corlaadmin")
-            .withPassword("corlasecret")
-            .withInitScript("SQL/corlaInitEmpty.sql");
-
-    @BeforeClass
-    public static void beforeAll() {
-        postgres.start();
-        Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-        hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-        hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-        hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-        hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-        Persistence.setProperties(hibernateProperties);
-    }
-    @BeforeMethod
-    public static void beforeEach() {
-        Persistence.beginTransaction();
-    }
-
-    @AfterMethod
-    public static void afterEach() {
-        Persistence.rollbackTransaction();
-    }
-
-    @AfterClass
-    public static void afterall() {
-        postgres.stop();
-    }
+public class ContestQueriesTest extends TestClassWithDatabase {
 
     public County countySetup() {
         return countySetup(1L);
@@ -158,7 +124,7 @@ public void testForCountyNull() {
 
     }
 
-    @Test
+    @Test()
     public void testDBError() {
         // Close the database
         Persistence.commitTransaction();

diff --git a/...er/eclipse-project/src/test/java/us/freeandfair/corla/query/ContestResultQueriesTest.java b/...er/eclipse-project/src/test/java/us/freeandfair/corla/query/ContestResultQueriesTest.java
@@ -14,49 +14,10 @@
 import us.freeandfair.corla.model.ContestResult;
 import us.freeandfair.corla.model.Contest;
 import us.freeandfair.corla.model.County;
+import us.freeandfair.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
-public class ContestResultQueriesTest {
-
-  /**
-   * Container for the mock-up database.
-   */
-  static PostgreSQLContainer<?> postgres
-          = new PostgreSQLContainer<>("postgres:15-alpine")
-          // None of these actually have to be the same as the real database (except its name), but this
-          // makes it easy to match the setup scripts.
-          .withDatabaseName("corla")
-          .withUsername("corlaadmin")
-          .withPassword("corlasecret")
-          // .withInitScripts("corlaInit.sql","contest.sql");
-          .withInitScript("SQL/corlaInitEmpty.sql");
-
-  @BeforeClass
-  public static void beforeAll() {
-    postgres.start();
-    Properties hibernateProperties = new Properties();
-    hibernateProperties.setProperty("hibernate.driver", "org.postgresql.Driver");
-    hibernateProperties.setProperty("hibernate.url", postgres.getJdbcUrl());
-    hibernateProperties.setProperty("hibernate.user", postgres.getUsername());
-    hibernateProperties.setProperty("hibernate.pass", postgres.getPassword());
-    hibernateProperties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
-    Persistence.setProperties(hibernateProperties);
-
-  }
-
-  @AfterClass
-  public static void afterAll() {
-    postgres.stop();
-  }
-
-  @BeforeMethod
-  public static void beforeEach() {
-    Persistence.beginTransaction();
-  }
-
-  @AfterMethod
-  public static void afterEach() { Persistence.rollbackTransaction(); }
-
+public class ContestResultQueriesTest extends TestClassWithDatabase {
 
   @Test()
   public void findOrCreateTest() {