Updatesd co-counties.sql to include other setup tables.

DemocracyDevelopers · Jun 23, 2024 · 207db69 · 207db69
1 parent 3d0fbf7
commit 207db69
Show file tree

Hide file tree

Showing 3 changed files with 157 additions and 68 deletions.
diff --git a/...ject/src/test/java/au/org/democracydevelopers/corla/csv/DominionCVRExportParserTests.java b/...ject/src/test/java/au/org/democracydevelopers/corla/csv/DominionCVRExportParserTests.java
@@ -96,7 +96,6 @@ public static void beforeAll() {
 
     var containerDelegate = new JdbcDatabaseDelegate(postgres, "");
     ScriptUtils.runInitScript(containerDelegate, "SQL/co-counties.sql");
-
   }
 
   @AfterClass
@@ -240,7 +239,7 @@ public void parseThreeCandidatesTenInvalidVotesSucceeds() throws IOException {
 
     // There are 10 votes, with respective valid interpretations as below:
     List<CVRContestInfo> cvrs = getMatching(fromString("Gilpin").id(), CastVoteRecord.RecordType.UPLOADED)
-        .map(cvr -> cvr.contestInfoForContest(contest)).collect(Collectors.toList());
+        .map(cvr -> cvr.contestInfoForContest(contest)).toList();
     assertEquals(10, cvrs.size());
 
     // Raw: "Alice(1),Alice(2),Bob(2),Chuan(3)

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
@@ -62,7 +62,6 @@ public static PostgreSQLContainer<?> createTestContainer() {
     return 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.
-        // .withExposedPorts(port)
         .withDatabaseName("corla")
         .withUsername("corlaadmin")
         .withPassword("corlasecret")