add support for inherited annotations (via allure-framework#537)

baev · web-flow · commit 33ceec873536 · 2021-03-26T16:03:37.000+03:00
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -62,7 +62,7 @@ private AnnotationUtils() {
      * @return discovered links.
      */
     public static Set<Link> getLinks(final AnnotatedElement annotatedElement) {
-        return getLinks(annotatedElement.getDeclaredAnnotations());
+        return getLinks(annotatedElement.getAnnotations());
     }
 
     /**
@@ -94,7 +94,7 @@ public static Set<Link> getLinks(final Collection<Annotation> annotations) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
-        return getLabels(annotatedElement.getDeclaredAnnotations());
+        return getLabels(annotatedElement.getAnnotations());
     }
 
     /**
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -416,4 +416,39 @@ void complexCase() {
                         tuple("owner", "tester2")
                 );
     }
+
+    @Issue("i-1")
+    @Link("example")
+    @Feature("a")
+    static class InheritedParentTest1 {
+    }
+
+    @Issue("i-2")
+    @Story("b")
+    static class InheritedChildTest1 extends InheritedParentTest1 {
+    }
+
+    @Test
+    void inheritedLabelAnnotationsTest() {
+        final Set<Label> labels1 = getLabels(InheritedChildTest1.class);
+
+        assertThat(labels1)
+                .extracting(Label::getName, Label::getValue)
+                .containsExactlyInAnyOrder(
+                        tuple("feature", "a"),
+                        tuple("story", "b")
+                );
+    }
+
+    @Test
+    void inheritedLinkAnnotationsTest() {
+        final Set<io.qameta.allure.model.Link> links = getLinks(InheritedChildTest1.class);
+
+        assertThat(links)
+                .extracting(io.qameta.allure.model.Link::getName, io.qameta.allure.model.Link::getType)
+                .containsExactlyInAnyOrder(
+                        tuple("i-2", "issue"),
+                        tuple("example", "custom")
+                );
+    }
 }
diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
@@ -671,11 +671,23 @@ public void ownerTest() {
         final AllureResults results = runTestNgSuites("suites/owner.xml");
         List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
-                .hasSize(8)
-                .flatExtracting(TestResult::getLabels)
-                .filteredOn(label -> "owner".equals(label.getName()))
-                .extracting(Label::getValue)
-                .containsExactly("charlie", "charlie", "other-guy", "eroshenkoam", "eroshenkoam", "other-guy");
+                .extracting(TestResult::getFullName, tr -> tr.getLabels()
+                        .stream()
+                        .filter(label -> "owner".equals(label.getName()))
+                        .map(Label::getValue)
+                        .sorted()
+                        .collect(Collectors.joining(",","[","]"))
+                )
+                .containsExactlyInAnyOrder(
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithoutOwner", "[]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithOwner", "[eroshenkoam,other-guy]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]"),
+                        tuple("io.qameta.allure.testng.samples.OwnerClassTest.testWithoutOwner", "[eroshenkoam]")
+                );
     }
 
     @AllureFeatures.Attachments
