use String.join and System.lineSeparator

2 files changed, 12 insertions, 8 deletions

diff --git a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
index 71239d7..149f62c 100644
--- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
+++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
@@ -51,7 +51,7 @@ public class BanffMarathonRunner extends AddressBook
 
     for (BanffMarathonRunner runner : runners) {
       if (runner.time >= average) {
-        result += runner.toString() + "\r\n";
+        result += runner.toString() + System.lineSeparator();
       }
     }
     return result;
diff --git a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
index 96700aa..0fa8b9c 100644
--- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
+++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
@@ -53,13 +53,17 @@ public class BanffMarathonRunnerTest extends TestCase
 
   public void testGetAboveAverageRunners()
   {
-    String expected = "Elena 1\r\n" +
-      "Suzie 7\r\n" +
-      "Philip 9\r\n" +
-      "James 1\r\n" +
-      "Jane 1\r\n" +
-      "Emily 4\r\n" +
-      "Neda 3\r\n";
+    String expected = String.join(
+      System.lineSeparator(),
+      "Elena 1",
+      "Suzie 7",
+      "Philip 9",
+      "James 1",
+      "Jane 1",
+      "Emily 4",
+      "Neda 3",
+      ""
+    );
     assertEquals(expected, BanffMarathonRunner.getAboveAverageRunners(this.runners));
   }
 }