diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml index d3067e48a..3f14112bd 100644 --- a/.github/workflows/labels-verify.yml +++ b/.github/workflows/labels-verify.yml @@ -10,4 +10,4 @@ jobs: steps: - uses: zwaldowski/match-label-action@v2 with: - allowed: 'type:bug, type:enhancement, type:improvement, type:dependencies, type:internal, type:invalid' + allowed: 'type:bug, type:new feature, type:improvement, type:dependencies, type:internal, type:invalid' diff --git a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java index 53a040a09..6ae21bc43 100644 --- a/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java +++ b/allure-java-commons-test/src/main/java/io/qameta/allure/test/AllureFeatures.java @@ -222,4 +222,12 @@ @Feature("Timeline") @interface Severity { } + + @Documented + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.METHOD, ElementType.TYPE}) + @Feature("Filtration") + @interface Filtration { + } } diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts index 82528cfc2..a4b970826 100644 --- a/allure-junit-platform/build.gradle.kts +++ b/allure-junit-platform/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { api(project(":allure-java-commons")) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.platform:junit-platform-launcher") + implementation(project(":allure-test-filter")) testAnnotationProcessor("org.slf4j:slf4j-simple") testAnnotationProcessor(project(":allure-descriptions-javadoc")) testImplementation("io.github.glytching:junit-extensions") diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java index 60dc36185..10ff7c5e8 100644 --- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java +++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java @@ -359,8 +359,10 @@ private void startTestCase(final TestIdentifier testIdentifier) { final String uuid = tests.getOrCreate(testIdentifier); final Optional testSource = testIdentifier.getSource(); - final Optional testMethod = testSource.flatMap(this::getTestMethod); - final Optional> testClass = testSource.flatMap(this::getTestClass); + final Optional testMethod = testSource + .flatMap(AllureJunitPlatformUtils::getTestMethod); + final Optional> testClass = testSource + .flatMap(AllureJunitPlatformUtils::getTestClass); final TestResult result = new TestResult() .setUuid(uuid) @@ -384,7 +386,7 @@ private void startTestCase(final TestIdentifier testIdentifier) { createLanguageLabel("java") )); - testSource.flatMap(this::getFullName).ifPresent(result::setFullName); + testSource.flatMap(AllureJunitPlatformUtils::getFullName).ifPresent(result::setFullName); testSource.map(this::getSourceLabels).ifPresent(result.getLabels()::addAll); testClass.ifPresent(aClass -> { final String suiteName = getDisplayName(aClass).orElse(aClass.getCanonicalName()); @@ -508,56 +510,6 @@ private List