From b14ffd302a01952940f3ae1ca1b26b652eb7dcca Mon Sep 17 00:00:00 2001 From: Alex Golub Date: Fri, 22 Apr 2022 21:23:11 +0300 Subject: [PATCH] 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()); } }