Merge pull request #9 from jQAssistant/GH-8-support-additional-junit-5-assert-methods

Author: DirkMahler

src/main/asciidoc/releasenotes/1.10.0.adoc

@@ -1,4 +1,7 @@
 ifndef::jqa-in-manual[== Version 1.10.0]
 ifdef::jqa-in-manual[== JUnit Plugin 1.10.0]
 
-* No changes in this version.
+=== Updated concepts
+
+* Added support for additional assert methods to concept `junit5:AssertMethod`.
+** The concept now matches all methods in `org.junit.jupiter.api.Assertions` starting with `assert`, thus now supports `assertThrows` and `assertTimeout*`.

src/main/resources/META-INF/jqassistant-rules/junit5.xml

@@ -418,7 +418,7 @@
               (assertType:Type)-[:DECLARES]->(assertMethod)
             WHERE
               assertType.fqn = 'org.junit.jupiter.api.Assertions'
-              and assertMethod.signature =~ 'void assert.*'
+              and assertMethod.signature CONTAINS ' assert'
             SET
               assertMethod:Junit5:Assert
             RETURN

src/test/java/com/buschmais/jqassistant/plugin/junit/test/rule/Junit5IT.java

@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
 
 import static com.buschmais.jqassistant.core.report.api.model.Result.Status.SUCCESS;
 import static com.buschmais.jqassistant.plugin.java.test.matcher.MethodDescriptorMatcher.methodDescriptor;
@@ -431,7 +432,8 @@ public void assertMethod() throws Exception {
         // Oliver B. Fischer, 2019-02-20
         assertThat(methods.size()).isGreaterThanOrEqualTo(109);
         assertThat(methods, hasItems(methodDescriptor(Assertions.class, "assertTrue", boolean.class),
-                                     methodDescriptor(Assertions.class, "assertTrue", boolean.class, String.class)));
+                                     methodDescriptor(Assertions.class, "assertTrue", boolean.class, String.class),
+                                     methodDescriptor(Assertions.class, "assertThrows", Class.class, Executable.class)));
         store.commitTransaction();
     }
 

src/test/java/com/buschmais/jqassistant/plugin/junit/test/set/junit5/Assertions4Junit5.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Disabled("This is not an actual test")
@@ -44,7 +45,16 @@ public void testWithNestedAssertion() {
         nestedAssertion();
     }
 
+    @Test
+    public void assertWithNonVoidReturn() {
+        assertThrows(IllegalArgumentException.class, this::throwsException);
+    }
+
     private void nestedAssertion() {
         assertTrue(() -> 2 > 1,  "Condition must be true");
     }
+
+    private void throwsException() throws IllegalArgumentException {
+
+    }
 }