Merge branch 'master' into branch-zongyao-exceptionhandling

yeozongyao · Mar 19, 2024 · 5099f38 · 5099f38
2 parents 0306eda + 8080b31
commit 5099f38
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/test/java/seedu/bookbuddy/BookBuddyTest.java b/src/test/java/seedu/bookbuddy/BookBuddyTest.java
@@ -30,15 +30,24 @@ public void sampleTest() {
     @Test
     public void testPrintWelcomeMessage() {
         BookBuddy.printWelcomeMessage();
-        String expectedOutput = "Hello! We are BookBuddy!\nHow can I help you today?\n";
-        assertEquals(expectedOutput, outContent.toString());
+        String actualOutput = outContent.toString();
+
+        // Normalize line endings to \n in both expected and actual output
+        String normalizedExpectedOutput = "Hello! We are BookBuddy!\nHow can I help you today?\n".replace("\r\n", "\n");
+        String normalizedActualOutput = actualOutput.replace("\r\n", "\n");
+
+        // Assert that the normalized outputs are equal
+        assertEquals(normalizedExpectedOutput, normalizedActualOutput);
     }
 
+
+
+
     @Test
     public void testPrintExitMessage() {
         BookBuddy.printExitMessage();
         String expectedOutput = "Thank you for using BookBuddy! Hope to see you again!\n";
-        assertEquals(expectedOutput, outContent.toString());
+        assertEquals(expectedOutput.trim(), outContent.toString().trim());
     }
 
-}
+}
diff --git a/src/test/java/seedu/bookbuddy/BookListTest.java b/src/test/java/seedu/bookbuddy/BookListTest.java
@@ -5,7 +5,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 
 class BookListTest {
@@ -34,7 +36,8 @@ void printAllBooks() {
         testBookList.printAllBooks();
 
         String expectedOutput = "All books:\n1. [U] Harry Potter\n";
-        assertEquals(expectedOutput, outContent.toString());
+        String normalizedActualOutput = outContent.toString().replace("\r\n", "\n");
+        assertEquals(expectedOutput.trim(), normalizedActualOutput.trim());
 
         System.setOut(System.out);
     }

diff --git a/src/test/java/seedu/bookbuddy/ParserTest.java b/src/test/java/seedu/bookbuddy/ParserTest.java
@@ -5,7 +5,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class ParserTest {
     @Test