From 1ec8a4e2b1094c1291e5d374a6034ed64219d10e Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 15:46:07 +0300
Subject: [PATCH 1/8] JUnit5 Tag annotation processing to labels in junit5
 execution listener

---
 .../io/qameta/allure/junit5/AllureJunit5.java | 12 +++++++
 .../allure/junit5/AllureJunit5Test.java       | 35 ++++++++++++-------
 .../allure/junit5/features/TaggedTests.java   | 18 ++++++++++
 3 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java

diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 6659c408b..93f953897 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -15,8 +15,10 @@
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static io.qameta.allure.model.Status.FAILED;
 import static io.qameta.allure.model.Status.PASSED;
@@ -28,6 +30,9 @@
  */
 public class AllureJunit5 implements TestExecutionListener {
 
+    private static final String TAG = "tag";
+
+
     private final ThreadLocal<String> tests
             = InheritableThreadLocal.withInitial(() -> UUID.randomUUID().toString());
 
@@ -55,6 +60,7 @@ public void executionStarted(final TestIdentifier testIdentifier) {
             final TestResult result = new TestResult()
                     .withUuid(uuid)
                     .withName(testIdentifier.getDisplayName())
+                    .withLabels(getTags(testIdentifier))
                     .withHistoryId(getHistoryId(testIdentifier))
                     .withStage(Stage.RUNNING);
 
@@ -102,6 +108,12 @@ protected Status getStatus(final Throwable throwable) {
         return ResultsUtils.getStatus(throwable).orElse(FAILED);
     }
 
+    private List<Label> getTags(TestIdentifier testIdentifier) {
+        return testIdentifier.getTags().stream()
+                .map(tag -> new Label().withName(TAG).withValue(tag.getName()))
+                .collect(Collectors.toList());
+    }
+
     protected String getHistoryId(final TestIdentifier testIdentifier) {
         return md5(testIdentifier.getUniqueId());
     }
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index 24ca7798a..a5c50fa7f 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -3,19 +3,10 @@
 import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.aspects.AttachmentsAspects;
 import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junit5.features.BrokenTests;
-import io.qameta.allure.junit5.features.DynamicTests;
-import io.qameta.allure.junit5.features.FailedTests;
-import io.qameta.allure.junit5.features.ParameterisedTests;
-import io.qameta.allure.junit5.features.PassedTests;
-import io.qameta.allure.junit5.features.SkippedTests;
-import io.qameta.allure.junit5.features.TestsWithDisplayName;
-import io.qameta.allure.junit5.features.TestsWithSteps;
-import io.qameta.allure.model.ExecutableItem;
-import io.qameta.allure.model.Stage;
-import io.qameta.allure.model.Status;
-import io.qameta.allure.model.TestResult;
+import io.qameta.allure.junit5.features.*;
+import io.qameta.allure.model.*;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.discovery.ClassSelector;
@@ -28,6 +19,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import static io.qameta.allure.junit5.features.TaggedTests.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -196,6 +188,25 @@ void shouldAddSteps() {
 
     }
 
+    @Test
+    void shouldAddTags() {
+        runClasses(TaggedTests.class);
+
+        final List<TestResult> testResults = results.getTestResults();
+
+        SoftAssertions softly = new SoftAssertions();
+
+        softly.assertThat(testResults)
+                .hasSize(1);
+
+        softly.assertThat(testResults.get(0).getLabels())
+                .filteredOn(label -> "tag".equals(label.getName()))
+                .flatExtracting(Label::getValue)
+                .containsExactlyInAnyOrder(CLASS_TAG, METHOD_TAG);
+
+        softly.assertAll();
+    }
+
     private void runClasses(Class<?>... classes) {
         final ClassSelector[] classSelectors = Stream.of(classes)
                 .map(DiscoverySelectors::selectClass)
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java
new file mode 100644
index 000000000..e039c4004
--- /dev/null
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java
@@ -0,0 +1,18 @@
+package io.qameta.allure.junit5.features;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author jkt on 05.07.17.
+ */
+@Tag(TaggedTests.CLASS_TAG)
+public class TaggedTests {
+
+    public static final String CLASS_TAG = "class_tag";
+    public static final String METHOD_TAG = "single_tag";
+
+    @Test
+    @Tag(METHOD_TAG)
+    void taggedTest() {}
+}

From 6f5289423bb68772f69590333acec75e65e9bc6b Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 22:07:49 +0300
Subject: [PATCH 2/8] JUnit5 Tag annotation processing to labels in junit5
 execution listener. Test ref

---
 .../test/java/io/qameta/allure/junit5/AllureJunit5Test.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
index a5c50fa7f..1fda23f93 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/AllureJunit5Test.java
@@ -199,7 +199,8 @@ void shouldAddTags() {
         softly.assertThat(testResults)
                 .hasSize(1);
 
-        softly.assertThat(testResults.get(0).getLabels())
+        softly.assertThat(testResults)
+                .flatExtracting(TestResult::getLabels)
                 .filteredOn(label -> "tag".equals(label.getName()))
                 .flatExtracting(Label::getValue)
                 .containsExactlyInAnyOrder(CLASS_TAG, METHOD_TAG);

From 348d3543d6d5952b1e262b82a72a1e78fc3ee40b Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 22:09:14 +0300
Subject: [PATCH 3/8] JUnit4 Tag annotation processing to labels in junit4 run
 listener

---
 .../io/qameta/allure/junit4/AllureJunit4.java |  7 +++++-
 .../java/io/qameta/allure/junit4/Tag.java     | 16 ++++++++++++++
 .../java/io/qameta/allure/junit4/Tags.java    | 15 +++++++++++++
 .../junit4/FeatureCombinationsTest.java       | 22 ++++++++++++++-----
 .../allure/junit4/samples/TaggedTests.java    | 20 +++++++++++++++++
 5 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
 create mode 100644 allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
 create mode 100644 allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java

diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 93a3fba55..7e41a874f 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -158,10 +158,15 @@ private List<Label> getLabels(final Description result) {
                 getLabels(result, Feature.class, ResultsUtils::createLabel),
                 getLabels(result, Story.class, ResultsUtils::createLabel),
                 getLabels(result, Severity.class, ResultsUtils::createLabel),
-                getLabels(result, Owner.class, ResultsUtils::createLabel)
+                getLabels(result, Owner.class, ResultsUtils::createLabel),
+                getLabels(result, Tag.class, this::createLabel)
         ).reduce(Stream::concat).orElseGet(Stream::empty).collect(Collectors.toList());
     }
 
+    private Label createLabel(Tag tag) {
+        return new Label().withName("tag").withValue(tag.value());
+    }
+
     private <T extends Annotation> Stream<Label> getLabels(final Description result, final Class<T> clazz,
                                                            final Function<T, Label> extractor) {
 
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
new file mode 100644
index 000000000..f713a35d5
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
@@ -0,0 +1,16 @@
+package io.qameta.allure.junit4;
+
+import java.lang.annotation.*;
+
+/**
+ * @author jkt on 05.07.17.
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Repeatable(Tags.class)
+public @interface Tag {
+
+    String value();
+
+}
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
new file mode 100644
index 000000000..1dfb6778a
--- /dev/null
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -0,0 +1,15 @@
+package io.qameta.allure.junit4;
+
+import java.lang.annotation.*;
+
+/**
+ * @author jkt on 05.07.17.
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Tags {
+
+    Tag[] value();
+
+}
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
index 2d8bd5356..236db9106 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
@@ -2,11 +2,7 @@
 
 import io.qameta.allure.AllureLifecycle;
 import io.qameta.allure.aspects.StepsAspects;
-import io.qameta.allure.junit4.samples.BrokenTest;
-import io.qameta.allure.junit4.samples.FailedTest;
-import io.qameta.allure.junit4.samples.OneTest;
-import io.qameta.allure.junit4.samples.TestWithAnnotations;
-import io.qameta.allure.junit4.samples.TestWithSteps;
+import io.qameta.allure.junit4.samples.*;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.model.Stage;
@@ -14,6 +10,7 @@
 import io.qameta.allure.model.StepResult;
 import io.qameta.allure.model.TestResult;
 import io.qameta.allure.test.AllureResultsWriterStub;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.JUnitCore;
@@ -21,6 +18,7 @@
 
 import java.util.List;
 
+import static io.qameta.allure.junit4.samples.TaggedTests.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class FeatureCombinationsTest {
@@ -156,4 +154,18 @@ public void shouldSetLinks() throws Exception {
                 .extracting(Link::getName)
                 .containsExactly("link-1", "link-2", "issue-1", "issue-2", "tms-1", "tms-2");
     }
+
+    @Test
+    @DisplayName("Should set tags")
+    public void shouldSetTags() throws Exception {
+        core.run(Request.aClass(TaggedTests.class));
+        List<TestResult> testResults = results.getTestResults();
+
+        assertThat(testResults)
+                .hasSize(1)
+                .flatExtracting(TestResult::getLabels)
+                .filteredOn(label -> "tag".equals(label.getName()))
+                .extracting(Label::getValue)
+                .containsExactlyInAnyOrder(METHOD_TAG1, METHOD_TAG2);
+    }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
new file mode 100644
index 000000000..ccc737986
--- /dev/null
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -0,0 +1,20 @@
+package io.qameta.allure.junit4.samples;
+
+import io.qameta.allure.junit4.Tag;
+import io.qameta.allure.junit4.Tags;
+import org.junit.Test;
+
+/**
+ * @author jkt on 05.07.17.
+ */
+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";
+
+    @Test
+    @Tags({@Tag(METHOD_TAG1),
+            @Tag(METHOD_TAG2)})
+    public void taggedTest() {}
+}

From 20c0956402f9d083713c037e7a2813ac16d5c7c5 Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 22:25:52 +0300
Subject: [PATCH 4/8] JUnit4 Tag annotation processing to labels in junit4 run
 listener. Codestyle

---
 .../main/java/io/qameta/allure/junit4/AllureJunit4.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 7e41a874f..5d89881ed 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -163,10 +163,6 @@ private List<Label> getLabels(final Description result) {
         ).reduce(Stream::concat).orElseGet(Stream::empty).collect(Collectors.toList());
     }
 
-    private Label createLabel(Tag tag) {
-        return new Label().withName("tag").withValue(tag.value());
-    }
-
     private <T extends Annotation> Stream<Label> getLabels(final Description result, final Class<T> clazz,
                                                            final Function<T, Label> extractor) {
 
@@ -180,6 +176,10 @@ private <T extends Annotation> Stream<Label> getLabels(final Description result,
                 .map(extractor);
     }
 
+    private Label createLabel(Tag tag) {
+        return new Label().withName("tag").withValue(tag.value());
+    }
+
     private <T extends Annotation> List<T> getAnnotationsOnMethod(final Description result, final Class<T> clazz) {
         final T annotation = result.getAnnotation(clazz);
         return Stream.concat(

From 6890261205187b6748e290cc6d64ae3d08d4cd22 Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 23:13:26 +0300
Subject: [PATCH 5/8] JUnit4 Tag annotation processing to labels in junit4 run
 listener. Codestyle

---
 .../src/main/java/io/qameta/allure/junit4/AllureJunit4.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index 5d89881ed..923d045ee 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -176,7 +176,7 @@ private <T extends Annotation> Stream<Label> getLabels(final Description result,
                 .map(extractor);
     }
 
-    private Label createLabel(Tag tag) {
+    private Label createLabel(final Tag tag) {
         return new Label().withName("tag").withValue(tag.value());
     }
 

From eef5b4438230148788bcd9b48394a71c9d984395 Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 23:20:54 +0300
Subject: [PATCH 6/8] JUnit5 Tag annotation processing to labels in junit5
 execution listener. Codestyle

---
 .../src/main/java/io/qameta/allure/junit5/AllureJunit5.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
index 93f953897..32cc6c973 100644
--- a/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
+++ b/allure-junit5/src/main/java/io/qameta/allure/junit5/AllureJunit5.java
@@ -108,7 +108,7 @@ protected Status getStatus(final Throwable throwable) {
         return ResultsUtils.getStatus(throwable).orElse(FAILED);
     }
 
-    private List<Label> getTags(TestIdentifier testIdentifier) {
+    private List<Label> getTags(final TestIdentifier testIdentifier) {
         return testIdentifier.getTags().stream()
                 .map(tag -> new Label().withName(TAG).withValue(tag.getName()))
                 .collect(Collectors.toList());

From 576a818c6bd372270561524e22edb9b7fd41afd7 Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Wed, 5 Jul 2017 23:22:04 +0300
Subject: [PATCH 7/8] JUnit5/4 Tag annotation processing to labels. Change user

---
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java    | 2 +-
 allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java   | 2 +-
 .../test/java/io/qameta/allure/junit4/samples/TaggedTests.java  | 2 +-
 .../test/java/io/qameta/allure/junit5/features/TaggedTests.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
index f713a35d5..a5460db96 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tag.java
@@ -3,7 +3,7 @@
 import java.lang.annotation.*;
 
 /**
- * @author jkt on 05.07.17.
+ * @author jkttt on 05.07.17.
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
index 1dfb6778a..023c8ea2f 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/Tags.java
@@ -3,7 +3,7 @@
 import java.lang.annotation.*;
 
 /**
- * @author jkt on 05.07.17.
+ * @author jkttt on 05.07.17.
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index ccc737986..a91705861 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 
 /**
- * @author jkt on 05.07.17.
+ * @author jkttt on 05.07.17.
  */
 public class TaggedTests {
 
diff --git a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java
index e039c4004..9a4e2a7e5 100644
--- a/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java
+++ b/allure-junit5/src/test/java/io/qameta/allure/junit5/features/TaggedTests.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * @author jkt on 05.07.17.
+ * @author jkttt on 05.07.17.
  */
 @Tag(TaggedTests.CLASS_TAG)
 public class TaggedTests {

From 8317108ad64e9869660501bd9a9edb91a893dfe3 Mon Sep 17 00:00:00 2001
From: jkt <jkt@yandex-team.ru>
Date: Mon, 31 Jul 2017 18:52:57 +0300
Subject: [PATCH 8/8] JUnit4 Combining repeatable annotations on method and on
 class

---
 .../io/qameta/allure/junit4/AllureJunit4.java     | 15 +++++++++------
 .../allure/junit4/FeatureCombinationsTest.java    |  5 ++++-
 .../io/qameta/allure/junit4/samples/OneTest.java  |  1 +
 .../qameta/allure/junit4/samples/TaggedTests.java |  4 +++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
index e8df6c181..b9a7083fb 100644
--- a/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
+++ b/allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
@@ -163,17 +163,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) {
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
index 41ca11a32..110a57b3f 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
+++ b/allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
@@ -25,8 +25,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 {
@@ -208,6 +211,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);
     }
 }
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
index d4a008de4..2c3778b22 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
+++ b/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
diff --git a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java b/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
index a91705861..9705b8cd0 100644
--- a/allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
+++ b/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),