summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormokha <mokha@cisco.com>2019-05-03 12:54:07 -0600
committermokha <mokha@cisco.com>2019-05-03 12:54:07 -0600
commitd43a58854a378967ad417a69bfa1184415e2a083 (patch)
tree28a55315f828199016920a8c38fcaa858668ff32
parent704e7db41183753c55a2fbff47c26129fa78fbe9 (diff)
use an ArrayList<T> and String.join instead of concatenating strings
-rw-r--r--assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java16
-rw-r--r--assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java3
2 files changed, 9 insertions, 10 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 149f62c..cd8aeb3 100644
--- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
+++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
@@ -2,6 +2,7 @@ package ca.mokhan.assignment1;
import java.util.Arrays;
import java.util.Objects;
+import java.util.ArrayList;
public class BanffMarathonRunner extends AddressBook
{
@@ -47,13 +48,12 @@ public class BanffMarathonRunner extends AddressBook
public static String getAboveAverageRunners(BanffMarathonRunner[] runners)
{
int average = getAverageTime(runners);
- String result = "";
-
- for (BanffMarathonRunner runner : runners) {
- if (runner.time >= average) {
- result += runner.toString() + System.lineSeparator();
- }
- }
- return result;
+ ArrayList<String> winners = new ArrayList<String>();
+
+ for (BanffMarathonRunner runner : runners)
+ if (runner.time >= average)
+ winners.add(runner.toString());
+
+ return String.join(System.lineSeparator(), winners);
}
}
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 0fa8b9c..3f49021 100644
--- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
+++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
@@ -61,8 +61,7 @@ public class BanffMarathonRunnerTest extends TestCase
"James 1",
"Jane 1",
"Emily 4",
- "Neda 3",
- ""
+ "Neda 3"
);
assertEquals(expected, BanffMarathonRunner.getAboveAverageRunners(this.runners));
}