From 73e2047689b2d4ad14e87ea60fda6680e8269b78 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:50:30 +0300 Subject: [PATCH 1/6] Use the default package visibility and optimize imports --- .../com/baeldung/JUnit5NewFeaturesUnitTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java index 311c62f425..9b67426dfa 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java @@ -1,17 +1,11 @@ package com.baeldung; +import org.junit.jupiter.api.*; + import java.util.logging.Logger; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - //@RunWith(JUnitPlatform.class) -public class JUnit5NewFeaturesUnitTest { +class JUnit5NewFeaturesUnitTest { private static final Logger log = Logger.getLogger(JUnit5NewFeaturesUnitTest.class.getName()); @@ -29,7 +23,6 @@ public class JUnit5NewFeaturesUnitTest { @Test void testSingleSuccessTest() { log.info("Success"); - } @Test From d722c0d1d17eaa780333d3a53ec0036396719acc Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:57:15 +0300 Subject: [PATCH 2/6] Reformat Put each assertion on separate line to improve readability Explain why test is marked @Disabled --- .../test/java/com/baeldung/FirstUnitTest.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java index c47a70e52f..a5304d3402 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java @@ -1,12 +1,12 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; class FirstUnitTest { @@ -14,20 +14,24 @@ class FirstUnitTest { void lambdaExpressions() { List numbers = Arrays.asList(1, 2, 3); assertTrue(numbers.stream() - .mapToInt(i -> i) - .sum() > 5, "Sum should be greater than 5"); + .mapToInt(Integer::intValue) + .sum() > 5, "Sum should be greater than 5"); } @Disabled("test to show MultipleFailuresError") @Test void groupAssertions() { - int[] numbers = { 0, 1, 2, 3, 4 }; - assertAll("numbers", () -> assertEquals(numbers[0], 1), () -> assertEquals(numbers[3], 3), () -> assertEquals(numbers[4], 1)); + int[] numbers = {0, 1, 2, 3, 4}; + assertAll("numbers", + () -> assertEquals(numbers[0], 1), + () -> assertEquals(numbers[3], 3), + () -> assertEquals(numbers[4], 1) + ); } @Test - @Disabled + @Disabled("Disabled test example") void disabledTest() { - assertTrue(false); + fail(); } } From efaf789e71e2083bfdb9b0467536569da425ac86 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 13:58:33 +0300 Subject: [PATCH 3/6] JUnit5 test classes and methods should have default package visibility --- .../java/com/baeldung/ExceptionUnitTest.java | 12 ++++++------ .../src/test/java/com/baeldung/LiveTest.java | 18 +++++++++--------- .../migration/junit5/AssumptionUnitTest.java | 16 +++++++--------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 440c3e40ab..7b7c11ccad 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -1,16 +1,16 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -public class ExceptionUnitTest { +class ExceptionUnitTest { @Test void shouldThrowException() { @@ -29,7 +29,7 @@ public class ExceptionUnitTest { } @Test - public void whenModifyMapDuringIteration_thenThrowExecption() { + void whenModifyMapDuringIteration_thenThrowExecption() { Map hashmap = new HashMap<>(); hashmap.put(1, "One"); hashmap.put(2, "Two"); diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java index c23eeb5afa..524ea58328 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java @@ -1,28 +1,28 @@ package com.baeldung; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class LiveTest { +class LiveTest { private List in = new ArrayList<>(Arrays.asList("Hello", "Yes", "No")); private List out = new ArrayList<>(Arrays.asList("Cześć", "Tak", "Nie")); @TestFactory - public Stream translateDynamicTestsFromStream() { + Stream translateDynamicTestsFromStream() { return in.stream() - .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> { - int id = in.indexOf(word); - assertEquals(out.get(id), translate(word)); - })); + .map(word -> DynamicTest.dynamicTest("Test translate " + word, () -> { + int id = in.indexOf(word); + assertEquals(out.get(id), translate(word)); + })); } private String translate(String word) { diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java index 80201a3f44..c1eba0d557 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java @@ -1,28 +1,26 @@ package com.baeldung.migration.junit5; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Assumptions.assumeTrue; -import static org.junit.jupiter.api.Assumptions.assumingThat; - import org.junit.jupiter.api.Test; -public class AssumptionUnitTest { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.*; + +class AssumptionUnitTest { @Test - public void trueAssumption() { + void trueAssumption() { assumeTrue(5 > 1, () -> "5 is greater the 1"); assertEquals(5 + 2, 7); } @Test - public void falseAssumption() { + void falseAssumption() { assumeFalse(5 < 1, () -> "5 is less then 1"); assertEquals(5 + 2, 7); } @Test - public void assumptionThat() { + void assumptionThat() { String someString = "Just a string"; assumingThat(someString.equals("Just a string"), () -> assertEquals(2 + 2, 4)); } From 2327a11eca27437e0be662034e9f3634803a6295 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:01:07 +0300 Subject: [PATCH 4/6] Assertion arguments should be passed in the correct order --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 7b7c11ccad..a191d941a9 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -17,7 +17,8 @@ class ExceptionUnitTest { Throwable exception = assertThrows(UnsupportedOperationException.class, () -> { throw new UnsupportedOperationException("Not supported"); }); - assertEquals(exception.getMessage(), "Not supported"); + + assertEquals("Not supported", exception.getMessage()); } @Test From 37b5df83c5ca1fc8e340b8de5f64a83de255de81 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:03:48 +0300 Subject: [PATCH 5/6] Statement lambda can be replaced with expression lambda --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index a191d941a9..5bbd75d4d9 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -24,9 +24,7 @@ class ExceptionUnitTest { @Test void assertThrowsException() { String str = null; - assertThrows(IllegalArgumentException.class, () -> { - Integer.valueOf(str); - }); + assertThrows(IllegalArgumentException.class, () -> Integer.valueOf(str)); } @Test From 7ef7265dceb6d1418932c6b79de47e836c3b3096 Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Wed, 20 Apr 2022 14:06:43 +0300 Subject: [PATCH 6/6] Method name typo --- .../src/test/java/com/baeldung/ExceptionUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java index 5bbd75d4d9..b22707f10a 100644 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java +++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -28,7 +28,7 @@ class ExceptionUnitTest { } @Test - void whenModifyMapDuringIteration_thenThrowExecption() { + void whenModifyMapDuringIteration_thenThrowException() { Map hashmap = new HashMap<>(); hashmap.put(1, "One"); hashmap.put(2, "Two");