fix package hierarchy for JUnit 4 and Spock 2 results (fixes #850, via #1349)

Author: baev

allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java

@@ -300,7 +300,7 @@ private TestResult createTestResult(final Description description) {
         testResult.getLabels().addAll(getProvidedLabels());
         testResult.getLabels().addAll(
                 Arrays.asList(
-                        createPackageLabel(getPackage(description.getTestClass())),
+                        createPackageLabel(className),
                         createTestClassLabel(className),
                         createHostLabel(),
                         createThreadLabel(),

allure-junit4/src/test/java/io/qameta/allure/junit4/AllureJunit4Test.java

@@ -64,6 +64,7 @@
 import static io.qameta.allure.junit4.samples.TaggedTests.METHOD_TAG2;
 import static io.qameta.allure.test.AllureTestCommonsUtils.expectedHistoryId;
 import static io.qameta.allure.util.ResultsUtils.HOST_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SEVERITY_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.THREAD_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.md5;
@@ -109,6 +110,19 @@ void shouldSetTestFullName() {
                 );
     }
 
+    @Test
+    @AllureFeatures.Trees
+    void shouldUseQualifiedClassNameForPackageLabel() {
+        final AllureResults results = runClasses(OneTest.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn(Label::getName, PACKAGE_LABEL_NAME)
+                .extracting(Label::getValue)
+                .containsExactly(OneTest.class.getName());
+    }
+
     @Test
     @AllureFeatures.Timeline
     void shouldSetExecutionLabels() {
@@ -480,6 +494,11 @@ void shouldProcessTestFromDefaultPackage() throws Exception {
                 .containsExactly(
                         tuple("SampleTestInDefaultPackage.testMethod", Status.PASSED)
                 );
+        assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn(Label::getName, PACKAGE_LABEL_NAME)
+                .extracting(Label::getValue)
+                .containsExactly(testInDefaultPackage.getName());
     }
 
     @Test

allure-spock2/src/main/java/io/qameta/allure/spock2/AllureSpock2.java

@@ -235,7 +235,7 @@ private TestResult createTestResult(final SpecInfo specInfo,
 
         final List<Label> labels = new ArrayList<>(
                 Arrays.asList(
-                        createPackageLabel(packageName),
+                        createPackageLabel(testClassName),
                         createTestClassLabel(testClassName),
                         createTestMethodLabel(testMethodName),
                         createHostLabel(),

allure-spock2/src/test/groovy/io/qameta/allure/spock2/AllureSpock2Test.java

@@ -86,6 +86,7 @@
 import java.util.stream.Stream;
 
 import static io.qameta.allure.test.AllureTestCommonsUtils.expectedHistoryId;
+import static io.qameta.allure.util.ResultsUtils.PACKAGE_LABEL_NAME;
 import static io.qameta.allure.util.ResultsUtils.SEVERITY_LABEL_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
@@ -282,6 +283,19 @@ void shouldSetTestFullName() {
                 .containsExactly("io.qameta.allure.spock2.samples.OneTest.Simple Test");
     }
 
+    @Test
+    @AllureFeatures.Trees
+    void shouldUseQualifiedClassNameForPackageLabel() {
+        final AllureResults results = runClasses(OneTest.class);
+
+        assertThat(results.getTestResults())
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn(Label::getName, PACKAGE_LABEL_NAME)
+                .extracting(Label::getValue)
+                .containsExactly(OneTest.class.getName());
+    }
+
     @Test
     void shouldSetStageFinished() {
         final AllureResults results = runClasses(OneTest.class);