junit4 - сombining repeatable annotations on method and on class (via #121)

Author: jkttt

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

@@ -159,17 +159,20 @@ private List<Label> getLabels(final Description result) {
         ).reduce(Stream::concat).orElseGet(Stream::empty).collect(Collectors.toList());
     }
 
-    private <T extends Annotation> Stream<Label> getLabels(final Description result, final Class<T> clazz,
+    private <T extends Annotation> Stream<Label> getLabels(final Description result, final Class<T> labelAnnotation,
                                                            final Function<T, Label> extractor) {
 
-        final List<Label> onMethod = getAnnotationsOnMethod(result, clazz).stream()
+        final List<Label> labels = getAnnotationsOnMethod(result, labelAnnotation).stream()
                 .map(extractor)
                 .collect(Collectors.toList());
-        if (!onMethod.isEmpty()) {
-            return onMethod.stream();
+
+        if (labelAnnotation.isAnnotationPresent(Repeatable.class) || labels.isEmpty()) {
+            final Stream<Label> onClassLabels = getAnnotationsOnClass(result, labelAnnotation).stream()
+                    .map(extractor);
+            labels.addAll(onClassLabels.collect(Collectors.toList()));
         }
-        return getAnnotationsOnClass(result, clazz).stream()
-                .map(extractor);
+
+        return labels.stream();
     }
 
     private Label createLabel(final Tag tag) {

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

@@ -26,8 +26,11 @@
 
 import java.util.List;
 
+import static io.qameta.allure.junit4.samples.TaggedTests.CLASS_TAG1;
+import static io.qameta.allure.junit4.samples.TaggedTests.CLASS_TAG2;
 import static io.qameta.allure.junit4.samples.TaggedTests.METHOD_TAG1;
 import static io.qameta.allure.junit4.samples.TaggedTests.METHOD_TAG2;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class FeatureCombinationsTest {
@@ -219,6 +222,6 @@ public void shouldSetTags() throws Exception {
                 .flatExtracting(TestResult::getLabels)
                 .filteredOn(label -> "tag".equals(label.getName()))
                 .extracting(Label::getValue)
-                .containsExactlyInAnyOrder(METHOD_TAG1, METHOD_TAG2);
+                .containsExactlyInAnyOrder(CLASS_TAG1, CLASS_TAG2, METHOD_TAG1, METHOD_TAG2);
     }
 }

allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java

@@ -6,6 +6,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
+@DisplayName("Should be overwritten by method annotation")
 public class OneTest {
 
     @Test

allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java

@@ -7,11 +7,13 @@
 /**
  * @author jkttt on 05.07.17.
  */
+@Tags({@Tag(TaggedTests.CLASS_TAG1), @Tag(TaggedTests.CLASS_TAG2)})
 public class TaggedTests {
 
     public static final String METHOD_TAG2 = "method_tag1";
     public static final String METHOD_TAG1 = "method_tag2";
-    public static final String CLASS_TAG = "class_tag";
+    public static final String CLASS_TAG1 = "class_tag1";
+    public static final String CLASS_TAG2 = "class_tag2";
 
     @Test
     @Tags({@Tag(METHOD_TAG1),