diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.after.java new file mode 100644 index 000000000000..3e9183d6638b --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.after.java @@ -0,0 +1,9 @@ +import org.junit.jupiter.api.Assertions; + +class MyTest { + { + Assertions.assertTrue(foo(), () -> "message"); + } + + boolean foo() {return false;} +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.java new file mode 100644 index 000000000000..f4ed785c1fef --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/EqualsToTrueJUnit5.java @@ -0,0 +1,7 @@ +class MyTest { + { + org.junit.jupiter.api.Assertions.assertEquals(true, foo(), () -> "message"); + } + + boolean foo() {return false;} +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.after.java new file mode 100644 index 000000000000..4b6471d5313b --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.after.java @@ -0,0 +1,9 @@ +import org.junit.jupiter.api.Assertions; + +class MyTest { + { + Assertions.assertEquals(foo(), foo(), () -> "message"); + } + + Object foo() {return null;} +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.java new file mode 100644 index 000000000000..789e6534fb0f --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/junit/simplifiable_junit_assertion/TrueToEqualsJUnit5.java @@ -0,0 +1,9 @@ +import org.junit.jupiter.api.Assertions; + +class MyTest { + { + Assertions.assertTrue(foo().equals(foo()), () -> "message"); + } + + Object foo() {return null;} +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/SimplifiableJUnitAssertionFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/SimplifiableJUnitAssertionFixTest.java index d2648509a556..e5a0fe1c9685 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/SimplifiableJUnitAssertionFixTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/junit/SimplifiableJUnitAssertionFixTest.java @@ -28,6 +28,8 @@ public class SimplifiableJUnitAssertionFixTest extends IGQuickFixesTestCase { public void testJUnit4TestCase() { doTest(); } public void testIntegerPrimitive() { doTest(); } public void testDoublePrimitive() { doTest(); } + public void testEqualsToTrueJUnit5() { doTest(); } + public void testTrueToEqualsJUnit5() { doTest(); } @Override protected void setUp() throws Exception { @@ -67,5 +69,16 @@ public class SimplifiableJUnitAssertionFixTest extends IGQuickFixesTestCase { "@Retention(RetentionPolicy.RUNTIME)" + "@Target({ElementType.METHOD})" + "public @interface Test {}"); + + myFixture.addClass("package java.util.function; public interface Supplier { T get();}"); + + myFixture.addClass("package org.junit.jupiter.api;\n" + + "import java.util.function.Supplier;\n" + + "public final class Assertions {\n" + + " public static void assertEquals(Object expected, Object actual) {}\n" + + " public static void assertTrue(boolean expected) {}\n" + + " public static void assertEquals(Object expected, Object actual, Supplier message) {}\n" + + " public static void assertTrue(Object expected, Supplier message) {}\n" + + "}"); } }