From d115f2571bde4e6dec290144151a136c18c2a81b Mon Sep 17 00:00:00 2001
From: John Thompson <john@springframework.guru>
Date: Thu, 11 Oct 2018 18:28:05 -0400
Subject: [PATCH 1/2] adding assertions demo

---
 .../controllers/IndexController.java          |  1 -
 .../controllers/IndexControllerTest.java      | 32 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java

diff --git a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
index 731a2119..154faf31 100644
--- a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
+++ b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
@@ -3,7 +3,6 @@
 public class IndexController {
 
     public String index(){
-
         return "index";
     }
 
diff --git a/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
new file mode 100644
index 00000000..759f3e3c
--- /dev/null
+++ b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
@@ -0,0 +1,32 @@
+package guru.springframework.sfgpetclinic.controllers;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class IndexControllerTest {
+
+    IndexController controller;
+
+    @BeforeEach
+    void setUp() {
+        controller = new IndexController();
+    }
+
+    @Test
+    void index() {
+        assertEquals("index", controller.index());
+        assertEquals("index", controller.index(), "Wrong View Returned");
+
+        assertEquals("index", controller.index(), () -> "Another Expensive Message " +
+                "Make me only if you have to");
+    }
+
+    @Test
+    void oupsHandler() {
+        assertTrue("notimplemented".equals(controller.oupsHandler()), () -> "This is some expensive " +
+                "Message to build" +
+                "for my test");
+    }
+}
\ No newline at end of file

From 5ae980f28b0a46ec39987326efa0cd53b1aac1f2 Mon Sep 17 00:00:00 2001
From: 81908 <e_tomohiro0325@yahoo.co.jp>
Date: Tue, 2 Feb 2021 05:11:12 +0900
Subject: [PATCH 2/2] new comment

---
 .../controllers/IndexController.java          |  2 +-
 .../controllers/IndexControllerTest.java      | 50 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
index 154faf31..daf734cd 100644
--- a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
+++ b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
@@ -7,6 +7,6 @@ public String index(){
     }
 
     public String oupsHandler(){
-        return "notimplemented";
+        return "notimplemented_new";
     }
 }
diff --git a/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
index 759f3e3c..b91ea22e 100644
--- a/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
+++ b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
@@ -1,32 +1,32 @@
 package guru.springframework.sfgpetclinic.controllers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class IndexControllerTest {
 
-    IndexController controller;
-
-    @BeforeEach
-    void setUp() {
-        controller = new IndexController();
-    }
-
-    @Test
-    void index() {
-        assertEquals("index", controller.index());
-        assertEquals("index", controller.index(), "Wrong View Returned");
-
-        assertEquals("index", controller.index(), () -> "Another Expensive Message " +
-                "Make me only if you have to");
-    }
-
-    @Test
-    void oupsHandler() {
-        assertTrue("notimplemented".equals(controller.oupsHandler()), () -> "This is some expensive " +
-                "Message to build" +
-                "for my test");
-    }
-}
\ No newline at end of file
+  IndexController controller;
+
+  // new_branch
+  @BeforeEach
+  void setUp() {
+    controller = new IndexController();
+  }
+
+  @Test
+  void index() {
+    assertEquals("index", controller.index());
+    assertEquals("index", controller.index(), "Wrong View Returned");
+
+    assertEquals("index", controller.index(),
+        () -> "Another Expensive Message " + "Make me only if you have to");
+  }
+
+  @Test
+  void oupsHandler() {
+    assertTrue("notimplemented".equals(controller.oupsHandler()),
+        () -> "This is some expensive " + "Message to build" + "for my test");
+  }
+}