From cea3dac6ee95e772c48b95eb408ef79663edc2db Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:21:20 +0300 Subject: [PATCH 1/3] JUnit5 test classes and methods should have default package visibility --- .../order/AlphanumericOrderUnitTest.java | 11 +++++----- .../junit5/order/CustomOrderUnitTest.java | 17 ++++++++-------- .../junit5/order/DefaultOrderUnitTest.java | 6 +++--- .../junit5/order/OrderAnnotationUnitTest.java | 20 +++++++++---------- .../junit5/order/RandomOrderUnitTest.java | 6 +++--- 5 files changed, 31 insertions(+), 29 deletions(-) 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 873df30400..262166b1a1 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 @@ -1,28 +1,29 @@ 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; +import static org.junit.Assert.assertEquals; + @TestMethodOrder(MethodOrderer.MethodName.class) public class AlphanumericOrderUnitTest { + private static StringBuilder output = new StringBuilder(""); @Test - public void myATest() { + void myATest() { output.append("A"); } @Test - public void myBTest() { + void myBTest() { output.append("B"); } @Test - public void myaTest() { + void myaTest() { output.append("a"); } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index fa45921879..58e6e6304a 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -8,24 +8,25 @@ import org.junit.jupiter.api.TestMethodOrder; @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { + private static StringBuilder output = new StringBuilder(""); - + @Test - public void myATest() { + void myATest() { output.append("A"); } - + @Test - public void myBTest() { - output.append("B"); + void myBTest() { + output.append("B"); } - + @Test - public void myaTest() { + void myaTest() { output.append("a"); } - + @AfterAll public static void assertOutput() { assertEquals(output.toString(), "AaB"); 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 index 65cee3e987..adea7e8888 100644 --- 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 @@ -12,19 +12,19 @@ public class DefaultOrderUnitTest { @Test @DisplayName("Test A") - public void myATest() { + void myATest() { output.append("A"); } @Test @DisplayName("Test B") - public void myBTest() { + void myBTest() { output.append("B"); } @Test @DisplayName("Test C") - public void myCTest() { + void myCTest() { output.append("C"); } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index 3d931a4158..f73fcab132 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -11,25 +11,25 @@ import org.junit.jupiter.api.TestMethodOrder; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { private static StringBuilder output = new StringBuilder(""); - + @Test - @Order(1) - public void firstTest() { + @Order(1) + void firstTest() { output.append("a"); } - + @Test - @Order(2) - public void secondTest() { + @Order(2) + void secondTest() { output.append("b"); } - + @Test - @Order(3) - public void thirdTest() { + @Order(3) + void thirdTest() { 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 index 0f64f5bb31..b583cd8f63 100644 --- 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 @@ -13,17 +13,17 @@ public class RandomOrderUnitTest { private static StringBuilder output = new StringBuilder(""); @Test - public void myATest() { + void myATest() { output.append("A"); } @Test - public void myBTest() { + void myBTest() { output.append("B"); } @Test - public void myCTest() { + void myCTest() { output.append("C"); } From b14ffd302a01952940f3ae1ca1b26b652eb7dcca Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:23:11 +0300 Subject: [PATCH 2/3] Junit4 'assertEquals()' from 'Assert' should be replaced with JUnit5 call to method from 'org.junit.jupiter.api.Assertions' --- .../baeldung/junit5/order/AlphanumericOrderUnitTest.java | 4 ++-- .../com/baeldung/junit5/order/CustomOrderUnitTest.java | 4 ++-- .../com/baeldung/junit5/order/DefaultOrderUnitTest.java | 8 ++++---- .../baeldung/junit5/order/OrderAnnotationUnitTest.java | 9 +++------ .../com/baeldung/junit5/order/RandomOrderUnitTest.java | 8 ++++---- 5 files changed, 15 insertions(+), 18 deletions(-) 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 262166b1a1..7fc32c0cc0 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 @@ -5,12 +5,12 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @TestMethodOrder(MethodOrderer.MethodName.class) public class AlphanumericOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(""); @Test void myATest() { diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index 58e6e6304a..472c98e923 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -1,11 +1,11 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static org.junit.jupiter.api.Assertions.assertEquals; + @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { 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 index adea7e8888..ee1d86ee43 100644 --- 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 @@ -1,14 +1,14 @@ 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; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DefaultOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(); @Test @DisplayName("Test A") @@ -30,7 +30,7 @@ public class DefaultOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ABC"); + assertEquals("ABC", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index f73fcab132..72c8bcc2a9 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -1,12 +1,9 @@ package com.baeldung.junit5.order; -import static org.junit.Assert.assertEquals; - -import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; + +import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { 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 index b583cd8f63..6c7cf234c8 100644 --- 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 @@ -1,16 +1,16 @@ 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; +import static org.junit.jupiter.api.Assertions.assertEquals; + @TestMethodOrder(MethodOrderer.Random.class) public class RandomOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(); @Test void myATest() { @@ -29,7 +29,7 @@ public class RandomOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ACB"); + assertEquals("ACB", output.toString()); } } From 2842bfcf0c5cab3cab9f0bc02068fbfd14fcdaea Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:23:47 +0300 Subject: [PATCH 3/3] Swap these 2 arguments, so they are in the correct order: expected value, actual value --- .../com/baeldung/junit5/order/AlphanumericOrderUnitTest.java | 2 +- .../java/com/baeldung/junit5/order/CustomOrderUnitTest.java | 5 ++--- .../com/baeldung/junit5/order/OrderAnnotationUnitTest.java | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 7fc32c0cc0..3a873a6d29 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 @@ -29,6 +29,6 @@ public class AlphanumericOrderUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "ABa"); + assertEquals("ABa", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java index 472c98e923..299a3cad85 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/CustomOrderUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @TestMethodOrder(CustomOrder.class) public class CustomOrderUnitTest { - private static StringBuilder output = new StringBuilder(""); + private static final StringBuilder output = new StringBuilder(""); @Test void myATest() { @@ -26,9 +26,8 @@ public class CustomOrderUnitTest { output.append("a"); } - @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "AaB"); + assertEquals("AaB", output.toString()); } } diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java index 72c8bcc2a9..14cf6c552e 100644 --- a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/order/OrderAnnotationUnitTest.java @@ -7,7 +7,8 @@ import static org.junit.jupiter.api.Assertions.*; @TestMethodOrder(OrderAnnotation.class) public class OrderAnnotationUnitTest { - private static StringBuilder output = new StringBuilder(""); + + private static final StringBuilder output = new StringBuilder(); @Test @Order(1) @@ -29,6 +30,6 @@ public class OrderAnnotationUnitTest { @AfterAll public static void assertOutput() { - assertEquals(output.toString(), "abc"); + assertEquals("abc", output.toString()); } }