Merge branch 'master' into study/junit5-intro

testing-modules/junit-5-basics/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
+            <artifactId>junit-platform-suite</artifactId>
             <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>

testing-modules/junit-5-basics/src/test/java/com/baeldung/GreetingsUnitTest.java

@@ -3,12 +3,9 @@ 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.Greetings;
 
-@RunWith(JUnitPlatform.class)
 public class GreetingsUnitTest {
 
     @Test

testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java

@@ -4,7 +4,6 @@ import org.junit.jupiter.api.*;
 
 import java.util.logging.Logger;
 
-//@RunWith(JUnitPlatform.class)
 class JUnit5NewFeaturesUnitTest {
 
     private static final Logger log = Logger.getLogger(JUnit5NewFeaturesUnitTest.class.getName());

testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleUnitTest.java

@@ -6,12 +6,9 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 @Tag("annotations")
 @Tag("junit5")
-@RunWith(JUnitPlatform.class)
 public class AnnotationTestExampleUnitTest {
     @Test
     public void shouldRaiseAnException() throws Exception {

testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssertionsExampleUnitTest.java

@@ -6,10 +6,7 @@ import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class AssertionsExampleUnitTest {
     @Test
     @Disabled

testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeAllAndAfterAllAnnotationsUnitTest.java

@@ -3,12 +3,9 @@ package com.baeldung.migration.junit5;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RunWith(JUnitPlatform.class)
 public class BeforeAllAndAfterAllAnnotationsUnitTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(BeforeAllAndAfterAllAnnotationsUnitTest.class);

testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeEachAndAfterEachAnnotationsUnitTest.java

@@ -9,12 +9,9 @@ import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RunWith(JUnitPlatform.class)
 public class BeforeEachAndAfterEachAnnotationsUnitTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(BeforeEachAndAfterEachAnnotationsUnitTest.class);

testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/RuleExampleUnitTest.java

@@ -1,14 +1,12 @@
 package com.baeldung.migration.junit5;
 
-import com.baeldung.migration.junit5.extensions.TraceUnitExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RunWith(JUnitPlatform.class)
+import com.baeldung.migration.junit5.extensions.TraceUnitExtension;
+
 @ExtendWith(TraceUnitExtension.class)
 public class RuleExampleUnitTest {
 

testing-modules/junit-5-basics/src/test/java/com/baeldung/suites/AllUnitTest.java

@@ -1,12 +1,13 @@
 package com.baeldung.suites;
 
-import org.junit.platform.runner.JUnitPlatform;
+import org.junit.platform.suite.api.ExcludePackages;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("com.baeldung")
-// @SelectClasses({AssertionTest.class, AssumptionTest.class, ExceptionTest.class})
+@ExcludePackages("com.baeldung.suites")
 public class AllUnitTest {
 
 }
+ 

testing-modules/junit-5-basics/src/test/java/com/baeldung/tags/EmployeeDAOTestSuite.java

@@ -1,11 +1,8 @@
 package com.baeldung.tags;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeTags;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 @SelectPackages("com.baeldung.tags")
 @IncludeTags("UnitTest")
 public class EmployeeDAOTestSuite {

testing-modules/junit-5/pom.xml

@@ -32,12 +32,6 @@
             <artifactId>junit-platform-engine</artifactId>
             <version>${junit-platform.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit-platform.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-console-standalone</artifactId>

testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java

@@ -3,14 +3,15 @@ package com.baeldung.junit5.mockito;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -25,7 +26,6 @@ import com.baeldung.junit5.mockito.service.Errors;
 import com.baeldung.junit5.mockito.service.UserService;
 
 @ExtendWith(MockitoExtension.class)
-@RunWith(JUnitPlatform.class)
 public class UserServiceUnitTest {
     
     UserService userService;

testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidatorUnitTest.java

@@ -8,10 +8,7 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 @DisplayName("Testing PersonValidator")
 public class PersonValidatorUnitTest {
 

testing-modules/junit5-migration/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
+            <artifactId>junit-platform-suite</artifactId>
             <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AnnotationTestExampleUnitTest.java

@@ -1,17 +1,14 @@
 package com.baeldung.junit5;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
-import java.time.Duration;
 
 @Tag("annotations")
 @Tag("junit5")
-@RunWith(JUnitPlatform.class)
 public class AnnotationTestExampleUnitTest {
     @Test
     public void shouldRaiseAnException() throws Exception {

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleExampleUnitTest.java

@@ -2,10 +2,7 @@ package com.baeldung.junit5;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 @ExtendWith(TraceUnitExtension.class)
 public class RuleExampleUnitTest {
 

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectClassesSuiteUnitTest.java

@@ -1,10 +1,9 @@
 package com.baeldung.junit5vstestng;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.SelectClasses;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectClasses({Class1UnitTest.class, Class2UnitTest.class})
 public class SelectClassesSuiteUnitTest {
 

testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java

@@ -1,10 +1,9 @@
 package com.baeldung.junit5vstestng;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages({ "com.baeldung.java.suite.childpackage1", "com.baeldung.java.suite.childpackage2" })
 public class SelectPackagesSuiteUnitTest {
 

testing-modules/testng-command-line/pom.xml

@@ -78,7 +78,6 @@
                 </pluginManagement>
             </build>
         </profile>
-
         <profile>
             <id>ExecuteTestSuite</id>
             <activation>
@@ -101,6 +100,7 @@
             </build>
         </profile>
     </profiles>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -112,4 +112,5 @@
         <maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>
     </properties>
-</project>
+
+</project>