BrightSpots · artoonie · Nov 4, 2024 · Oct 8, 2024 · Oct 8, 2024 · Oct 19, 2024
diff --git a/src/main/java/network/brightspots/rcv/AuditableFile.java b/src/main/java/network/brightspots/rcv/AuditableFile.java
@@ -19,12 +19,17 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 final class AuditableFile extends File {
   public AuditableFile(String pathname) {
     super(pathname);
   }
 
+  public AuditableFile(Path pathname) {
+    super(pathname.toAbsolutePath().toString());
+  }
+
   public void finalizeAndHash() {
     String hash = Utils.bytesToHex(FileUtils.getHashBytes(this, "SHA-512"));
 

diff --git a/src/main/java/network/brightspots/rcv/ResultsWriter.java b/src/main/java/network/brightspots/rcv/ResultsWriter.java
diff --git a/src/test/java/network/brightspots/rcv/TabulatorTests.java b/src/test/java/network/brightspots/rcv/TabulatorTests.java
@@ -34,10 +34,13 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import network.brightspots.rcv.ResultsWriter.ResultFile;
+import network.brightspots.rcv.ResultsWriter.ResultType;
 import network.brightspots.rcv.Tabulator.TabulationAbortedException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
@@ -187,11 +190,16 @@ private static boolean fileCompareLineByLine(String path1, String path2) {
     return result;
   }
 
+  // given stem and suffix returns path to file in test asset folder
+  private static Path getTestDirectory(String stem) {
+    return Paths.get(System.getProperty("user.dir"), TEST_ASSET_FOLDER, stem);
+  }
+
   // given stem and suffix returns path to file in test asset folder
   private static String getTestFilePath(String stem, String suffix) {
-    return Paths.get(System.getProperty("user.dir"), TEST_ASSET_FOLDER, stem, stem + suffix)
-        .toAbsolutePath()
-        .toString();
+    Path directory = getTestDirectory(stem);
+    String filename = stem + suffix;
+    return Paths.get(directory.toString(), filename).toAbsolutePath().toString();
   }
 
   private static void runTabulationTest(String testStem) {
@@ -224,7 +232,7 @@ private static void runTabulationTest(String stem, String expectedException,
 
       if (config.isMultiSeatSequentialWinnerTakesAllEnabled()) {
         for (int i = 1; i <= config.getNumberOfWinners(); i++) {
-          compareFiles(config, stem, timestampString, Integer.toString(i));
+          compareFiles(config, stem, timestampString, i);
         }
       } else {
         compareFiles(config, stem, timestampString, null);
@@ -233,14 +241,12 @@ private static void runTabulationTest(String stem, String expectedException,
       int numSlicedFilesChecked = 0;
       for (ContestConfig.TabulateBySlice slice : config.enabledSlices()) {
         for (String sliceName : session.loadSliceNamesFromCvrs(slice, config)) {
-          String outputTypeJson = ResultsWriter.sanitizeStringForOutput(
-              String.format("%s_%s_summary", sliceName, slice.toLowerString()));
-          String outputTypeCsv = ResultsWriter.sanitizeStringForOutput(
-                  String.format("%s_%s_extended_summary", sliceName, slice.toLowerString()));
-          if (compareFiles(config, stem, outputTypeJson, ".json", timestampString, null, true)) {
+          ResultFile resultFileJson = new ResultFile(ResultType.DETAILED_JSON, slice, sliceName);
+          ResultFile resultFileCsv = new ResultFile(ResultType.DETAILED_CSV, slice, sliceName);
+          if (compareFiles(config, stem, resultFileJson, timestampString, null, true)) {
             numSlicedFilesChecked++;
           }
-          if (compareFiles(config, stem, outputTypeCsv, ".csv", timestampString, null, true)) {
+          if (compareFiles(config, stem, resultFileCsv, timestampString, null, true)) {
             numSlicedFilesChecked++;
           }
         }
@@ -259,7 +265,7 @@ private static void runConvertToCdfTest(String stem) {
 
     String timestampString = session.getTimestampString();
     ContestConfig config = ContestConfig.loadContestConfig(configPath);
-    compareFiles(config, stem, "cvr_cdf", ".json", timestampString, null, false);
+    compareFiles(config, stem, ResultType.CDF, timestampString, null, false);
 
     cleanOutputFolder(session);
   }
@@ -322,38 +328,50 @@ private static void cleanOutputFolder(TabulatorSession session) {
   }
 
   private static void compareFiles(
-      ContestConfig config, String stem, String timestampString, String sequentialId) {
-    compareFiles(config, stem, "summary", ".json", timestampString, sequentialId, false);
-    compareFiles(config, stem, "extended_summary", ".csv", timestampString, sequentialId, false);
+      ContestConfig config, String stem, String timestampString, Integer sequentialId) {
+    compareFiles(config, stem, ResultType.DETAILED_JSON, timestampString, sequentialId, false);
+    compareFiles(config, stem, ResultType.DETAILED_CSV, timestampString, sequentialId, false);
     compareExtendedSummaryToSummary(config, timestampString, sequentialId);
     if (config.isGenerateCdfJsonEnabled()) {
-      compareFiles(config, stem, "cvr_cdf", ".json", timestampString, sequentialId, false);
+      compareFiles(config, stem, ResultType.CDF, timestampString, sequentialId, false);
     }
   }
 
+  /**
+   * Helper comparison for non-slice files.
+   */
+  private static boolean compareFiles(
+          ContestConfig config,
+          String stem,
+          ResultType resultType,
+          String timestampString,
+          Integer sequentialId,
+          boolean onlyCheckIfExpectedFileExists) {
+    ResultFile actualResultFile = new ResultFile(resultType);
+    return compareFiles(
+            config,
+            stem,
+            actualResultFile,
+            timestampString,
+            sequentialId,
+            onlyCheckIfExpectedFileExists);
+  }
+
   /**
    * Returns whether the files were compared at all.
    * If they were compared and not equal, the test will fail.
    */
   private static boolean compareFiles(
       ContestConfig config,
       String stem,
-      String outputType,
-      String extension,
+      ResultFile actualResultFile,
       String timestampString,
-      String sequentialId,
+      Integer sequentialId,
       boolean onlyCheckIfExpectedFileExists) {
-    String actualOutputPath =
-        ResultsWriter.getOutputFilePath(
-                config.getOutputDirectory(), outputType, timestampString, sequentialId)
-            + extension;
-    String expectedPath =
-        getTestFilePath(
-            stem,
-            ResultsWriter.sequentialSuffixForOutputPath(sequentialId)
-                + "_expected_"
-                + outputType
-                + extension);
+    String actualOutputPath = actualResultFile.getPath(
+          config.getOutputDirectory(), timestampString, sequentialId).toAbsolutePath().toString();
+    String expectedPath = actualResultFile.getPath(getTestDirectory(stem).toString(),
+            stem, "expected", sequentialId).toString();
 
     Logger.info("Comparing files:\nGenerated: %s\nReference: %s", actualOutputPath, expectedPath);
     boolean didCompare = true;
@@ -375,38 +393,37 @@ private static boolean compareFiles(
    * extended file except for the inactive ballot breakdown.
    */
   private static void compareExtendedSummaryToSummary(
-          ContestConfig config, String timestampString, String sequentialId) {
-    String summaryPath = ResultsWriter.getOutputFilePath(
-            config.getOutputDirectory(), "summary", timestampString, sequentialId)
-            + ".csv";
-    String extendedPath = ResultsWriter.getOutputFilePath(
-            config.getOutputDirectory(), "extended_summary", timestampString, sequentialId)
-            + ".csv";
+          ContestConfig config, String timestampString, Integer sequentialId) {
+    String dir = config.getOutputDirectory();
+    String summaryPath = new ResultFile(ResultType.SUMMARY_CSV).getPath(
+            dir, timestampString, sequentialId).toAbsolutePath().toString();
+    String detailedPath = new ResultFile(ResultType.DETAILED_CSV).getPath(
+            dir, timestampString, sequentialId).toAbsolutePath().toString();
 
     try (BufferedReader brSummary = new BufferedReader(new FileReader(summaryPath, UTF_8));
-         BufferedReader brExtended = new BufferedReader(new FileReader(extendedPath, UTF_8))) {
+         BufferedReader brDetailed = new BufferedReader(new FileReader(detailedPath, UTF_8))) {
       while (true) {
-        String lineExtended = brExtended.readLine();
+        String lineDetailed = brDetailed.readLine();
         // If the extended file has reached its end, then the non-extended file must have too
-        if (lineExtended == null) {
+        if (lineDetailed == null) {
           assertNull(brSummary.readLine(), "Extended file is missing a line");
           return;
         }
 
         // If the extended file should be excluded, continue without moving the file pointer
         // in the non-extended file. For now, there's only one type of row excluded, and they
         // happen to all start with "Inactive Ballots by"
-        if (lineExtended.startsWith("Inactive Ballots by")) {
+        if (lineDetailed.startsWith("Inactive Ballots by")) {
           continue;
         }
 
         // This line should be equal in both files. Ensure the line exists and they're equal
         // in both files.
         String lineSummary = brSummary.readLine();
         assertNotNull(lineSummary, "Summary file is missing a line");
-        if (!lineSummary.equals(lineExtended)) {
+        if (!lineSummary.equals(lineDetailed)) {
           fail("Line differes in extended vs non-extended CSV: \n%s\n%s".formatted(
-                  lineSummary, lineExtended));
+                  lineSummary, lineDetailed));
         }
       }
     } catch (FileNotFoundException exception) {

diff --git a/...S_W-13_P-09_precinct_extended_summary.csv → ...IS_W-13_P-09_precinct_detailed_report.csv b/...S_W-13_P-09_precinct_extended_summary.csv → ...IS_W-13_P-09_precinct_detailed_report.csv
diff --git a/...NNEAPOLIS_W-13_P-09_precinct_summary.json → ...S_W-13_P-09_precinct_detailed_report.json b/...NNEAPOLIS_W-13_P-09_precinct_summary.json → ...S_W-13_P-09_precinct_detailed_report.json
diff --git a/...IS_W-1_P-01_precinct_extended_summary.csv → ...LIS_W-1_P-01_precinct_detailed_report.csv b/...IS_W-1_P-01_precinct_extended_summary.csv → ...LIS_W-1_P-01_precinct_detailed_report.csv
diff --git a/...INNEAPOLIS_W-1_P-01_precinct_summary.json → ...IS_W-1_P-01_precinct_detailed_report.json b/...INNEAPOLIS_W-1_P-01_precinct_summary.json → ...IS_W-1_P-01_precinct_detailed_report.json
diff --git a/...polis_mayor_expected_extended_summary.csv → ...apolis_mayor_expected_detailed_report.csv b/...polis_mayor_expected_extended_summary.csv → ...apolis_mayor_expected_detailed_report.csv
diff --git a/...3_minneapolis_mayor_expected_summary.json → ...polis_mayor_expected_detailed_report.json b/...3_minneapolis_mayor_expected_summary.json → ...polis_mayor_expected_detailed_report.json
diff --git a/...mayor_scale_expected_extended_summary.csv → ..._mayor_scale_expected_detailed_report.csv b/...mayor_scale_expected_extended_summary.csv → ..._mayor_scale_expected_detailed_report.csv
diff --git a/...eapolis_mayor_scale_expected_summary.json → ...mayor_scale_expected_detailed_report.json b/...eapolis_mayor_scale_expected_summary.json → ...mayor_scale_expected_detailed_report.json
diff --git a/...apolis_park_expected_extended_summary.csv → ...eapolis_park_expected_detailed_report.csv b/...apolis_park_expected_extended_summary.csv → ...eapolis_park_expected_detailed_report.csv
diff --git a/...13_minneapolis_park_expected_summary.json → ...apolis_park_expected_detailed_report.json b/...13_minneapolis_park_expected_summary.json → ...apolis_park_expected_detailed_report.json
diff --git a/..._bottoms_up_expected_extended_summary.csv → ...k_bottoms_up_expected_detailed_report.csv b/..._bottoms_up_expected_extended_summary.csv → ...k_bottoms_up_expected_detailed_report.csv
diff --git a/...lis_park_bottoms_up_expected_summary.json → ..._bottoms_up_expected_detailed_report.json b/...lis_park_bottoms_up_expected_summary.json → ..._bottoms_up_expected_detailed_report.json
diff --git a/...s_park_hare_expected_extended_summary.csv → ...is_park_hare_expected_detailed_report.csv b/...s_park_hare_expected_extended_summary.csv → ...is_park_hare_expected_detailed_report.csv
diff --git a/...nneapolis_park_hare_expected_summary.json → ...s_park_hare_expected_detailed_report.json b/...nneapolis_park_hare_expected_summary.json → ...s_park_hare_expected_detailed_report.json
diff --git a/...equential_1_expected_extended_summary.csv → ...sequential_1_expected_detailed_report.csv b/...equential_1_expected_extended_summary.csv → ...sequential_1_expected_detailed_report.csv
diff --git a/...s_park_sequential_1_expected_summary.json → ...equential_1_expected_detailed_report.json b/...s_park_sequential_1_expected_summary.json → ...equential_1_expected_detailed_report.json
diff --git a/...equential_2_expected_extended_summary.csv → ...sequential_2_expected_detailed_report.csv b/...equential_2_expected_extended_summary.csv → ...sequential_2_expected_detailed_report.csv
diff --git a/...s_park_sequential_2_expected_summary.json → ...equential_2_expected_detailed_report.json b/...s_park_sequential_2_expected_summary.json → ...equential_2_expected_detailed_report.json
diff --git a/...equential_3_expected_extended_summary.csv → ...sequential_3_expected_detailed_report.csv b/...equential_3_expected_extended_summary.csv → ...sequential_3_expected_detailed_report.csv
diff --git a/...s_park_sequential_3_expected_summary.json → ...equential_3_expected_detailed_report.json b/...s_park_sequential_3_expected_summary.json → ...equential_3_expected_detailed_report.json
diff --git a/...tland_mayor_expected_extended_summary.csv → ...rtland_mayor_expected_detailed_report.csv b/...tland_mayor_expected_extended_summary.csv → ...rtland_mayor_expected_detailed_report.csv
diff --git a/...2015_portland_mayor_expected_summary.json → ...tland_mayor_expected_detailed_report.json b/...2015_portland_mayor_expected_summary.json → ...tland_mayor_expected_detailed_report.json
diff --git a/...mayor_codes_expected_extended_summary.csv → ..._mayor_codes_expected_detailed_report.csv b/...mayor_codes_expected_extended_summary.csv → ..._mayor_codes_expected_detailed_report.csv
diff --git a/...ortland_mayor_codes_expected_summary.json → ...mayor_codes_expected_detailed_report.json b/...ortland_mayor_codes_expected_summary.json → ...mayor_codes_expected_detailed_report.json
diff --git a/...S_W-13_P-13_precinct_extended_summary.csv → ...IS_W-13_P-13_precinct_detailed_report.csv b/...S_W-13_P-13_precinct_extended_summary.csv → ...IS_W-13_P-13_precinct_detailed_report.csv
diff --git a/...NNEAPOLIS_W-13_P-13_precinct_summary.json → ...S_W-13_P-13_precinct_detailed_report.json b/...NNEAPOLIS_W-13_P-13_precinct_summary.json → ...S_W-13_P-13_precinct_detailed_report.json
diff --git a/...IS_W-1_P-01_precinct_extended_summary.csv → ...LIS_W-1_P-01_precinct_detailed_report.csv b/...IS_W-1_P-01_precinct_extended_summary.csv → ...LIS_W-1_P-01_precinct_detailed_report.csv
diff --git a/...INNEAPOLIS_W-1_P-01_precinct_summary.json → ...IS_W-1_P-01_precinct_detailed_report.json b/...INNEAPOLIS_W-1_P-01_precinct_summary.json → ...IS_W-1_P-01_precinct_detailed_report.json
diff --git a/...polis_mayor_expected_extended_summary.csv → ...apolis_mayor_expected_detailed_report.csv b/...polis_mayor_expected_extended_summary.csv → ...apolis_mayor_expected_detailed_report.csv
diff --git a/...7_minneapolis_mayor_expected_summary.json → ...polis_mayor_expected_detailed_report.json b/...7_minneapolis_mayor_expected_summary.json → ...polis_mayor_expected_detailed_report.json
diff --git a/...nor_primary_expected_extended_summary.csv → ...rnor_primary_expected_detailed_report.csv b/...nor_primary_expected_extended_summary.csv → ...rnor_primary_expected_detailed_report.csv
diff --git a/...ne_governor_primary_expected_summary.json → ...nor_primary_expected_detailed_report.json b/...ne_governor_primary_expected_summary.json → ...nor_primary_expected_detailed_report.json
diff --git a/...es_cdf_json_expected_extended_summary.csv → ...ses_cdf_json_expected_detailed_report.csv b/...es_cdf_json_expected_extended_summary.csv → ...ses_cdf_json_expected_detailed_report.csv
diff --git a/...on/aliases_cdf_json_expected_summary.json → ...es_cdf_json_expected_detailed_report.json b/...on/aliases_cdf_json_expected_summary.json → ...es_cdf_json_expected_detailed_report.json
diff --git a/...es_ess_xlsx_expected_extended_summary.csv → ...ses_ess_xlsx_expected_detailed_report.csv b/...es_ess_xlsx_expected_extended_summary.csv → ...ses_ess_xlsx_expected_detailed_report.csv
diff --git a/...sx/aliases_ess_xlsx_expected_summary.json → ...es_ess_xlsx_expected_detailed_report.json b/...sx/aliases_ess_xlsx_expected_summary.json → ...es_ess_xlsx_expected_detailed_report.json
diff --git a/...POLIS_W-1_P-02_batch_extended_summary.csv → ...APOLIS_W-1_P-02_batch_detailed_report.csv b/...POLIS_W-1_P-02_batch_extended_summary.csv → ...APOLIS_W-1_P-02_batch_detailed_report.csv
diff --git a/...d_MINNEAPOLIS_W-1_P-04_batch_summary.json → ...POLIS_W-1_P-04_batch_detailed_report.json b/...d_MINNEAPOLIS_W-1_P-04_batch_summary.json → ...POLIS_W-1_P-04_batch_detailed_report.json
diff --git a/...tch_example_expected_extended_summary.csv → ...atch_example_expected_detailed_report.csv b/...tch_example_expected_extended_summary.csv → ...atch_example_expected_detailed_report.csv
diff --git a/...ample/batch_example_expected_summary.json → ...tch_example_expected_detailed_report.json b/...ample/batch_example_expected_summary.json → ...tch_example_expected_detailed_report.json
diff --git a/...sas_primary_expected_extended_summary.csv → ...nsas_primary_expected_detailed_report.csv b/...sas_primary_expected_extended_summary.csv → ...nsas_primary_expected_detailed_report.csv
diff --git a/...llot_kansas_primary_expected_summary.json → ...sas_primary_expected_detailed_report.json b/...llot_kansas_primary_expected_summary.json → ...sas_primary_expected_detailed_report.json
diff --git a/...nline_comma_expected_extended_summary.csv → ...inline_comma_expected_detailed_report.csv b/...nline_comma_expected_extended_summary.csv → ...inline_comma_expected_detailed_report.csv
diff --git a/...t_with_inline_comma_expected_summary.json → ...nline_comma_expected_detailed_report.json b/...t_with_inline_comma_expected_summary.json → ...nline_comma_expected_detailed_report.json
diff --git a/...lation_test_expected_extended_summary.csv → ...ulation_test_expected_detailed_report.csv b/...lation_test_expected_extended_summary.csv → ...ulation_test_expected_detailed_report.csv
diff --git a/...nue_tabulation_test_expected_summary.json → ...lation_test_expected_detailed_report.json b/...nue_tabulation_test_expected_summary.json → ...lation_test_expected_detailed_report.json
diff --git a/...nation_test_expected_extended_summary.csv → ...ination_test_expected_detailed_report.csv b/...nation_test_expected_extended_summary.csv → ...ination_test_expected_detailed_report.csv
diff --git a/...ch_elimination_test_expected_summary.json → ...nation_test_expected_detailed_report.json b/...ch_elimination_test_expected_summary.json → ...nation_test_expected_detailed_report.json
diff --git a/...header_test_expected_extended_summary.csv → ..._header_test_expected_detailed_report.csv b/...header_test_expected_extended_summary.csv → ..._header_test_expected_detailed_report.csv
diff --git a/...missing_header_test_expected_summary.json → ...header_test_expected_detailed_report.json b/...missing_header_test_expected_summary.json → ...header_test_expected_detailed_report.json
diff --git a/...nion_alaska_expected_extended_summary.csv → ...inion_alaska_expected_detailed_report.csv b/...nion_alaska_expected_extended_summary.csv → ...inion_alaska_expected_detailed_report.csv
diff --git a/...ska/dominion_alaska_expected_summary.json → ...nion_alaska_expected_detailed_report.json b/...ska/dominion_alaska_expected_summary.json → ...nion_alaska_expected_detailed_report.json
diff --git a/...nion_kansas_expected_extended_summary.csv → ...inion_kansas_expected_detailed_report.csv b/...nion_kansas_expected_extended_summary.csv → ...inion_kansas_expected_detailed_report.csv
diff --git a/...sas/dominion_kansas_expected_summary.json → ...nion_kansas_expected_detailed_report.json b/...sas/dominion_kansas_expected_summary.json → ...nion_kansas_expected_detailed_report.json
diff --git a/..._multi_file_expected_extended_summary.csv → ...n_multi_file_expected_detailed_report.csv b/..._multi_file_expected_extended_summary.csv → ...n_multi_file_expected_detailed_report.csv
diff --git a/...dominion_multi_file_expected_summary.json → ..._multi_file_expected_detailed_report.json b/...dominion_multi_file_expected_summary.json → ..._multi_file_expected_detailed_report.json
diff --git a/...ecinct_data_expected_extended_summary.csv → ...recinct_data_expected_detailed_report.csv b/...ecinct_data_expected_extended_summary.csv → ...recinct_data_expected_detailed_report.csv
diff --git a/...on_no_precinct_data_expected_summary.json → ...ecinct_data_expected_detailed_report.json b/...on_no_precinct_data_expected_summary.json → ...ecinct_data_expected_detailed_report.json
diff --git a/...ion_wyoming_expected_extended_summary.csv → ...nion_wyoming_expected_detailed_report.csv b/...ion_wyoming_expected_extended_summary.csv → ...nion_wyoming_expected_detailed_report.csv
diff --git a/...ng/dominion_wyoming_expected_summary.json → ...ion_wyoming_expected_detailed_report.json b/...ng/dominion_wyoming_expected_summary.json → ...ion_wyoming_expected_detailed_report.json
diff --git a/...licate_test_expected_extended_summary.csv → ...plicate_test_expected_detailed_report.csv b/...licate_test_expected_extended_summary.csv → ...plicate_test_expected_detailed_report.csv
diff --git a/...test/duplicate_test_expected_summary.json → ...licate_test_expected_detailed_report.json b/...test/duplicate_test_expected_summary.json → ...licate_test_expected_detailed_report.json
diff --git a/...cluded_test_expected_extended_summary.csv → ...xcluded_test_expected_detailed_report.csv b/...cluded_test_expected_extended_summary.csv → ...xcluded_test_expected_detailed_report.csv
diff --git a/..._test/excluded_test_expected_summary.json → ...cluded_test_expected_detailed_report.json b/..._test/excluded_test_expected_summary.json → ...cluded_test_expected_detailed_report.json
diff --git a/..._continuing_expected_extended_summary.csv → ...e_continuing_expected_detailed_report.csv b/..._continuing_expected_extended_summary.csv → ...e_continuing_expected_detailed_report.csv
diff --git a/...multiple_continuing_expected_summary.json → ..._continuing_expected_detailed_report.json b/...multiple_continuing_expected_summary.json → ..._continuing_expected_detailed_report.json
diff --git a/...eshold_test_expected_extended_summary.csv → ...reshold_test_expected_detailed_report.csv b/...eshold_test_expected_extended_summary.csv → ...reshold_test_expected_detailed_report.csv
diff --git a/...ines_threshold_test_expected_summary.json → ...eshold_test_expected_detailed_report.json b/...ines_threshold_test_expected_summary.json → ...eshold_test_expected_detailed_report.json
diff --git a/...reaker_test_expected_extended_summary.csv → ...breaker_test_expected_detailed_report.csv b/...reaker_test_expected_extended_summary.csv → ...breaker_test_expected_detailed_report.csv
diff --git a/...old_tiebreaker_test_expected_summary.json → ...reaker_test_expected_detailed_report.json b/...old_tiebreaker_test_expected_summary.json → ...reaker_test_expected_detailed_report.json
diff --git a/...ic_csv_test_expected_extended_summary.csv → ...ric_csv_test_expected_detailed_report.csv b/...ic_csv_test_expected_extended_summary.csv → ...ric_csv_test_expected_detailed_report.csv
diff --git a/...st/generic_csv_test_expected_summary.json → ...ic_csv_test_expected_detailed_report.json b/...st/generic_csv_test_expected_summary.json → ...ic_csv_test_expected_detailed_report.json
diff --git a/...chool_board_expected_extended_summary.csv → ...school_board_expected_detailed_report.csv b/...chool_board_expected_extended_summary.csv → ...school_board_expected_detailed_report.csv
diff --git a/...r_park_school_board_expected_summary.json → ...chool_board_expected_detailed_report.json b/...r_park_school_board_expected_summary.json → ...chool_board_expected_detailed_report.json
diff --git a/...ty_officers_expected_extended_summary.csv → ...nty_officers_expected_detailed_report.csv b/...ty_officers_expected_extended_summary.csv → ...nty_officers_expected_detailed_report.csv
diff --git a/...vis_county_officers_expected_summary.json → ...ty_officers_expected_detailed_report.json b/...vis_county_officers_expected_summary.json → ...ty_officers_expected_detailed_report.json
diff --git a/...eshold_test_expected_extended_summary.csv → ...reshold_test_expected_detailed_report.csv b/...eshold_test_expected_extended_summary.csv → ...reshold_test_expected_detailed_report.csv
diff --git a/...imum_threshold_test_expected_summary.json → ...eshold_test_expected_detailed_report.json b/...imum_threshold_test_expected_summary.json → ...eshold_test_expected_detailed_report.json
diff --git a/...t_threshold_expected_extended_summary.csv → ...at_threshold_expected_detailed_report.csv b/...t_threshold_expected_extended_summary.csv → ...at_threshold_expected_detailed_report.csv
diff --git a/...ulti_seat_threshold_expected_summary.json → ...t_threshold_expected_detailed_report.json b/...ulti_seat_threshold_expected_summary.json → ...t_threshold_expected_detailed_report.json
diff --git a/...xpected_pc1_precinct_extended_summary.csv → ...expected_pc1_precinct_detailed_report.csv b/...xpected_pc1_precinct_extended_summary.csv → ...expected_pc1_precinct_detailed_report.csv
diff --git a/...xpected_pc2_precinct_extended_summary.csv → ...expected_pc2_precinct_detailed_report.csv b/...xpected_pc2_precinct_extended_summary.csv → ...expected_pc2_precinct_detailed_report.csv
diff --git a/...eshold_expected_pc2_precinct_summary.json → ...xpected_pc2_precinct_detailed_report.json b/...eshold_expected_pc2_precinct_summary.json → ...xpected_pc2_precinct_detailed_report.json
diff --git a/...S_W-13_P-13_precinct_extended_summary.csv → ...IS_W-13_P-13_precinct_detailed_report.csv b/...S_W-13_P-13_precinct_extended_summary.csv → ...IS_W-13_P-13_precinct_detailed_report.csv
diff --git a/...NNEAPOLIS_W-13_P-13_precinct_summary.json → ...S_W-13_P-13_precinct_detailed_report.json b/...NNEAPOLIS_W-13_P-13_precinct_summary.json → ...S_W-13_P-13_precinct_detailed_report.json
diff --git a/...nct_example_expected_extended_summary.csv → ...inct_example_expected_detailed_report.csv b/...nct_example_expected_extended_summary.csv → ...inct_example_expected_detailed_report.csv
diff --git a/...ng_precinct_example_expected_summary.json → ...nct_example_expected_detailed_report.json b/...ng_precinct_example_expected_summary.json → ...nct_example_expected_detailed_report.json
diff --git a/...precinct_id_precinct_extended_summary.csv → ..._precinct_id_precinct_detailed_report.csv b/...precinct_id_precinct_extended_summary.csv → ..._precinct_id_precinct_detailed_report.csv
diff --git a/...missing_precinct_id_precinct_summary.json → ...precinct_id_precinct_detailed_report.json b/...missing_precinct_id_precinct_summary.json → ...precinct_id_precinct_detailed_report.json
diff --git a/..._candidates_expected_extended_summary.csv → ...n_candidates_expected_detailed_report.csv b/..._candidates_expected_extended_summary.csv → ...n_candidates_expected_detailed_report.csv
diff --git a/...ers_than_candidates_expected_summary.json → ..._candidates_expected_detailed_report.json b/...ers_than_candidates_expected_summary.json → ..._candidates_expected_detailed_report.json
diff --git a/...h_threshold_expected_extended_summary.csv → ...th_threshold_expected_detailed_report.csv b/...h_threshold_expected_extended_summary.csv → ...th_threshold_expected_detailed_report.csv
diff --git a/...s_up_with_threshold_expected_summary.json → ...h_threshold_expected_detailed_report.json b/...s_up_with_threshold_expected_summary.json → ...h_threshold_expected_detailed_report.json
diff --git a/...at_uwi_test_expected_extended_summary.csv → ...eat_uwi_test_expected_detailed_report.csv b/...at_uwi_test_expected_extended_summary.csv → ...eat_uwi_test_expected_detailed_report.csv
diff --git a/...multi_seat_uwi_test_expected_summary.json → ...at_uwi_test_expected_detailed_report.json b/...multi_seat_uwi_test_expected_summary.json → ...at_uwi_test_expected_detailed_report.json
diff --git a/...t_xml_cdf_2_expected_extended_summary.csv → ...st_xml_cdf_2_expected_detailed_report.csv b/...t_xml_cdf_2_expected_extended_summary.csv → ...st_xml_cdf_2_expected_detailed_report.csv
diff --git a/...df_2/nist_xml_cdf_2_expected_summary.json → ...t_xml_cdf_2_expected_detailed_report.json b/...df_2/nist_xml_cdf_2_expected_summary.json → ...t_xml_cdf_2_expected_detailed_report.json
diff --git a/...IS_W-1_P-02_precinct_extended_summary.csv → ...LIS_W-1_P-02_precinct_detailed_report.csv b/...IS_W-1_P-02_precinct_extended_summary.csv → ...LIS_W-1_P-02_precinct_detailed_report.csv
diff --git a/...INNEAPOLIS_W-1_P-02_precinct_summary.json → ...IS_W-1_P-02_precinct_detailed_report.json b/...INNEAPOLIS_W-1_P-02_precinct_summary.json → ...IS_W-1_P-02_precinct_detailed_report.json
diff --git a/...nct_example_expected_extended_summary.csv → ...inct_example_expected_detailed_report.csv b/...nct_example_expected_extended_summary.csv → ...inct_example_expected_detailed_report.csv
diff --git a/...le/precinct_example_expected_summary.json → ...nct_example_expected_detailed_report.json b/...le/precinct_example_expected_summary.json → ...nct_example_expected_detailed_report.json
diff --git a/...ith_batch_1_expected_extended_summary.csv → ...with_batch_1_expected_detailed_report.csv b/...ith_batch_1_expected_extended_summary.csv → ...with_batch_1_expected_detailed_report.csv
diff --git a/...ential_with_batch_1_expected_summary.json → ...ith_batch_1_expected_detailed_report.json b/...ential_with_batch_1_expected_summary.json → ...ith_batch_1_expected_detailed_report.json
diff --git a/...ith_batch_2_expected_extended_summary.csv → ...with_batch_2_expected_detailed_report.csv b/...ith_batch_2_expected_extended_summary.csv → ...with_batch_2_expected_detailed_report.csv
diff --git a/...ential_with_batch_2_expected_summary.json → ...ith_batch_2_expected_detailed_report.json b/...ential_with_batch_2_expected_summary.json → ...ith_batch_2_expected_detailed_report.json
diff --git a/...ith_batch_3_expected_extended_summary.csv → ...with_batch_3_expected_detailed_report.csv b/...ith_batch_3_expected_extended_summary.csv → ...with_batch_3_expected_detailed_report.csv
diff --git a/...ential_with_batch_3_expected_summary.json → ...ith_batch_3_expected_detailed_report.json b/...ential_with_batch_3_expected_summary.json → ...ith_batch_3_expected_detailed_report.json
diff --git a/...until_two_1_expected_extended_summary.csv → ..._until_two_1_expected_detailed_report.csv b/...until_two_1_expected_extended_summary.csv → ..._until_two_1_expected_detailed_report.csv
diff --git a/...ontinue_until_two_1_expected_summary.json → ...until_two_1_expected_detailed_report.json b/...ontinue_until_two_1_expected_summary.json → ...until_two_1_expected_detailed_report.json
diff --git a/...until_two_2_expected_extended_summary.csv → ..._until_two_2_expected_detailed_report.csv b/...until_two_2_expected_extended_summary.csv → ..._until_two_2_expected_detailed_report.csv
diff --git a/...ontinue_until_two_2_expected_summary.json → ...until_two_2_expected_detailed_report.json b/...ontinue_until_two_2_expected_summary.json → ...until_two_2_expected_detailed_report.json
diff --git a/...until_two_3_expected_extended_summary.csv → ..._until_two_3_expected_detailed_report.csv b/...until_two_3_expected_extended_summary.csv → ..._until_two_3_expected_detailed_report.csv
diff --git a/...ontinue_until_two_3_expected_summary.json → ...until_two_3_expected_detailed_report.json b/...ontinue_until_two_3_expected_summary.json → ...until_two_3_expected_detailed_report.json
diff --git a/...o_next_test_expected_extended_summary.csv → ...to_next_test_expected_detailed_report.csv b/...o_next_test_expected_extended_summary.csv → ...to_next_test_expected_detailed_report.csv
diff --git a/...t/skip_to_next_test_expected_summary.json → ...o_next_test_expected_detailed_report.json b/...t/skip_to_next_test_expected_summary.json → ...o_next_test_expected_detailed_report.json
diff --git a/..._early_test_expected_extended_summary.csv → ...n_early_test_expected_detailed_report.csv b/..._early_test_expected_extended_summary.csv → ...n_early_test_expected_detailed_report.csv
diff --git a/...bulation_early_test_expected_summary.json → ..._early_test_expected_detailed_report.json b/...bulation_early_test_expected_summary.json → ..._early_test_expected_detailed_report.json
diff --git a/...irst_choice_expected_extended_summary.csv → ...first_choice_expected_detailed_report.csv b/...irst_choice_expected_extended_summary.csv → ...first_choice_expected_detailed_report.csv
diff --git a/...kipped_first_choice_expected_summary.json → ...irst_choice_expected_detailed_report.json b/...kipped_first_choice_expected_summary.json → ...irst_choice_expected_detailed_report.json
diff --git a/...at_overvote_expected_extended_summary.csv → ..._at_overvote_expected_detailed_report.csv b/...at_overvote_expected_extended_summary.csv → ..._at_overvote_expected_detailed_report.csv
diff --git a/...exhaust_at_overvote_expected_summary.json → ...at_overvote_expected_detailed_report.json b/...exhaust_at_overvote_expected_summary.json → ...at_overvote_expected_detailed_report.json
diff --git a/...kip_to_next_expected_extended_summary.csv → ...skip_to_next_expected_detailed_report.csv b/...kip_to_next_expected_extended_summary.csv → ...skip_to_next_expected_detailed_report.csv
diff --git a/...ervote_skip_to_next_expected_summary.json → ...kip_to_next_expected_detailed_report.json b/...ervote_skip_to_next_expected_summary.json → ...kip_to_next_expected_detailed_report.json
diff --git a/...ice_exhaust_expected_extended_summary.csv → ...oice_exhaust_expected_detailed_report.csv b/...ice_exhaust_expected_extended_summary.csv → ...oice_exhaust_expected_detailed_report.csv
diff --git a/...pped_choice_exhaust_expected_summary.json → ...ice_exhaust_expected_detailed_report.json b/...pped_choice_exhaust_expected_summary.json → ...ice_exhaust_expected_detailed_report.json
diff --git a/...choice_next_expected_extended_summary.csv → ..._choice_next_expected_detailed_report.csv b/...choice_next_expected_extended_summary.csv → ..._choice_next_expected_detailed_report.csv
diff --git a/...skipped_choice_next_expected_summary.json → ...choice_next_expected_detailed_report.json b/...skipped_choice_next_expected_summary.json → ...choice_next_expected_detailed_report.json
diff --git a/...ice_exhaust_expected_extended_summary.csv → ...oice_exhaust_expected_detailed_report.csv b/...ice_exhaust_expected_extended_summary.csv → ...oice_exhaust_expected_detailed_report.csv
diff --git a/...pped_choice_exhaust_expected_summary.json → ...ice_exhaust_expected_detailed_report.json b/...pped_choice_exhaust_expected_summary.json → ...ice_exhaust_expected_detailed_report.json
diff --git a/...ate_exhaust_expected_extended_summary.csv → ...cate_exhaust_expected_detailed_report.csv b/...ate_exhaust_expected_extended_summary.csv → ...cate_exhaust_expected_detailed_report.csv
diff --git a/...6_duplicate_exhaust_expected_summary.json → ...ate_exhaust_expected_detailed_report.json b/...6_duplicate_exhaust_expected_summary.json → ...ate_exhaust_expected_detailed_report.json
diff --git a/...kip_to_next_expected_extended_summary.csv → ...skip_to_next_expected_detailed_report.csv b/...kip_to_next_expected_extended_summary.csv → ...skip_to_next_expected_detailed_report.csv
diff --git a/...licate_skip_to_next_expected_summary.json → ...kip_to_next_expected_detailed_report.json b/...licate_skip_to_next_expected_summary.json → ...kip_to_next_expected_detailed_report.json
diff --git a/...8_multi_cdf_expected_extended_summary.csv → ..._8_multi_cdf_expected_detailed_report.csv b/...8_multi_cdf_expected_extended_summary.csv → ..._8_multi_cdf_expected_detailed_report.csv
diff --git a/...est_set_8_multi_cdf_expected_summary.json → ...8_multi_cdf_expected_detailed_report.json b/...est_set_8_multi_cdf_expected_summary.json → ...8_multi_cdf_expected_detailed_report.json
diff --git a/...r_per_round_expected_extended_summary.csv → ...er_per_round_expected_detailed_report.csv b/...r_per_round_expected_extended_summary.csv → ...er_per_round_expected_detailed_report.csv
diff --git a/...ne_winner_per_round_expected_summary.json → ...r_per_round_expected_detailed_report.json b/...ne_winner_per_round_expected_summary.json → ...r_per_round_expected_detailed_report.json
diff --git a/...l_threshold_expected_extended_summary.csv → ...al_threshold_expected_detailed_report.csv b/...l_threshold_expected_extended_summary.csv → ...al_threshold_expected_detailed_report.csv
diff --git a/...ractional_threshold_expected_summary.json → ...l_threshold_expected_detailed_report.json b/...ractional_threshold_expected_summary.json → ...l_threshold_expected_detailed_report.json
diff --git a/...e_threshold_expected_extended_summary.csv → ...le_threshold_expected_detailed_report.csv b/...e_threshold_expected_extended_summary.csv → ...le_threshold_expected_detailed_report.csv
diff --git a/...ner_whole_threshold_expected_summary.json → ...e_threshold_expected_detailed_report.json b/...ner_whole_threshold_expected_summary.json → ...e_threshold_expected_detailed_report.json
diff --git a/...e_delimiter_expected_extended_summary.csv → ...te_delimiter_expected_detailed_report.csv b/...e_delimiter_expected_extended_summary.csv → ...te_delimiter_expected_detailed_report.csv
diff --git a/..._overvote_delimiter_expected_summary.json → ...e_delimiter_expected_detailed_report.json b/..._overvote_delimiter_expected_summary.json → ...e_delimiter_expected_detailed_report.json
diff --git a/...ed_write_in_expected_extended_summary.csv → ...red_write_in_expected_detailed_report.csv b/...ed_write_in_expected_extended_summary.csv → ...red_write_in_expected_detailed_report.csv
diff --git a/...undeclared_write_in_expected_summary.json → ...ed_write_in_expected_detailed_report.json b/...undeclared_write_in_expected_summary.json → ...ed_write_in_expected_detailed_report.json
diff --git a/...tation_test_expected_extended_summary.csv → ...utation_test_expected_detailed_report.csv b/...tation_test_expected_extended_summary.csv → ...utation_test_expected_detailed_report.csv
diff --git a/...te_permutation_test_expected_summary.json → ...tation_test_expected_detailed_report.json b/...te_permutation_test_expected_summary.json → ...tation_test_expected_detailed_report.json
diff --git a/...random_test_expected_extended_summary.csv → ..._random_test_expected_detailed_report.csv b/...random_test_expected_extended_summary.csv → ..._random_test_expected_detailed_report.csv
diff --git a/...ts_then_random_test_expected_summary.json → ...random_test_expected_detailed_report.json b/...ts_then_random_test_expected_summary.json → ...random_test_expected_detailed_report.json
diff --git a/...k_seed_test_expected_extended_summary.csv → ...ak_seed_test_expected_detailed_report.csv b/...k_seed_test_expected_extended_summary.csv → ...ak_seed_test_expected_detailed_report.csv
diff --git a/.../tiebreak_seed_test_expected_summary.json → ...k_seed_test_expected_detailed_report.json b/.../tiebreak_seed_test_expected_summary.json → ...k_seed_test_expected_detailed_report.json
diff --git a/...config_test_expected_extended_summary.csv → ..._config_test_expected_detailed_report.csv b/...config_test_expected_extended_summary.csv → ..._config_test_expected_detailed_report.csv
diff --git a/...tion_in_config_test_expected_summary.json → ...config_test_expected_detailed_report.json b/...tion_in_config_test_expected_summary.json → ...config_test_expected_detailed_report.json
diff --git a/...f_of_police_expected_extended_summary.csv → ...ef_of_police_expected_detailed_report.csv b/...f_of_police_expected_extended_summary.csv → ...ef_of_police_expected_detailed_report.csv
diff --git a/...ity_chief_of_police_expected_summary.json → ...f_of_police_expected_detailed_report.json b/...ity_chief_of_police_expected_summary.json → ...f_of_police_expected_detailed_report.json
diff --git a/...ity_coroner_expected_extended_summary.csv → ...city_coroner_expected_detailed_report.csv b/...ity_coroner_expected_extended_summary.csv → ...city_coroner_expected_detailed_report.csv
diff --git a/...ml_cdf_city_coroner_expected_summary.json → ...ity_coroner_expected_detailed_report.json b/...ml_cdf_city_coroner_expected_summary.json → ...ity_coroner_expected_detailed_report.json
diff --git a/...ncil_member_expected_extended_summary.csv → ...uncil_member_expected_detailed_report.csv b/...ncil_member_expected_extended_summary.csv → ...uncil_member_expected_detailed_report.csv
diff --git a/...city_council_member_expected_summary.json → ...ncil_member_expected_detailed_report.json b/...city_council_member_expected_summary.json → ...ncil_member_expected_detailed_report.json
diff --git a/..._city_mayor_expected_extended_summary.csv → ...f_city_mayor_expected_detailed_report.csv b/..._city_mayor_expected_extended_summary.csv → ...f_city_mayor_expected_detailed_report.csv
diff --git a/..._xml_cdf_city_mayor_expected_summary.json → ..._city_mayor_expected_detailed_report.json b/..._xml_cdf_city_mayor_expected_summary.json → ..._city_mayor_expected_detailed_report.json
diff --git a/...x_collector_expected_extended_summary.csv → ...ax_collector_expected_detailed_report.csv b/...x_collector_expected_extended_summary.csv → ...ax_collector_expected_detailed_report.csv
diff --git a/..._city_tax_collector_expected_summary.json → ...x_collector_expected_detailed_report.json b/..._city_tax_collector_expected_summary.json → ...x_collector_expected_detailed_report.json
diff --git a/...nty_coroner_expected_extended_summary.csv → ...unty_coroner_expected_detailed_report.csv b/...nty_coroner_expected_extended_summary.csv → ...unty_coroner_expected_detailed_report.csv
diff --git a/..._cdf_county_coroner_expected_summary.json → ...nty_coroner_expected_detailed_report.json b/..._cdf_county_coroner_expected_summary.json → ...nty_coroner_expected_detailed_report.json
diff --git a/...nty_sheriff_expected_extended_summary.csv → ...unty_sheriff_expected_detailed_report.csv b/...nty_sheriff_expected_extended_summary.csv → ...unty_sheriff_expected_detailed_report.csv
diff --git a/..._cdf_county_sheriff_expected_summary.json → ...nty_sheriff_expected_detailed_report.json b/..._cdf_county_sheriff_expected_summary.json → ...nty_sheriff_expected_detailed_report.json
diff --git a/...ot_win_test_expected_extended_summary.csv → ...not_win_test_expected_detailed_report.csv b/...ot_win_test_expected_extended_summary.csv → ...not_win_test_expected_detailed_report.csv
diff --git a/...uwi_cannot_win_test_expected_summary.json → ...ot_win_test_expected_detailed_report.json b/...uwi_cannot_win_test_expected_summary.json → ...ot_win_test_expected_detailed_report.json