assertj: add support for interface based assertions (via allure-framework#742)

dr29bart · web-flow · commit 20120afb64e9 · 2022-05-24T15:26:09.000+07:00
diff --git a/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java b/allure-assertj/src/main/java/io/qameta/allure/assertj/AllureAspectJ.java
@@ -55,16 +55,11 @@ protected AllureLifecycle initialValue() {
         }
     };
 
-    @Pointcut("execution(public org.assertj.core.api.AbstractAssert.new(..))")
+    @Pointcut("execution(!private org.assertj.core.api.AbstractAssert.new(..))")
     public void anyAssertCreation() {
         //pointcut body, should be empty
     }
 
-    @Pointcut("execution(public * org.assertj.core.api.AssertionsForClassTypes.*(..))")
-    public void anyAssertCreation2() {
-        //pointcut body, should be empty
-    }
-
     @Pointcut("execution(* org.assertj.core.api.AssertJProxySetup.*(..))")
     public void proxyMethod() {
         //pointcut body, should be empty
@@ -75,7 +70,7 @@ public void anyAssert() {
         //pointcut body, should be empty
     }
 
-    @After("anyAssertCreation() || anyAssertCreation2()")
+    @After("anyAssertCreation()")
     public void logAssertCreation(final JoinPoint joinPoint) {
         final String actual = joinPoint.getArgs().length > 0
                 ? ObjectUtils.toString(joinPoint.getArgs()[0])
diff --git a/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java b/allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -87,6 +88,23 @@ void shouldHandleByteArrayObject() {
                 );
     }
 
+    @AllureFeatures.Steps
+    @Test
+    void shouldHandleCollections() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat(Arrays.asList("a", "b"))
+                .containsExactly("a", "b");
+        }, AllureAspectJ::setLifecycle);
+
+        assertThat(results.getTestResults())
+            .flatExtracting(TestResult::getSteps)
+            .extracting(StepResult::getName)
+            .containsExactly(
+                "assertThat '[a, b]'",
+                "containsExactly '[a, b]'"
+            );
+    }
+
     @AllureFeatures.Steps
     @Test
     void softAssertions() {
