Migrate junit4 to junit5

Author: heowc

SpringBootAOP/src/main/java/com/example/java/component/SimpleAspect.java

@@ -10,15 +10,20 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 @Aspect
 @Component
 public class SimpleAspect {
 
 	private static final Logger logger = LoggerFactory.getLogger(SimpleAspect.class);
 
+	private static final AtomicInteger counter = new AtomicInteger();
+
 	@Before("execution(* com.example.java.service.*.*Aop(..))")
 	public void onBeforeHandler(JoinPoint joinPoint) {
 		logger.info("=============== onBeforeThing");
+		counter.incrementAndGet();
 	}
 
 	@After("execution(* com.example.java.service.*.*Aop(..))")
@@ -36,4 +41,8 @@ public void onAfterReturningHandler(JoinPoint joinPoint, Object str) {
 	public void onPointcut(JoinPoint joinPoint) {
 		logger.info("=============== onPointcut");
 	}
+
+	public static int count() {
+		return counter.get();
+	}
 }

SpringBootAOP/src/test/java/com/example/java/SpringBootAopApplicationTests.java

@@ -1,27 +1,25 @@
 package com.example.java;
 
+import com.example.java.component.SimpleAspect;
 import com.example.java.service.TestService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
+import static org.assertj.core.api.Assertions.assertThat;
+
 @SpringBootTest
-public class SpringBootAopApplicationTests {
+class SpringBootAopApplicationTests {
 
 	@Autowired
 	private TestService service;
 
 	@Test
-	public void test_aop() {
+	void test_aopAndNoAop() {
+		assertThat(SimpleAspect.count()).isEqualTo(0);
 		service.testAop();
-	}
-
-	@Test
-	public void test_noAop() {
+		assertThat(SimpleAspect.count()).isEqualTo(1);
 		service.test();
+		assertThat(SimpleAspect.count()).isEqualTo(1);
 	}
-
 }

SpringBootAsync/src/test/java/com/example/java/SpringBootAsyncApplicationTests.java

@@ -1,35 +1,32 @@
 package com.example.java;
 
 import com.example.java.service.BasicService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.StopWatch;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
-public class SpringBootAsyncApplicationTests {
+class SpringBootAsyncApplicationTests {
 
-	@Autowired
-	private BasicService service;
+    @Autowired
+    private BasicService service;
 
-	@Test
-	public void test_async() {
-		StopWatch stopWatch = new StopWatch();
-		stopWatch.start();
-		service.onAsync();
-		stopWatch.stop();
-		System.out.println(stopWatch.toString());
-	}
+    @Test
+    void test_async() {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        service.onAsync();
+        stopWatch.stop();
+        System.out.println(stopWatch);
+    }
 
-	@Test
-	public void test_sync() {
-		StopWatch stopWatch = new StopWatch();
-		stopWatch.start();
-		service.onSync();
-		stopWatch.stop();
-		System.out.println(stopWatch.toString());
-	}
+    @Test
+    void test_sync() {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        service.onSync();
+        stopWatch.stop();
+        System.out.println(stopWatch);
+    }
 }