From 5cbecfcc2584ac38c98844a946011dab236341f1 Mon Sep 17 00:00:00 2001 From: yisiox Date: Mon, 12 Feb 2024 15:19:31 +0800 Subject: [PATCH] Fix unit tests again --- src/main/java/earl/util/TaskList.java | 1 + src/main/java/earl/util/parsers/IntervalParser.java | 7 +++---- src/test/java/earl/logic/MarkHandlerTest.java | 9 +++++---- src/test/java/earl/util/UiTest.java | 13 +++++++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/earl/util/TaskList.java b/src/main/java/earl/util/TaskList.java index dd0cdd3f2c..7381aff538 100644 --- a/src/main/java/earl/util/TaskList.java +++ b/src/main/java/earl/util/TaskList.java @@ -41,6 +41,7 @@ public Task get(int i) { return tasks.get(i); } + /** Returns the added task. */ public Task add(Task task) { tasks.add(task); return task; diff --git a/src/main/java/earl/util/parsers/IntervalParser.java b/src/main/java/earl/util/parsers/IntervalParser.java index 3db75e9f8b..5a5485e9bb 100644 --- a/src/main/java/earl/util/parsers/IntervalParser.java +++ b/src/main/java/earl/util/parsers/IntervalParser.java @@ -38,11 +38,10 @@ public static Stream parse(String input) throws EarlException { return result.distinct().sorted(Collections.reverseOrder()); } catch (IndexOutOfBoundsException | NumberFormatException e) { throw new EarlException( - "Error, indices format invalid.\n" - + "\tExample format: 1 4-7 9-10"); + "Error, indices format invalid." + + " Example format: 1 4-7 9-10"); } catch (Exception e) { - throw new EarlException("Error, unknown argument format:" - + e.getMessage()); + throw new EarlException("Error, unknown argument format"); } } } diff --git a/src/test/java/earl/logic/MarkHandlerTest.java b/src/test/java/earl/logic/MarkHandlerTest.java index ab8b54c1ba..e862e949ef 100644 --- a/src/test/java/earl/logic/MarkHandlerTest.java +++ b/src/test/java/earl/logic/MarkHandlerTest.java @@ -28,8 +28,9 @@ void setUp() { void handle_normalCommand_success() throws Exception { Handler handler = HandlerType.mark.createHandler("1"); handler.handle(new TaskListStub(), new UiStub()); - assertEquals("Item(s) marked as done.\r\n" - + "1.[ ] TaskStub\r\n", + String newLine = System.lineSeparator(); + assertEquals("Item(s) marked as done." + newLine + + "1.[ ] TaskStub" + newLine, testingOut.toString()); } @@ -40,8 +41,8 @@ void handle_nonIntegerInput_exceptionThrown() { handler.handle(new TaskListStub(), new UiStub()); fail(); } catch (Exception e) { - assertEquals("Error, indices format invalid.\n" - + "\tExample format: 1 4-7 9-10", e.getMessage()); + assertEquals("Error, indices format invalid." + + " Example format: 1 4-7 9-10", e.getMessage()); } } diff --git a/src/test/java/earl/util/UiTest.java b/src/test/java/earl/util/UiTest.java index 6dd0afebcd..35eed7d319 100644 --- a/src/test/java/earl/util/UiTest.java +++ b/src/test/java/earl/util/UiTest.java @@ -25,8 +25,11 @@ void setUp() { void makeResponse_multipleLines_success() { Ui ui = new Ui(); ui.makeResponse("A", "B"); - String divider = " " + "_".repeat(60) + "\r\n"; - String expected = divider + " A\r\n B\r\n" + divider; + String newLine = System.lineSeparator(); + String padding = " ".repeat(4); + String divider = padding + "_".repeat(60) + newLine; + String expected = divider + padding + "A" + newLine + + padding + "B" + newLine + divider; assertEquals(expected, testingOut.toString()); } @@ -34,8 +37,10 @@ void makeResponse_multipleLines_success() { void getResponse_singleLine_success() { Ui ui = new Ui(); ui.makeResponse("A"); - String divider = " " + "_".repeat(60) + "\n"; - String expected = divider + " A\n" + divider; + String newLine = System.lineSeparator(); + String padding = " ".repeat(4); + String divider = padding + "_".repeat(60) + newLine; + String expected = divider + padding + "A" + newLine + divider; assertEquals(expected, ui.getResponse()); }