Skip to content

Combining Repeatable annotations on method and on class #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 9 commits into from
Aug 7, 2017
Merged

Combining Repeatable annotations on method and on class #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ec8a4e
JUnit5 Tag annotation processing to labels in junit5 execution listener
jkttt Jul 5, 2017
6f52894
JUnit5 Tag annotation processing to labels in junit5 execution listen…
jkttt Jul 5, 2017
348d354
JUnit4 Tag annotation processing to labels in junit4 run listener
jkttt Jul 5, 2017
20c0956
JUnit4 Tag annotation processing to labels in junit4 run listener. Co…
jkttt Jul 5, 2017
6890261
JUnit4 Tag annotation processing to labels in junit4 run listener. Co…
jkttt Jul 5, 2017
eef5b44
JUnit5 Tag annotation processing to labels in junit5 execution listen…
jkttt Jul 5, 2017
576a818
JUnit5/4 Tag annotation processing to labels. Change user
jkttt Jul 5, 2017
0cb240d
Merge remote-tracking branch 'upstream/master'
jkttt Jul 31, 2017
8317108
JUnit4 Combining repeatable annotations on method and on class
jkttt Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions allure-junit4/src/main/java/io/qameta/allure/junit4/AllureJunit4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 4 additions & 1 deletion allure-junit4/src/test/java/io/qameta/allure/junit4/FeatureCombinationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}
}
1 change: 1 addition & 0 deletions allure-junit4/src/test/java/io/qameta/allure/junit4/samples/OneTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/**
* @author charlie (Dmitry Baev).
*/
@DisplayName("Should be overwritten by method annotation")
public class OneTest {

@Test
Expand Down
4 changes: 3 additions & 1 deletion allure-junit4/src/test/java/io/qameta/allure/junit4/samples/TaggedTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down