Remove us.freeandfair.corla.util.TestClassWithDatabase; change all te…

…sts to use DD's version.
DemocracyDevelopers · Dec 24, 2024 · 94dcb4b · 94dcb4b
1 parent e644191
commit 94dcb4b
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 121 deletions.
diff --git a/...se-project/src/test/java/au/org/democracydevelopers/corla/util/TestClassWithDatabase.java b/...se-project/src/test/java/au/org/democracydevelopers/corla/util/TestClassWithDatabase.java
@@ -38,6 +38,11 @@
  * This class is designed to be extended by any test class that needs to interact with a test
  * instantiation of the colorado-rla database. It provides convenience methods for instantiating
  * a postgres container (initialised with one a given SQL script) and hibernate properties.
+ * Database configuration properties are loaded from test.properties, except that the Hibernate URL
+ * is overridden with the test container's URL.
+ * Important gotcha: although you can extend this class and write a new @BeforeClass method, which
+ * will be executed after any @BeforeClass methods in this class, you *must* give the method a new
+ * name - otherwise it seems to silently not run.
  */
 public abstract class TestClassWithDatabase {
 

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,7 +31,7 @@
 import org.hibernate.Session;
 import us.freeandfair.corla.query.CastVoteRecordQueries;
 import us.freeandfair.corla.query.Setup;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
 public class BallotSelectionTest extends TestClassWithDatabase {

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,7 +10,7 @@
 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 au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import java.util.Properties;
 

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AdministratorTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AdministratorTest.java
@@ -2,7 +2,7 @@
 
 import org.testng.annotations.Test;
 import us.freeandfair.corla.persistence.Persistence;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import java.time.Clock;
 import java.time.Instant;

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AuditBoardTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AuditBoardTest.java
@@ -1,7 +1,7 @@
 package us.freeandfair.corla.model;
 
 import org.testng.annotations.Test;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import java.lang.reflect.Array;
 import java.time.Instant;

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AuditInfoTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/model/AuditInfoTest.java
@@ -23,7 +23,7 @@
 
 import us.freeandfair.corla.csv.ContestNameParser;
 import us.freeandfair.corla.json.VersionExclusionStrategy;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 public class AuditInfoTest extends TestClassWithDatabase {
   public Gson gson;

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
@@ -4,7 +4,7 @@
 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 au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;

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,7 +6,7 @@
 import org.testng.annotations.*;
 import us.freeandfair.corla.model.*;
 import us.freeandfair.corla.persistence.Persistence;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import javax.swing.text.html.Option;
 import java.util.*;

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,7 +23,7 @@
 import us.freeandfair.corla.model.*;
 import us.freeandfair.corla.persistence.Persistence;
 import us.freeandfair.corla.query.Setup;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
 public class CastVoteRecordQueriesTest extends TestClassWithDatabase {

diff --git a/.../eclipse-project/src/test/java/us/freeandfair/corla/query/ComparisonAuditQueriesTest.java b/.../eclipse-project/src/test/java/us/freeandfair/corla/query/ComparisonAuditQueriesTest.java
@@ -6,7 +6,7 @@
 import us.freeandfair.corla.model.ComparisonAudit;
 import us.freeandfair.corla.model.ContestResult;
 import us.freeandfair.corla.persistence.Persistence;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

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,7 +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 au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 import java.awt.*;
 import java.util.*;

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,7 +14,7 @@
 import us.freeandfair.corla.model.ContestResult;
 import us.freeandfair.corla.model.Contest;
 import us.freeandfair.corla.model.County;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 @Test(groups = {"integration"})
 public class ContestResultQueriesTest extends TestClassWithDatabase {

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/query/ExportQueriesTest.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/query/ExportQueriesTest.java
@@ -14,7 +14,7 @@
 
 
 import org.hibernate.Session;
-import us.freeandfair.corla.util.TestClassWithDatabase;
+import au.org.democracydevelopers.corla.util.TestClassWithDatabase;
 
 
 @Test(groups = {"integration"})

diff --git a/server/eclipse-project/src/test/java/us/freeandfair/corla/util/TestClassWithDatabase.java b/server/eclipse-project/src/test/java/us/freeandfair/corla/util/TestClassWithDatabase.java