Cdf Json Fixes

src/main/java/network/brightspots/rcv/ResultsWriter.java

@@ -65,7 +65,8 @@ class ResultsWriter {
   private static final String CDF_GPU_ID_FORMAT = "gpu-%d";
   private static final String CDF_REPORTING_DEVICE_ID = "rd-001";
 
-  private static final Map<String, String> candidateCodeToCdfId = new HashMap<>();
+  private static final Map<String, String> cdfCandidateCodeToContestSelectionId = new HashMap<>();
+  private static final Map<String, String> cdfCandidateCodeToCandidateId = new HashMap<>();
 
   // number of rounds needed to elect winner(s)
   private int numRounds;
@@ -136,18 +137,27 @@ private static String generateCvrSnapshotId(String cvrId, Integer round) {
         : String.format("ballot-%s", cvrId);
   }
 
-  private static String getCdfIdForCandidateCode(String code) {
-    String id = candidateCodeToCdfId.get(code);
+  // generates an internal ContestSelectionId based on a candidate code
+  private static String getCdfContestSelectionIdForCandidateCode(String code) {
+    String id = cdfCandidateCodeToContestSelectionId.get(code);
     if (id == null) {
-      id =
-          code.startsWith("cs-")
-              ? code
-              : String.format("cs-%s", sanitizeStringForOutput(code).toLowerCase());
-      candidateCodeToCdfId.put(code, id);
+      id = String.format("cs-%s", sanitizeStringForOutput(code).toLowerCase());
+      cdfCandidateCodeToContestSelectionId.put(code, id);
     }
     return id;
   }
 
+  // generates an internal CandidateId based on a candidate code
+  private static String getCdfCandidateIdForCandidateCode(String code) {
+    String id = cdfCandidateCodeToCandidateId.get(code);
+    if (id == null) {
+      id = String.format("c-%s", sanitizeStringForOutput(code).toLowerCase());
+      cdfCandidateCodeToCandidateId.put(code, id);
+    }
+    return id;
+  }
+
+
   // Instead of a map from rank to list of candidates, we need a sorted list of candidates
   // with the ranks they were given. (Ordinarily a candidate will have only a single rank, but they
   // could have multiple ranks if the ballot duplicates the candidate, i.e. assigns them multiple
@@ -751,7 +761,7 @@ private Map<String, Object> generateCvrSnapshotMap(
 
       selectionMapList.add(
           Map.ofEntries(
-              entry("ContestSelectionId", getCdfIdForCandidateCode(candidateCode)),
+              entry("ContestSelectionId", getCdfContestSelectionIdForCandidateCode(candidateCode)),
               entry("SelectionPosition", selectionPositionMapList),
               entry("@type", "CVR.CVRContestSelection")));
     }
@@ -772,31 +782,36 @@ private Map<String, Object> generateCvrSnapshotMap(
   private Map<String, Object> generateCdfMapForElection() {
     HashMap<String, Object> electionMap = new HashMap<>();
 
+    // containers for election-level data
     List<Map<String, Object>> contestSelections = new LinkedList<>();
+    List<Map<String, Object>> candidates = new LinkedList<>();
+
+    // iterate all candidates and create Candidate and ContestSelection objects for them
     List<String> candidateCodes = new LinkedList<>(config.getCandidateCodeList());
     Collections.sort(candidateCodes);
     for (String candidateCode : candidateCodes) {
-      Map<String, String> codeMap =
+      candidates.add(
           Map.ofEntries(
-              entry("@type", "CVR.Code"),
-              entry("Type", "other"),
-              entry("OtherType", "vendor-label"),
-              entry("Value", config.getNameForCandidateCode(candidateCode)));
+              entry("@id", getCdfCandidateIdForCandidateCode(candidateCode)),
+              entry("Name", candidateCode)));
 
       contestSelections.add(
           Map.ofEntries(
-              entry("@id", getCdfIdForCandidateCode(candidateCode)),
+              entry("@id", getCdfContestSelectionIdForCandidateCode(candidateCode)),
               entry("@type", "CVR.ContestSelection"),
-              entry("Code", new Map[]{codeMap})));
+              entry("CandidateIds", new String[]{getCdfCandidateIdForCandidateCode(candidateCode)})));
     }
 
     Map<String, Object> contestJson =
         Map.ofEntries(
             entry("@id", CDF_CONTEST_ID),
+            entry("@type", "CVR.CandidateContest"),
             entry("ContestSelection", contestSelections),
-            entry("@type", "CVR.CandidateContest"));
+            entry("Name", config.getContestName())
+        );
 
     electionMap.put("@id", CDF_ELECTION_ID);
+    electionMap.put("Candidate", candidates);
     electionMap.put("Contest", new Map[]{contestJson});
     electionMap.put("ElectionScopeId", CDF_GPU_ID);
     electionMap.put("@type", "CVR.Election");

src/main/java/network/brightspots/rcv/TabulatorSession.java

@@ -336,8 +336,12 @@ private List<CastVoteRecord> parseCastVoteRecords(ContestConfig config, Set<Stri
         encounteredSourceProblem = true;
       } catch (CvrParseException e) {
         encounteredSourceProblem = true;
+      } catch (Exception exception) {
+        Logger.severe("Unexpected error parsing source file: %s\n%s", cvrPath,
+            exception.toString());
+        encounteredSourceProblem = true;
       }
-    }
+  }
 
     if (encounteredSourceProblem) {
       Logger.log(Level.SEVERE, "Parsing cast vote records failed!");

src/test/java/network/brightspots/rcv/TabulatorTests.java

@@ -26,6 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -117,9 +118,10 @@ private static String getTestFilePath(String stem, String suffix) {
   // helper function to support running various tabulation tests
   private static void runTabulationTest(String stem) {
     String configPath = getTestFilePath(stem, "_config.json");
+    Logger.info("Running tabulation test: %s\nTabulating config file: %s...", stem, configPath);
     TabulatorSession session = new TabulatorSession(configPath);
     session.tabulate();
-
+    Logger.info("Examining tabulation test results...");
     String timestampString = session.getTimestampString();
     ContestConfig config = ContestConfig.loadContestConfig(configPath);
     assertNotNull(config);
@@ -140,7 +142,6 @@ private static void runTabulationTest(String stem) {
           "_contest_" + config.rawConfig.cvrFileSources.get(0).getContestId() + "_expected.csv");
       assertTrue(fileCompare(session.getConvertedFilesWritten().get(0), expectedPath));
     }
-
     // test passed so cleanup test output folder
     File outputFolder = new File(session.getOutputPath());
     if (outputFolder.listFiles() != null) {
@@ -156,6 +157,7 @@ private static void runTabulationTest(String stem) {
         }
       }
     }
+    Logger.info("Test complete.");
   }
 
   private static void compareJsons(
@@ -183,7 +185,13 @@ private static void compareJson(
                 + "_expected_"
                 + jsonType
                 + ".json");
-    assertTrue(fileCompare(expectedPath, actualOutputPath));
+    Logger.info("Comparing files:\nGenerated: %s\nReference: %s", actualOutputPath, expectedPath);
+    if (fileCompare(expectedPath, actualOutputPath)) {
+      Logger.info("Files are equal.");
+    } else {
+      Logger.info("Files are different.");
+      fail();
+    }
   }
 
   @BeforeAll