Bug fixes and additional tests.

Author: grahamkirby

src/main/java/lap_race/Input.java

@@ -58,9 +58,32 @@ private void loadEntry(final Team[] entries, final List<String> lines, final int
         if (team_elements.length != results.number_of_legs + 3)
             throw new RuntimeException("illegal composition for team: " + team_elements[0]);
 
+        final int bib_number = Integer.parseInt(team_elements[0]);
+        final String team_name = team_elements[1];
+
+        if (entriesAlreadyContain(entries, bib_number))
+            throw new RuntimeException("duplicate team number: " + bib_number);
+
+        if (entriesAlreadyContain(entries, team_name))
+            throw new RuntimeException("duplicate team name: " + team_name);
+
         entries[entry_index] = new Team(team_elements);
     }
 
+    private boolean entriesAlreadyContain(final Team[] entries, final int bib_number) {
+
+        for (Team team : entries)
+            if (team != null && team.bib_number == bib_number) return true;
+        return false;
+    }
+
+    private boolean entriesAlreadyContain(final Team[] entries, final String team_name) {
+
+        for (Team team : entries)
+            if (team != null && team.name.equals(team_name)) return true;
+        return false;
+    }
+
     RawResult[] loadRawResults() throws IOException {
 
         final List<String> lines = Files.readAllLines(raw_results_path);

src/main/java/lap_race/OutputCSV.java

@@ -150,7 +150,7 @@ private static void printLegResult(final OutputStreamWriter writer, final LegRes
         if (!leg_result.DNF) {
             writer.append(leg_result.position_string).append(",");
             writer.append(leg_result.team.runners[leg_result.leg_number - 1]).append(",");
-            writer.append(format(leg_result.duration()));
+            writer.append(format(leg_result.duration())).append("\n");
         }
     }
 

src/main/java/lap_race/OutputHTML.java

@@ -81,7 +81,7 @@ private void printOverallResults(final OutputStreamWriter writer) throws IOExcep
             writer.append("""
                         <tr>
                             <td>""");
-            writer.append(String.valueOf(position++));
+            if (!result.dnf()) writer.append(String.valueOf(position++));
             writer.append("""
                             </td>
                             <td>""");
@@ -97,7 +97,7 @@ private void printOverallResults(final OutputStreamWriter writer) throws IOExcep
             writer.append("""
                             </td>
                             <td>""");
-            writer.append(format(result.duration()));
+            writer.append(result.dnf() ? DNF_STRING : format(result.duration()));
             writer.append("""
                             </td>
                         </tr>""");
@@ -222,8 +222,7 @@ private void printLegResultsHeader(final OutputStreamWriter writer, final int le
                 <thead>
                     <tr>
                         <th>Pos</th>
-                        <th>Runner
-            """);
+                        <th>Runner""");
 
         if (results.paired_legs[leg-1]) writer.append("s");
 

src/test/java/lap_race/devils_burdens/ResultsTest.java

@@ -290,13 +290,39 @@ public void unregisteredTeam() throws Exception {
         configureTest("unregistered_team");
 
         RuntimeException thrown = assertThrows(
-            RuntimeException.class,
-            () -> new Results(properties).processResults()
+                RuntimeException.class,
+                () -> new Results(properties).processResults()
         );
 
         assertEquals("unregistered team: 4", thrown.getMessage());
     }
 
+    @Test
+    public void duplicateTeamNumber() throws Exception {
+
+        configureTest("duplicate_team_number");
+
+        RuntimeException thrown = assertThrows(
+                RuntimeException.class,
+                () -> new Results(properties).processResults()
+        );
+
+        assertEquals("duplicate team number: 3", thrown.getMessage());
+    }
+
+    @Test
+    public void duplicateTeamName() throws Exception {
+
+        configureTest("duplicate_team_name");
+
+        RuntimeException thrown = assertThrows(
+                RuntimeException.class,
+                () -> new Results(properties).processResults()
+        );
+
+        assertEquals("duplicate team name: Team 2", thrown.getMessage());
+    }
+
     @Test
     public void extraResult() throws Exception {
 

src/test/resources/devils_burdens/duplicate_team_name/input/entries.txt

@@ -0,0 +1,5 @@
+1	Team 1	Women Senior	John Smith	Hailey Dickson:) & Alix Crawford	Rhys Müllar & Paige Thompson	Amé MacDonald
+2	Team 2	Open 50+	Bartosz Thomson	John Smith & Zuzanna Miller-Ford	Leo McKenzie & Henry Muir	Regan Millar
+3	Team 2	Open Senior	JackBruce	Martin King & Leland Donaldson	Neil MacDonald & Myles  Christie	Hubert Gray
+4	Team 4	Women 50+	Sofia O'Connor	Philip O’Donohue & Hasan Robertson	Lena K. Maclean & Isabel Ritchie	Martha Gibson
+5	Team 5	Open Senior	Clark O' Connor	Nina Joan Fiona Walker & Hope Christie	Cayla Duncan & Scott Kelly	Amelia Muir

src/test/resources/devils_burdens/duplicate_team_name/input/rawtimes.txt

@@ -0,0 +1 @@
+1	42:432	43:523	44:594	45:355	45:431	1:27:002	1:43:083	1:43:484	1:47:235	1:47:441	2:35:052	2:35:343	2:35:594	2:36:105	2:37:191	3:47:582	3:48:223	3:48:294	3:49:215	3:49:52

src/test/resources/devils_burdens/duplicate_team_name/race.config

@@ -0,0 +1,15 @@
+ENTRIES_FILENAME = entries.txt
+RAW_RESULTS_FILENAME = rawtimes.txt
+YEAR = 2020
+NUMBER_OF_LEGS = 4
+PAIRED_LEGS = 2,3
+RACE_NAME_FOR_RESULTS = Devil's Burdens
+RACE_NAME_FOR_FILENAMES = simple
+
+# Elapsed duration from start of leg 1 to mass start time for each leg.
+# 23:59:59 indicates no mass start.
+MASS_START_ELAPSED_TIMES =
+
+# Comma-separated sequence of bib-number/leg-number for all legs that have a time
+# recorded but the runners DNF'd the leg.
+DNF_LEGS =

src/test/resources/devils_burdens/duplicate_team_number/input/entries.txt

@@ -0,0 +1,6 @@
+1	Team 1	Women Senior	John Smith	Hailey Dickson:) & Alix Crawford	Rhys Müllar & Paige Thompson	Amé MacDonald
+2	Team 2	Open 50+	Bartosz Thomson	John Smith & Zuzanna Miller-Ford	Leo McKenzie & Henry Muir	Regan Millar
+3	Team 3	Open Senior	JackBruce	Martin King & Leland Donaldson	Neil MacDonald & Myles  Christie	Hubert Gray
+3	Team 3b	Open Senior	JackBruce	Martin King & Leland Donaldson	Neil MacDonald & Myles  Christie	Hubert Gray
+4	Team 4	Open Senior	JackBruce	Martin King & Leland Donaldson	Neil MacDonald & Myles  Christie	Hubert Gray
+5	Team 5	Open Senior	Clark O' Connor	Nina Joan Fiona Walker & Hope Christie	Cayla Duncan & Scott Kelly	Amelia Muir

src/test/resources/devils_burdens/duplicate_team_number/input/rawtimes.txt

@@ -0,0 +1 @@
+1	42:432	43:523	44:594	45:355	45:431	1:27:002	1:43:083	1:43:484	1:47:235	1:47:441	2:35:052	2:35:343	2:35:594	2:36:105	2:37:191	3:47:582	3:48:223	3:48:294	3:49:215	3:49:52

src/test/resources/devils_burdens/duplicate_team_number/race.config

@@ -0,0 +1,15 @@
+ENTRIES_FILENAME = entries.txt
+RAW_RESULTS_FILENAME = rawtimes.txt
+YEAR = 2020
+NUMBER_OF_LEGS = 4
+PAIRED_LEGS = 2,3
+RACE_NAME_FOR_RESULTS = Devil's Burdens
+RACE_NAME_FOR_FILENAMES = simple
+
+# Elapsed duration from start of leg 1 to mass start time for each leg.
+# 23:59:59 indicates no mass start.
+MASS_START_ELAPSED_TIMES =
+
+# Comma-separated sequence of bib-number/leg-number for all legs that have a time
+# recorded but the runners DNF'd the leg.
+DNF_LEGS =

src/test/resources/devils_burdens/html_output/expected/simple_detailed_2020.csv

@@ -3,4 +3,4 @@ Pos,No,Team,Category,Runners 1,Leg 1,Split 1,Runners 2,Leg 2,Split 2,Runners 3,L
 2,2,Team 2,Open 50+,Bartosz Thomson,00:43:52,00:43:52,John Smith & Zuzanna Miller-Ford,00:59:16,01:43:08,Leo McKenzie & Henry Muir,00:52:26,02:35:34,Regan Millar,01:12:48,03:48:22
 3,3,Team 3,Open Senior,JackBruce,00:44:59,00:44:59,Martin King & Leland Donaldson,00:58:49,01:43:48,Neil MacDonald & Myles  Christie,00:52:11,02:35:59,Hubert Gray,01:12:30,03:48:29
 4,4,Team 4,Women 50+,Sofia O'Connor,00:45:35,00:45:35,Philip O’Donohue & Hasan Robertson,01:01:48,01:47:23,Lena K. Maclean & Isabel Ritchie,00:48:47,02:36:10,Martha Gibson,01:13:11,03:49:21
-5,5,Team 5,Open Senior,Clark O' Connor,00:45:43,00:45:43,Nina Joan Fiona Walker & Hope Christie,01:02:01,01:47:44,Cayla Duncan & Scott Kelly,00:49:35,02:37:19,Amelia Muir,01:12:33,03:49:52
+,5,Team 5,Open Senior,Clark O' Connor,00:45:43,00:45:43,Nina Joan Fiona Walker & Hope Christie,01:02:01,01:47:44,Cayla Duncan & Scott Kelly,00:49:35,02:37:19,Amelia Muir,DNF,DNF

src/test/resources/devils_burdens/html_output/expected/simple_detailed_2020.html

@@ -93,7 +93,7 @@
             <td>03:49:21</td>
         </tr>
         <tr>
-            <td>5</td>
+            <td></td>
             <td>5</td>
             <td>Team 5</td>
             <td>Open Senior</td>
@@ -107,8 +107,8 @@
             <td>00:49:35</td>
             <td>02:37:19</td>
             <td>Amelia Muir</td>
-            <td>01:12:33</td>
-            <td>03:49:52</td>
+            <td>DNF</td>
+            <td>DNF</td>
         </tr>
     </tbody>
 </table>

src/test/resources/devils_burdens/html_output/expected/simple_leg_4_2020.csv

@@ -1,6 +1,5 @@
 Pos,Runner,Time
 1,Hubert Gray,01:12:30
-2,Amelia Muir,01:12:33
-3,Regan Millar,01:12:48
-4,Amé MacDonald,01:12:53
-5,Martha Gibson,01:13:11
+2,Regan Millar,01:12:48
+3,Amé MacDonald,01:12:53
+4,Martha Gibson,01:13:11

src/test/resources/devils_burdens/html_output/expected/simple_leg_4_2020.html

@@ -14,21 +14,16 @@
         </tr>
         <tr>
             <td>2</td>
-            <td>Amelia Muir</td>
-            <td>01:12:33</td>
-        </tr>
-        <tr>
-            <td>3</td>
             <td>Regan Millar</td>
             <td>01:12:48</td>
         </tr>
         <tr>
-            <td>4</td>
+            <td>3</td>
             <td>Amé MacDonald</td>
             <td>01:12:53</td>
         </tr>
         <tr>
-            <td>5</td>
+            <td>4</td>
             <td>Martha Gibson</td>
             <td>01:13:11</td>
         </tr>

src/test/resources/devils_burdens/html_output/expected/simple_overall_2020.csv

@@ -3,4 +3,4 @@ Pos,No,Team,Category,Total
 2,2,Team 2,Open 50+,03:48:22
 3,3,Team 3,Open Senior,03:48:29
 4,4,Team 4,Women 50+,03:49:21
-5,5,Team 5,Open Senior,03:49:52
+,5,Team 5,Open Senior,DNF

src/test/resources/devils_burdens/html_output/expected/simple_overall_2020.html

@@ -38,11 +38,11 @@
             <td>03:49:21</td>
         </tr>
         <tr>
-            <td>5</td>
+            <td></td>
             <td>5</td>
             <td>Team 5</td>
             <td>Open Senior</td>
-            <td>03:49:52</td>
+            <td>DNF</td>
         </tr>
     </tbody>
 </table>

src/test/resources/devils_burdens/html_output/expected/simple_prizes_2020.txt

@@ -12,7 +12,6 @@ Category: Open Senior
 
 1: Team 1 (Women Senior) 03:47:58
 2: Team 3 (Open Senior) 03:48:29
-3: Team 5 (Open Senior) 03:49:52
 
 
 Category: Women 40+

src/test/resources/devils_burdens/html_output/input/rawtimes.txt

@@ -1 +1,19 @@
-1	42:432	43:523	44:594	45:355	45:431	1:27:002	1:43:083	1:43:484	1:47:235	1:47:441	2:35:052	2:35:343	2:35:594	2:36:105	2:37:191	3:47:582	3:48:223	3:48:294	3:49:215	3:49:52
+1	42:43
+2	43:52
+3	44:59
+4	45:35
+5	45:43
+1	1:27:00
+2	1:43:08
+3	1:43:48
+4	1:47:23
+5	1:47:44
+1	2:35:05
+2	2:35:34
+3	2:35:59
+4	2:36:10
+5	2:37:19
+1	3:47:58
+2	3:48:22
+3	3:48:29
+4	3:49:21