Merge pull request #8 from jqassistant-plugin/feature/4-recognition-of-assertj-fail-as-assertion

#4: recognition of org.assertj.core.api.Assertions.fail as assertion

Author: DirkMahler

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

@@ -12,11 +12,16 @@
                 (assertType:Type)-[:DECLARES]->(assertMethod)
             WHERE
                 assertType.fqn =~ 'org\\.assertj\\.core\\.api\\..*Assertions.*'
-                AND assertMethod.signature =~ '.* assert.*'
+                AND (
+                    assertMethod.signature =~ '.* assert.*' OR
+                    assertMethod.signature =~ '.* fail.*'
+                )
             SET
                 assertMethod:AssertJ:Assert
             RETURN
                 assertMethod
+            ORDER BY
+                assertMethod.signature
         ]]></cypher>
     </concept>
 

src/test/java/org/jqassistant/plugin/java_testing/concept/AssertExample.java

@@ -20,6 +20,8 @@ void assertjAssertExampleMethod() {
         Assertions.assertThat(true).isTrue();
     }
 
+    void assertjFailExampleMethod() { Assertions.fail("fail"); }
+
     void xmlAssertExampleMethod() {
         XmlAssert.assertThat("<nop/>").and("<nop />").normalizeWhitespace().areSimilar();
     }

src/test/java/org/jqassistant/plugin/java_testing/concept/AssertJIT.java

@@ -31,12 +31,18 @@ void assertjAssertMethod() throws Exception {
 
         store.beginTransaction();
 
-        assertThat(conceptResult.getRows().size()).isEqualTo(1);
+        assertThat(conceptResult.getRows().size()).isEqualTo(2);
         assertThat(conceptResult.getRows()
                 .get(0)
                 .getColumns()
                 .get("assertMethod")
                 .getValue()).asInstanceOf(type(MethodDescriptor.class))
+                .is(methodDescriptor(Assertions.class, "fail",  String.class));
+        assertThat(conceptResult.getRows()
+                .get(1)
+                .getColumns()
+                .get("assertMethod")
+                .getValue()).asInstanceOf(type(MethodDescriptor.class))
                 .is(methodDescriptor(Assertions.class, "assertThat", boolean.class));
 
         verifyResultGraph();
@@ -74,8 +80,12 @@ private void verifyResultGraph() throws NoSuchMethodException {
                         + "RETURN testMethod, assertMethod");
         assertThat(methodQueryResult.<MethodDescriptor>getColumn("testMethod"))
                 .haveExactly(1, methodDescriptor(AssertExample.class, "assertjAssertExampleMethod"));
+        assertThat(methodQueryResult.<MethodDescriptor>getColumn("testMethod"))
+                .haveExactly(1, methodDescriptor(AssertExample.class, "assertjFailExampleMethod"));
         assertThat(methodQueryResult.<MethodDescriptor>getColumn("assertMethod"))
                 .haveExactly(1, methodDescriptor(Assertions.class, "assertThat", boolean.class));
+        assertThat(methodQueryResult.<MethodDescriptor>getColumn("assertMethod"))
+                .haveExactly(1, methodDescriptor(Assertions.class, "fail", String.class));
     }
 
 }