From 1f6c74ecabdac1ccdd1032b6df115cce8e158f5d Mon Sep 17 00:00:00 2001
From: Azhwani <azh.abderrahim@gmail.com>
Date: Tue, 2 Nov 2021 20:25:06 +0100
Subject: [PATCH] conflits resolution

---
 testing-modules/junit-5/pom.xml               |  3 ++
 .../order/AlphanumericOrderUnitTest.java      | 14 ++++----
 .../junit5/order/DefaultOrderUnitTest.java    | 36 +++++++++++++++++++
 .../junit5/order/RandomOrderUnitTest.java     | 35 ++++++++++++++++++
 .../test/resources/junit-platform.properties  |  2 ++
 5 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java
 create mode 100644 testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java
 create mode 100644 testing-modules/junit-5/src/test/resources/junit-platform.properties

diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index 148abecb0f..9b2518d10b 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -137,7 +137,10 @@
     </build>
 
     <properties>
+        <junit.jupiter.version>5.8.1</junit.jupiter.version>
         <mockito.junit.jupiter.version>2.23.0</mockito.junit.jupiter.version>
+        <junit.platform.version>1.8.1</junit.platform.version>
+        <junit.vintage.version>5.8.1</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <powermock.version>2.0.0</powermock.version>
         <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
index d62ca0c666..873df30400 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/AlphanumericOrderUnitTest.java
@@ -3,29 +3,29 @@ package com.baeldung.junit5.order;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.MethodOrderer.Alphanumeric;
+import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-@TestMethodOrder(Alphanumeric.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
 public class AlphanumericOrderUnitTest {
     private static StringBuilder output = new StringBuilder("");
-    
+
     @Test
     public void myATest() {
         output.append("A");
     }
-    
+
     @Test
     public void myBTest() {
-        output.append("B");        
+        output.append("B");
     }
-    
+
     @Test
     public void myaTest() {
         output.append("a");
     }
- 
+
     @AfterAll
     public static void assertOutput() {
         assertEquals(output.toString(), "ABa");
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java
new file mode 100644
index 0000000000..65cee3e987
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/DefaultOrderUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.junit5.order;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class DefaultOrderUnitTest {
+
+    private static StringBuilder output = new StringBuilder("");
+
+    @Test
+    @DisplayName("Test A")
+    public void myATest() {
+        output.append("A");
+    }
+
+    @Test
+    @DisplayName("Test B")
+    public void myBTest() {
+        output.append("B");
+    }
+
+    @Test
+    @DisplayName("Test C")
+    public void myCTest() {
+        output.append("C");
+    }
+
+    @AfterAll
+    public static void assertOutput() {
+        assertEquals(output.toString(), "ABC");
+    }
+
+}
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java
new file mode 100644
index 0000000000..0f64f5bb31
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/RandomOrderUnitTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.junit5.order;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+@TestMethodOrder(MethodOrderer.Random.class)
+public class RandomOrderUnitTest {
+
+    private static StringBuilder output = new StringBuilder("");
+
+    @Test
+    public void myATest() {
+        output.append("A");
+    }
+
+    @Test
+    public void myBTest() {
+        output.append("B");
+    }
+
+    @Test
+    public void myCTest() {
+        output.append("C");
+    }
+
+    @AfterAll
+    public static void assertOutput() {
+        assertEquals(output.toString(), "ACB");
+    }
+
+}
diff --git a/testing-modules/junit-5/src/test/resources/junit-platform.properties b/testing-modules/junit-5/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..d25e866b43
--- /dev/null
+++ b/testing-modules/junit-5/src/test/resources/junit-platform.properties
@@ -0,0 +1,2 @@
+junit.jupiter.execution.order.random.seed=100
+junit.jupiter.testmethod.order.default = org.junit.jupiter.api.MethodOrderer$DisplayName
\ No newline at end of file