From 7769cde1c624a870e67fc619d1f3ba6f430bb010 Mon Sep 17 00:00:00 2001
From: Marcos <marcoslg@gmail.com>
Date: Wed, 1 Nov 2017 15:18:13 +0100
Subject: [PATCH 1/4] @RunWith in JUnit5

---
 .../baeldung/junit5/mockito/Greetings.java    |  9 +++++++++
 .../test/java/com/baeldung/GreetingsTest.java | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java
 create mode 100644 junit5/src/test/java/com/baeldung/GreetingsTest.java

diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java b/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java
new file mode 100644
index 0000000000..5391cbbc00
--- /dev/null
+++ b/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java
@@ -0,0 +1,9 @@
+package com.baeldung.junit5.mockito;
+
+public class Greetings {
+
+    public static String sayHello() {
+        return "Hello";
+    }
+
+}
diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/junit5/src/test/java/com/baeldung/GreetingsTest.java
new file mode 100644
index 0000000000..820bdf1e15
--- /dev/null
+++ b/junit5/src/test/java/com/baeldung/GreetingsTest.java
@@ -0,0 +1,19 @@
+package com.baeldung;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+import com.baeldung.junit5.mockito.Greetings;
+
+@RunWith(JUnitPlatform.class)
+public class GreetingsTest {
+
+    @Test
+    void whenCallingSayHello_thenReturnHello() {
+        assertTrue("Hello".equals(Greetings.sayHello()));
+    }
+
+}

From a77a10a42a7cff7e8d3a56157a58b3032bd0a3cb Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Thu, 2 Nov 2017 11:59:23 +0100
Subject: [PATCH 2/4] Greetings class moved to com.baeldung.junit5 package

---
 .../main/java/com/baeldung/junit5/{mockito => }/Greetings.java  | 2 +-
 junit5/src/test/java/com/baeldung/GreetingsTest.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename junit5/src/main/java/com/baeldung/junit5/{mockito => }/Greetings.java (72%)

diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java b/junit5/src/main/java/com/baeldung/junit5/Greetings.java
similarity index 72%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java
rename to junit5/src/main/java/com/baeldung/junit5/Greetings.java
index 5391cbbc00..f43269f646 100644
--- a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java
+++ b/junit5/src/main/java/com/baeldung/junit5/Greetings.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit5.mockito;
+package com.baeldung.junit5;
 
 public class Greetings {
 
diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/junit5/src/test/java/com/baeldung/GreetingsTest.java
index 820bdf1e15..e894d5857c 100644
--- a/junit5/src/test/java/com/baeldung/GreetingsTest.java
+++ b/junit5/src/test/java/com/baeldung/GreetingsTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 
-import com.baeldung.junit5.mockito.Greetings;
+import com.baeldung.junit5.Greetings;
 
 @RunWith(JUnitPlatform.class)
 public class GreetingsTest {

From a3e241236b7f1f78c4c6b42509ec9da3b75f5116 Mon Sep 17 00:00:00 2001
From: Marcos <marcoslg@gmail.com>
Date: Sat, 4 Nov 2017 13:15:54 +0100
Subject: [PATCH 3/4] spring tests with JUnit 5 and ExtendWith

---
 junit5/pom.xml                                | 12 +++++++++++
 .../junit5/spring/GreetingsSpringTest.java    | 21 +++++++++++++++++++
 .../spring/SpringTestConfiguration.java       |  8 +++++++
 3 files changed, 41 insertions(+)
 create mode 100644 junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
 create mode 100644 junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java

diff --git a/junit5/pom.xml b/junit5/pom.xml
index b820d7b7bc..b8a7622b3d 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -29,6 +29,7 @@
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <junit4.version>4.12</junit4.version>
+        <spring.version>5.0.1.RELEASE</spring.version>
     </properties>
 
     <build>
@@ -111,6 +112,17 @@
             <version>${junit4.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
         
     </dependencies>
   
diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
new file mode 100644
index 0000000000..d0045f0e5b
--- /dev/null
+++ b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.junit5.spring;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.baeldung.junit5.mockito.Greetings;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { SpringTestConfiguration.class })
+public class GreetingsSpringTest {
+
+    @Test
+    void whenCallingSayHello_thenReturnHello() {
+        assertTrue("Hello".equals(Greetings.sayHello()));
+    }
+
+}
diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java b/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
new file mode 100644
index 0000000000..7651b2bd41
--- /dev/null
+++ b/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
@@ -0,0 +1,8 @@
+package com.baeldung.junit5.spring;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SpringTestConfiguration {
+
+}

From efe0655cde1cb3d11602722df5753150d5e3594f Mon Sep 17 00:00:00 2001
From: Marcos <marcoslg@gmail.com>
Date: Sat, 4 Nov 2017 13:40:08 +0100
Subject: [PATCH 4/4] organize imports

---
 .../java/com/baeldung/junit5/spring/GreetingsSpringTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
index d0045f0e5b..e7a8a1c1e7 100644
--- a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
+++ b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import com.baeldung.junit5.mockito.Greetings;
+import com.baeldung.junit5.Greetings;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = { SpringTestConfiguration.class })