add junit platform test unique id to result metadata (fixes ##593, via#594)

naresha · web-flow · commit 87e5e9d2f64e · 2021-06-10T14:18:09.000+03:00
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -100,6 +100,8 @@ public class AllureJunitPlatform implements TestExecutionListener {
     public static final String EVENT_STOP = "stop";
     public static final String EVENT_FAILURE = "failure";
 
+    public static final String JUNIT_PLATFORM_UNIQUE_ID = "junit.platform.uniqueid";
+
     private static final String STDOUT = "stdout";
     private static final String STDERR = "stderr";
     private static final String TEXT_PLAIN = "text/plain";
@@ -373,6 +375,8 @@ private void startTestCase(final TestIdentifier testIdentifier) {
 
         result.getLabels().addAll(getProvidedLabels());
 
+        result.getLabels().add(getJUnitPlatformUniqueId(testIdentifier));
+
         testClass.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
         testMethod.map(AnnotationUtils::getLabels).ifPresent(result.getLabels()::addAll);
 
@@ -510,6 +514,13 @@ private List<Label> getSourceLabels(final TestSource source) {
         return Collections.emptyList();
     }
 
+    private Label getJUnitPlatformUniqueId(final TestIdentifier testIdentifier) {
+        final Label label = new Label();
+        label.setName(JUNIT_PLATFORM_UNIQUE_ID);
+        label.setValue(testIdentifier.getUniqueId());
+        return label;
+    }
+
     private static class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -26,6 +26,7 @@
 import io.qameta.allure.junitplatform.features.DisabledTests;
 import io.qameta.allure.junitplatform.features.DynamicTests;
 import io.qameta.allure.junitplatform.features.FailedTests;
+import io.qameta.allure.junitplatform.features.JupiterUniqueIdTest;
 import io.qameta.allure.junitplatform.features.MarkerAnnotationSupport;
 import io.qameta.allure.junitplatform.features.OneTest;
 import io.qameta.allure.junitplatform.features.OwnerTest;
@@ -70,6 +71,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static io.qameta.allure.junitplatform.AllureJunitPlatform.JUNIT_PLATFORM_UNIQUE_ID;
 import static io.qameta.allure.junitplatform.AllureJunitPlatformTestUtils.runClasses;
 import static io.qameta.allure.junitplatform.features.TaggedTests.CLASS_TAG;
 import static io.qameta.allure.junitplatform.features.TaggedTests.METHOD_TAG;
@@ -759,4 +761,16 @@ void shouldSupportAllureIdAnnotations() {
 
     }
 
+    @AllureFeatures.Base
+    @Test
+    void shouldPopulateTestCaseId() {
+        final AllureResults results = runClasses(JupiterUniqueIdTest.class);
+        final List<TestResult> testResults = results.getTestResults();
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn("name", JUNIT_PLATFORM_UNIQUE_ID)
+                .extracting(Label::getValue)
+                .first()
+                .isEqualTo("[engine:junit-jupiter]/[class:io.qameta.allure.junitplatform.features.JupiterUniqueIdTest]/[method:jupiterTest()]");
+    }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/JupiterUniqueIdTest.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.junitplatform.features;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author naresha (Naresha K)
+ */
+public class JupiterUniqueIdTest {
+
+    @Test
+    void jupiterTest() {
+    }
+}
