add more tests for aspectj (fixes #210, fixes #305, via #322)

baev · web-flow · commit 51f256c9aa5e · 2019-02-12T19:04:37.000+03: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
@@ -45,7 +45,12 @@ public class AllureAspectJ {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AllureAspectJ.class);
 
-    private static AllureLifecycle lifecycle;
+    private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
+        @Override
+        protected AllureLifecycle initialValue() {
+            return Allure.getLifecycle();
+        }
+    };
 
     @Around("execution(* org.assertj.core.api.AbstractAssert+.*(..)) "
             + "|| execution(* org.assertj.core.api.Assertions.assertThat(..))")
@@ -78,21 +83,18 @@ public Object step(final ProceedingJoinPoint joinPoint) throws Throwable {
      * @param allure allure lifecycle to set.
      */
     public static void setLifecycle(final AllureLifecycle allure) {
-        lifecycle = allure;
+        lifecycle.set(allure);
     }
 
     public static AllureLifecycle getLifecycle() {
-        if (Objects.isNull(lifecycle)) {
-            lifecycle = Allure.getLifecycle();
-        }
-        return lifecycle;
+        return lifecycle.get();
     }
 
     private static String arrayToString(final Object... array) {
         return Stream.of(array)
-                     .map(object -> nonNull(object) && object.getClass().isArray()
-                             ? arrayToString((Object[]) object)
-                             : Objects.toString(object))
-                     .collect(Collectors.joining(" "));
+                .map(object -> nonNull(object) && object.getClass().isArray()
+                        ? arrayToString((Object[]) object)
+                        : Objects.toString(object))
+                .collect(Collectors.joining(" "));
     }
 }
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
@@ -15,59 +15,58 @@
  */
 package io.qameta.allure.assertj;
 
-import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureFeatures;
-import io.qameta.allure.test.AllureResultsWriterStub;
-import org.junit.jupiter.api.BeforeEach;
+import io.qameta.allure.test.AllureResults;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.UUID;
-
+import static io.qameta.allure.test.RunUtils.runWithinTestContext;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author charlie (Dmitry Baev).
  */
 class AllureAspectJTest {
 
-    private AllureResultsWriterStub results;
-
-    private AllureLifecycle lifecycle;
-
-    @BeforeEach
-    public void initLifecycle() {
-        results = new AllureResultsWriterStub();
-        lifecycle = new AllureLifecycle(results);
-        AllureAspectJ.setLifecycle(lifecycle);
-    }
-
     @AllureFeatures.Steps
     @Test
     void shouldCreateStepsForAsserts() {
-        final String uuid = UUID.randomUUID().toString();
-        final TestResult result = new TestResult().setUuid(uuid);
-
-        lifecycle.scheduleTestCase(result);
-        lifecycle.startTestCase(uuid);
-
-
-        assertThat("Data")
-                .hasSize(4);
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat("Data")
+                    .hasSize(4);
+        }, AllureAspectJ::setLifecycle);
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .containsExactly("assertThat 'Data'", "hasSize '4'");
+    }
 
-        lifecycle.stopTestCase(uuid);
-        lifecycle.writeTestCase(uuid);
+    @AllureFeatures.Steps
+    @Test
+    void shouldHandleNullableObject() {
+        final AllureResults results = runWithinTestContext(() -> {
+            assertThat((Object) null).as("Nullable object").isNull();
+        }, AllureAspectJ::setLifecycle);
 
         assertThat(results.getTestResults())
                 .flatExtracting(TestResult::getSteps)
                 .extracting(StepResult::getName)
-                .containsExactly("assertThat 'Data'", "hasSize '4'");
+                .containsExactly("assertThat 'null'", "as 'Nullable object '", "isNull");
     }
 
     @AllureFeatures.Steps
     @Test
-    public void shouldHandleNullableObject() {
-        assertThat((Object) null).as("Nullable object").isNull();
+    void softAssertions() {
+        final AllureResults results = runWithinTestContext(() -> {
+            final SoftAssertions soft = new SoftAssertions();
+            soft.assertThat(25).as("Test description").isEqualTo(26);
+        }, AllureAspectJ::setLifecycle);
+
+        assertThat(results.getTestResults())
+                .flatExtracting(TestResult::getSteps)
+                .extracting(StepResult::getName)
+                .contains("as 'Test description '", "isEqualTo '26'");
     }
 }
