Tests consider whitespace when checking expected output files.

grahamkirby · Dec 15, 2024 · 4f134f4 · 4f134f4
1 parent 8e21402
commit 4f134f4
Show file tree

Hide file tree

Showing 656 changed files with 123,556 additions and 71,199 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # _race-timing_ is a Java application for calculating race results
 
-[![Build and test](https://github.com/grahamkirby/race-timing/actions/workflows/maven-linux.yml/badge.svg)](https://github.com/grahamkirby/race-timing/actions/workflows/maven.yml)
+[![Build and test](https://github.com/grahamkirby/race-timing/actions/workflows/maven-linux.yml/badge.svg)](https://github.com/grahamkirby/race-timing/actions/workflows/maven-linux.yml)
+[![Build and test](https://github.com/grahamkirby/race-timing/actions/workflows/maven-windows.yml/badge.svg)](https://github.com/grahamkirby/race-timing/actions/workflows/maven-windows.yml)
 
 This software was originally written to process results for amateur athletics races organised by [Fife Athletic Club](//fifeac.org),
 although it would probably work for other races. Reports of success or otherwise would be welcome, by email to the

diff --git a/...ace/fife_ac_grand_prix/GrandPrixRace.java → ...series_race/grand_prix/GrandPrixRace.java b/...ace/fife_ac_grand_prix/GrandPrixRace.java → ...series_race/grand_prix/GrandPrixRace.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.RaceInput;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...ac_grand_prix/GrandPrixRaceOutputCSV.java → ...ce/grand_prix/GrandPrixRaceOutputCSV.java b/...ac_grand_prix/GrandPrixRaceOutputCSV.java → ...ce/grand_prix/GrandPrixRaceOutputCSV.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/...c_grand_prix/GrandPrixRaceOutputHTML.java → ...e/grand_prix/GrandPrixRaceOutputHTML.java b/...c_grand_prix/GrandPrixRaceOutputHTML.java → ...e/grand_prix/GrandPrixRaceOutputHTML.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...ac_grand_prix/GrandPrixRaceOutputPDF.java → ...ce/grand_prix/GrandPrixRaceOutputPDF.java b/...ac_grand_prix/GrandPrixRaceOutputPDF.java → ...ce/grand_prix/GrandPrixRaceOutputPDF.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.RaceResult;
 import org.grahamkirby.race_timing.common.output.RaceOutputPDF;

diff --git a/...c_grand_prix/GrandPrixRaceOutputText.java → ...e/grand_prix/GrandPrixRaceOutputText.java b/...c_grand_prix/GrandPrixRaceOutputText.java → ...e/grand_prix/GrandPrixRaceOutputText.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...fe_ac_grand_prix/GrandPrixRaceResult.java → ..._race/grand_prix/GrandPrixRaceResult.java b/...fe_ac_grand_prix/GrandPrixRaceResult.java → ..._race/grand_prix/GrandPrixRaceResult.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/...race/fife_ac_grand_prix/RaceCategory.java → .../series_race/grand_prix/RaceCategory.java b/...race/fife_ac_grand_prix/RaceCategory.java → .../series_race/grand_prix/RaceCategory.java
@@ -1,4 +1,4 @@
-package org.grahamkirby.race_timing.series_race.fife_ac_grand_prix;
+package org.grahamkirby.race_timing.series_race.grand_prix;
 
 import java.util.List;
 

diff --git a/...ies_race/fife_ac_midweek/MidweekRace.java → ...ming/series_race/midweek/MidweekRace.java b/...ies_race/fife_ac_midweek/MidweekRace.java → ...ming/series_race/midweek/MidweekRace.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.RaceInput;

diff --git a/...fife_ac_midweek/MidweekRaceOutputCSV.java → ...es_race/midweek/MidweekRaceOutputCSV.java b/...fife_ac_midweek/MidweekRaceOutputCSV.java → ...es_race/midweek/MidweekRaceOutputCSV.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/...ife_ac_midweek/MidweekRaceOutputHTML.java → ...s_race/midweek/MidweekRaceOutputHTML.java b/...ife_ac_midweek/MidweekRaceOutputHTML.java → ...s_race/midweek/MidweekRaceOutputHTML.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...fife_ac_midweek/MidweekRaceOutputPDF.java → ...es_race/midweek/MidweekRaceOutputPDF.java b/...fife_ac_midweek/MidweekRaceOutputPDF.java → ...es_race/midweek/MidweekRaceOutputPDF.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.RaceResult;
 import org.grahamkirby.race_timing.common.output.RaceOutputPDF;

diff --git a/...ife_ac_midweek/MidweekRaceOutputText.java → ...s_race/midweek/MidweekRaceOutputText.java b/...ife_ac_midweek/MidweekRaceOutputText.java → ...s_race/midweek/MidweekRaceOutputText.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...ce/fife_ac_midweek/MidweekRaceResult.java → ...eries_race/midweek/MidweekRaceResult.java b/...ce/fife_ac_midweek/MidweekRaceResult.java → ...eries_race/midweek/MidweekRaceResult.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_midweek;
+package org.grahamkirby.race_timing.series_race.midweek;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/...ng/series_race/fife_ac_tour/TourRace.java → ...ace_timing/series_race/tour/TourRace.java b/...ng/series_race/fife_ac_tour/TourRace.java → ...ace_timing/series_race/tour/TourRace.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.RaceInput;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...ries_race/fife_ac_tour/TourRaceInput.java → ...iming/series_race/tour/TourRaceInput.java b/...ries_race/fife_ac_tour/TourRaceInput.java → ...iming/series_race/tour/TourRaceInput.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.Normalisation;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/..._race/fife_ac_tour/TourRaceOutputCSV.java → ...g/series_race/tour/TourRaceOutputCSV.java b/..._race/fife_ac_tour/TourRaceOutputCSV.java → ...g/series_race/tour/TourRaceOutputCSV.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...race/fife_ac_tour/TourRaceOutputHTML.java → .../series_race/tour/TourRaceOutputHTML.java b/...race/fife_ac_tour/TourRaceOutputHTML.java → .../series_race/tour/TourRaceOutputHTML.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.CompletionStatus;
 import org.grahamkirby.race_timing.common.Race;

diff --git a/..._race/fife_ac_tour/TourRaceOutputPDF.java → ...g/series_race/tour/TourRaceOutputPDF.java b/..._race/fife_ac_tour/TourRaceOutputPDF.java → ...g/series_race/tour/TourRaceOutputPDF.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.RaceResult;
 import org.grahamkirby.race_timing.common.output.RaceOutputPDF;

diff --git a/...race/fife_ac_tour/TourRaceOutputText.java → .../series_race/tour/TourRaceOutputText.java b/...race/fife_ac_tour/TourRaceOutputText.java → .../series_race/tour/TourRaceOutputText.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.Race;
 import org.grahamkirby.race_timing.common.RaceResult;

diff --git a/...ies_race/fife_ac_tour/TourRaceResult.java → ...ming/series_race/tour/TourRaceResult.java b/...ies_race/fife_ac_tour/TourRaceResult.java → ...ming/series_race/tour/TourRaceResult.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along with race-timing. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package org.grahamkirby.race_timing.series_race.fife_ac_tour;
+package org.grahamkirby.race_timing.series_race.tour;
 
 import org.grahamkirby.race_timing.common.RaceResult;
 import org.grahamkirby.race_timing.common.Runner;

diff --git a/src/test/java/org/grahamkirby/race_timing/MidweekTest.java b/src/test/java/org/grahamkirby/race_timing/MidweekTest.java
@@ -18,7 +18,7 @@
 
 import org.grahamkirby.race_timing.common.Race;
 import org.junit.jupiter.api.Test;
-import org.grahamkirby.race_timing.series_race.fife_ac_midweek.MidweekRace;
+import org.grahamkirby.race_timing.series_race.midweek.MidweekRace;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/src/test/java/org/grahamkirby/race_timing/MinitourTest.java b/src/test/java/org/grahamkirby/race_timing/MinitourTest.java
@@ -17,7 +17,7 @@
 package org.grahamkirby.race_timing;
 
 import org.grahamkirby.race_timing.common.Race;
-import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace;
+import org.grahamkirby.race_timing.series_race.tour.TourRace;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/src/test/java/org/grahamkirby/race_timing/RaceTest.java b/src/test/java/org/grahamkirby/race_timing/RaceTest.java
@@ -209,8 +209,10 @@ private static List<String> getDirectoryEntries(final Path directory) throws IOE
 
     private static void assertThatFilesHaveSameContentIgnoringWhitespace(final Path path1, final Path path2) throws IOException {
 
-        final String file_content1 = removeWhiteSpace(getFileContent(path1));
-        final String file_content2 = removeWhiteSpace(getFileContent(path2));
+//        final String file_content1 = removeWhiteSpace(getFileContent(path1));
+//        final String file_content2 = removeWhiteSpace(getFileContent(path2));
+        final String file_content1 = (getFileContent(path1));
+        final String file_content2 = (getFileContent(path2));
 
         if (!file_content1.equals(file_content2))
             fail(STR."Files differ: \{path1}, \{path2}");

diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesGrandPrixTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesGrandPrixTest.java
@@ -18,7 +18,7 @@
 
 import org.grahamkirby.race_timing.RaceTest;
 import org.grahamkirby.race_timing.common.Race;
-import org.grahamkirby.race_timing.series_race.fife_ac_grand_prix.GrandPrixRace;
+import org.grahamkirby.race_timing.series_race.grand_prix.GrandPrixRace;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMidweekTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMidweekTest.java
@@ -18,7 +18,7 @@
 
 import org.grahamkirby.race_timing.RaceTest;
 import org.grahamkirby.race_timing.common.Race;
-import org.grahamkirby.race_timing.series_race.fife_ac_midweek.MidweekRace;
+import org.grahamkirby.race_timing.series_race.midweek.MidweekRace;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java
@@ -18,7 +18,7 @@
 
 import org.grahamkirby.race_timing.RaceTest;
 import org.grahamkirby.race_timing.common.Race;
-import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace;
+import org.grahamkirby.race_timing.series_race.tour.TourRace;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesTourTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesTourTest.java
@@ -18,7 +18,7 @@
 
 import org.grahamkirby.race_timing.RaceTest;
 import org.grahamkirby.race_timing.common.Race;
-import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace;
+import org.grahamkirby.race_timing.series_race.tour.TourRace;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;