simplify

Author: baev

allure-cucumber7-jvm/src/main/java/io/qameta/allure/cucumber7jvm/AllureCucumber7Jvm.java

@@ -51,7 +51,6 @@
 import io.qameta.allure.model.TestResult;
 
 import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -63,7 +62,6 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -276,13 +274,14 @@ private void handleStartPickleStep(final TestCase testCase,
                 .setName(step.getKeyword() + step.getText())
                 .setStart(System.currentTimeMillis());
 
+        final AllureExternalKey stepKey = stepKey(pickleStep.getId().toString());
         lifecycle.setCurrent(testKey(uuid));
-        lifecycle.startStep(stepKey(pickleStep.getId().toString()), stepResult);
+        lifecycle.startStep(stepKey, stepResult);
 
         final StepArgument stepArgument = step.getArgument();
         if (stepArgument instanceof DataTableArgument) {
             final DataTableArgument dataTableArgument = (DataTableArgument) stepArgument;
-            createDataTableAttachment(dataTableArgument);
+            createDataTableAttachment(stepKey, dataTableArgument);
         }
     }
 
@@ -340,20 +339,28 @@ private static boolean isFixtureHook(final HookTestStep hook) {
     }
 
     private void handleWriteEvent(final WriteEvent event) {
-        addAttachmentToCurrent(
-                "Text output",
-                TEXT_PLAIN,
-                () -> new ByteArrayInputStream(Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)),
-                AttachmentOptions.empty()
+        // user output is genuinely ambient: it lands under whatever executable is current,
+        // and is silently skipped (unsupported executables) — no key to address it by
+        lifecycle.getCurrentExecutableKey().ifPresent(
+                key -> lifecycle.addAttachment(
+                        key,
+                        "Text output",
+                        TEXT_PLAIN,
+                        new ByteArrayInputStream(Objects.toString(event.getText()).getBytes(StandardCharsets.UTF_8)),
+                        AttachmentOptions.empty()
+                )
         );
     }
 
     private void handleEmbedEvent(final EmbedEvent event) {
-        addAttachmentToCurrent(
-                event.name,
-                event.getMediaType(),
-                () -> new ByteArrayInputStream(event.getData()),
-                AttachmentOptions.empty()
+        lifecycle.getCurrentExecutableKey().ifPresent(
+                key -> lifecycle.addAttachment(
+                        key,
+                        event.name,
+                        event.getMediaType(),
+                        new ByteArrayInputStream(event.getData()),
+                        AttachmentOptions.empty()
+                )
         );
     }
 
@@ -440,11 +447,14 @@ private List<Parameter> getExamplesAsParameters(
                 .collect(Collectors.toList());
     }
 
-    private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
-        addAttachmentToCurrent(
+    private void createDataTableAttachment(final AllureExternalKey stepKey,
+                                           final DataTableArgument dataTableArgument) {
+        // the data table belongs to the step this adapter just started — address it by key
+        lifecycle.addAttachment(
+                stepKey,
                 "Data table",
                 "text/csv",
-                () -> new ByteArrayInputStream(toCsv(dataTableArgument).getBytes(StandardCharsets.UTF_8)),
+                new ByteArrayInputStream(toCsv(dataTableArgument).getBytes(StandardCharsets.UTF_8)),
                 AttachmentOptions.empty()
         );
     }
@@ -472,24 +482,6 @@ private static String toCsv(final DataTableArgument dataTableArgument) {
         return dataTableCsv.toString();
     }
 
-    /**
-     * Attaches to the current executable, or silently skips — including the content computation — when no
-     * executable is running (for example when Allure reporting is disabled).
-     */
-    private void addAttachmentToCurrent(final String name, final String type,
-                                        final Supplier<InputStream> content, final AttachmentOptions options) {
-        lifecycle.getCurrentExecutableKey()
-                .ifPresent(
-                        key -> lifecycle.addAttachment(
-                                key,
-                                name,
-                                type,
-                                content.get(),
-                                options
-                        )
-                );
-    }
-
     private void handleStopHookStep(final Result eventResult,
                                     final HookTestStep hook) {
         final String containerUuid = hookStepContainerUuid.get(hook.getId());

allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java

@@ -360,29 +360,29 @@ public void reportingEntryPublished(final TestIdentifier testIdentifier,
             return;
         }
 
-        if (keyValuePairs.containsKey(STDOUT)) {
-            final String content = keyValuePairs.getOrDefault(STDOUT, "");
-            addAttachmentToCurrent("Stdout", content);
-        }
-        if (keyValuePairs.containsKey(STDERR)) {
-            final String content = keyValuePairs.getOrDefault(STDERR, "");
-            addAttachmentToCurrent("Stderr", content);
-        }
-
-    }
-
-    private void addAttachmentToCurrent(final String name, final String content) {
+        // captured output is genuinely ambient: it lands under whatever executable is current,
+        // and is silently skipped (unsupported executables) — no key to address it by
         final AllureLifecycle lifecycle = getLifecycle();
-        lifecycle.getCurrentExecutableKey()
-                .ifPresent(
-                        key -> lifecycle.addAttachment(
-                                key,
-                                name,
-                                TEXT_PLAIN,
-                                new ByteArrayInputStream(content.getBytes(UTF_8)),
-                                AttachmentOptions.empty()
-                        )
+        lifecycle.getCurrentExecutableKey().ifPresent(key -> {
+            if (keyValuePairs.containsKey(STDOUT)) {
+                lifecycle.addAttachment(
+                        key,
+                        "Stdout",
+                        TEXT_PLAIN,
+                        new ByteArrayInputStream(keyValuePairs.getOrDefault(STDOUT, "").getBytes(UTF_8)),
+                        AttachmentOptions.empty()
                 );
+            }
+            if (keyValuePairs.containsKey(STDERR)) {
+                lifecycle.addAttachment(
+                        key,
+                        "Stderr",
+                        TEXT_PLAIN,
+                        new ByteArrayInputStream(keyValuePairs.getOrDefault(STDERR, "").getBytes(UTF_8)),
+                        AttachmentOptions.empty()
+                );
+            }
+        });
     }
 
     @SuppressWarnings("PMD.InefficientEmptyStringCheck")