Skip to content

Commit

Permalink
Fix unit tests again
Browse files Browse the repository at this point in the history
  • Loading branch information
yisiox committed Feb 12, 2024
1 parent 8c55e57 commit 5cbecfc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
1 change: 1 addition & 0 deletions src/main/java/earl/util/TaskList.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/earl/util/parsers/IntervalParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ public static Stream<Integer> 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");
}
}
}
9 changes: 5 additions & 4 deletions src/test/java/earl/logic/MarkHandlerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -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());
}
}

Expand Down
13 changes: 9 additions & 4 deletions src/test/java/earl/util/UiTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,22 @@ 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());
}

@Test
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());
}

Expand Down

0 comments on commit 5cbecfc

Please sign in to comment.