From 8cdc4fb44628f531894d33adc7cc74caa142a738 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Mon, 10 May 2021 12:20:04 +0000 Subject: [PATCH 01/11] set next development version 2.13.10 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9ebd5e23f..1022fe6b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.13.10 +version=2.14-SNAPSHOT org.gradle.daemon=true org.gradle.parallel=true From 156c656a7ef2c740efb71f32ed2dcd7ae9f35412 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Mon, 10 May 2021 16:50:32 +0300 Subject: [PATCH 02/11] update wf --- .github/workflows/build.yml | 31 +++++++++++++---------------- .github/workflows/labels-verify.yml | 2 +- .github/workflows/publish.yml | 14 ++++++++----- .github/workflows/release-draft.yml | 8 ++++---- .github/workflows/release.yml | 12 +++++++++-- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7334f99ef..35003690a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,27 +11,24 @@ on: - 'hotfix-*' jobs: - build_8: - name: "Build JDK 1.8" + build: + name: "Build" runs-on: ubuntu-latest + strategy: + matrix: + java-version: [ '8.0.x', '11.0.x' ] steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v2 - with: - distribution: 'zulu' - java-version: 8.0.x - - name: Build with Gradle - run: ./gradlew build - build_11: - name: "Build JDK 11" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 + + - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: 11.0.x + java-version: ${{ matrix.java-version }} + - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build -x test + + - name: Run tests + if: always() + run: ./gradlew test diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml index 2c3bd2a1f..077315bba 100644 --- a/.github/workflows/labels-verify.yml +++ b/.github/workflows/labels-verify.yml @@ -2,7 +2,7 @@ name: "Verify type labels" on: pull_request: - types: [opened, labeled, unlabeled, synchronize] + types: [ opened, labeled, unlabeled, synchronize ] jobs: triage: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f1e628065..d7aacdff3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,31 +2,35 @@ name: Publish on: release: - types: [published] + types: [ published ] jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Set up JDK 1.8 uses: actions/setup-java@v2 with: distribution: 'zulu' java-version: 8.0.x + - name: Set up GPG run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg env: GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + - name: "Gradle Build" run: ./gradlew build -Pversion=${GITHUB_REF:10} + - name: "Gradle Publish" run: | - ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \ - -Psigning.keyId=${GPG_KEY_ID} \ - -Psigning.password=${GPG_PASSPHRASE} \ - -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg + ./gradlew publishToSonatype -Pversion=${GITHUB_REF:10} \ + -Psigning.keyId=${GPG_KEY_ID} \ + -Psigning.password=${GPG_PASSPHRASE} \ + -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg env: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index caef7cf56..ea9ee55ca 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -3,12 +3,12 @@ name: Release Draft on: push: branches: - - master + - master jobs: update_draft_release: runs-on: ubuntu-latest steps: - - uses: toolmantim/release-drafter@v5.15.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - uses: toolmantim/release-drafter@v5.15.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47a3ff206..5afc8430b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,15 @@ jobs: - name: "Commit next development version and push it" run: | - git commit -am "set next development version ${{ github.event.inputs.releaseVersion }}" - git push origin master + git commit -am "set next development version ${{ github.event.inputs.nextVersion }}" + git push origin ${GITHUB_REF} + - name: "Publish Github Release" + uses: toolmantim/release-drafter@v5.15.0 + with: + tag: ${{ github.event.inputs.releaseVersion }} + publish: "true" + version: ${{ github.event.inputs.releaseVersion }} + env: + GITHUB_TOKEN: ${{ secrets.QAMETA_CI }} From dc2287257bef64fe375a7ac285c7587118af884c Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Tue, 11 May 2021 15:50:25 +0300 Subject: [PATCH 03/11] fix maven publish (via #579) --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 3cf7c43d0..f534a6363 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -217,6 +217,10 @@ configure(subprojects) { (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") } + tasks.withType { + enabled = false + } + publishing { publications { create("maven") { From f1252b9c45493e32fef29a33050336636a160e01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 13:41:33 +0300 Subject: [PATCH 04/11] bump actions/checkout from 2 to 2.3.4 (via #580) --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35003690a..86fcb6876 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: matrix: java-version: [ '8.0.x', '11.0.x' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d7aacdff3..02bf97606 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 - name: Set up JDK 1.8 uses: actions/setup-java@v2 From c5491518561525c93446432f96eb4575094f96a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 14:41:51 +0300 Subject: [PATCH 05/11] bump mockito-core from 3.9.0 to 3.10.0 (via #581) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f534a6363..cb2d62fa6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -97,7 +97,7 @@ configure(subprojects) { dependency("org.jboss.resteasy:resteasy-client:4.6.0.Final") dependency("org.jooq:joor-java-8:0.9.14") dependency("org.mock-server:mockserver-netty:5.11.2") - dependency("org.mockito:mockito-core:3.9.0") + dependency("org.mockito:mockito-core:3.10.0") dependencySet("org.slf4j:1.7.30") { entry("slf4j-api") entry("slf4j-nop") From d5d6530b0c8c48f68d48b6de164fca1ab3aaadb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 14:42:12 +0300 Subject: [PATCH 06/11] bump spring-web from 5.3.6 to 5.3.7 (via #582) --- allure-spring-web/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts index 754716507..a0a11301e 100644 --- a/allure-spring-web/build.gradle.kts +++ b/allure-spring-web/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure Spring Web Integration" val agent: Configuration by configurations.creating -val springWebVersion = "5.3.6" +val springWebVersion = "5.3.7" dependencies { agent("org.aspectj:aspectjweaver") From 9b8aef7878575ccfc67115f5786af232a74135ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 16:29:29 +0300 Subject: [PATCH 07/11] bump spotless-plugin-gradle from 5.12.4 to 5.12.5 (via #583) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index cb2d62fa6..b3acb11f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ buildscript { } dependencies { - classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.4") + classpath("com.diffplug.spotless:spotless-plugin-gradle:5.12.5") classpath("ru.vyarus:gradle-quality-plugin:4.6.0") } } From c6e476dbc0db14833a3346e2d1f559d0e572401b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 16:29:49 +0300 Subject: [PATCH 08/11] bump selenide from 5.20.4 to 5.21.0 (via #584) --- allure-selenide/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index c0b0b4e32..9248d6864 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure Selenide Integration" val agent: Configuration by configurations.creating -val selenideVersion = "5.20.4" +val selenideVersion = "5.21.0" dependencies { agent("org.aspectj:aspectjweaver") From 69af93b69357c0c429676d44a4dcfd5c61840ccf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 16:50:10 +0300 Subject: [PATCH 09/11] bump junit-bom from 5.7.1 to 5.7.2 (via #585) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b3acb11f9..0b42d4565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,7 +76,7 @@ configure(subprojects) { dependencyManagement { imports { mavenBom("com.fasterxml.jackson:jackson-bom:2.12.3") - mavenBom("org.junit:junit-bom:5.7.1") + mavenBom("org.junit:junit-bom:5.7.2") } dependencies { dependency("com.github.tomakehurst:wiremock:2.27.2") From dca807f415deb6604a4c433b15f1a1aee9e6cb6e Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Mon, 17 May 2021 19:43:19 +0300 Subject: [PATCH 10/11] fix testng tests execution order (via #578) --- .github/workflows/build.yml | 2 +- .../io/qameta/allure/test/AllureFeatures.java | 8 +++ .../io/qameta/allure/testng/AllureTestNg.java | 8 ++- .../allure/testng/AllureTestNgTestFilter.java | 35 +++++----- .../allure/testng/AllureTestNgTest.java | 49 +++++++++++--- .../allure/testng/samples/PriorityTests.java | 64 +++++++++++++++++++ 6 files changed, 138 insertions(+), 28 deletions(-) create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86fcb6876..2d2896536 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,4 +31,4 @@ jobs: - name: Run tests if: always() - run: ./gradlew test + run: ./gradlew --no-build-cache cleanTest test 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 6ae21bc43..d4641dcc8 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 @@ -230,4 +230,12 @@ @Feature("Filtration") @interface Filtration { } + + @Documented + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.METHOD, ElementType.TYPE}) + @Feature("Ordering") + @interface Ordering { + } } diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java index 9ac145202..9183a589b 100644 --- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java +++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java @@ -144,7 +144,8 @@ public class AllureTestNg implements private final AllureLifecycle lifecycle; private final AllureTestNgTestFilter testFilter; - public AllureTestNg(final AllureLifecycle lifecycle, final AllureTestNgTestFilter testFilter) { + public AllureTestNg(final AllureLifecycle lifecycle, + final AllureTestNgTestFilter testFilter) { this.lifecycle = lifecycle; this.testFilter = testFilter; } @@ -154,7 +155,7 @@ public AllureTestNg(final AllureLifecycle lifecycle) { } public AllureTestNg() { - this(Allure.getLifecycle(), new AllureTestNgTestFilter()); + this(Allure.getLifecycle()); } public AllureLifecycle getLifecycle() { @@ -162,7 +163,8 @@ public AllureLifecycle getLifecycle() { } @Override - public List intercept(final List methods, final ITestContext context) { + public List intercept(final List methods, + final ITestContext context) { return testFilter.intercept(methods, context); } diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java index b07ace62d..37047a919 100644 --- a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java +++ b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNgTestFilter.java @@ -20,18 +20,18 @@ import io.qameta.allure.testfilter.TestPlan; import io.qameta.allure.testfilter.TestPlanUnknown; import io.qameta.allure.testfilter.TestPlanV1_0; - -import java.lang.reflect.Method; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - import org.testng.IMethodInstance; import org.testng.IMethodInterceptor; import org.testng.ITestContext; import org.testng.ITestNGMethod; import org.testng.internal.ConstructorOrMethod; +import java.lang.reflect.Method; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + public class AllureTestNgTestFilter implements IMethodInterceptor { private final TestPlan testPlan; @@ -46,18 +46,23 @@ public AllureTestNgTestFilter(final TestPlan testPlan) { @Override public List intercept(final List methods, final ITestContext context) { - if (testPlan instanceof TestPlanV1_0) { - return methods.stream() - .filter(instance -> isSelected(instance.getMethod())) - .collect(Collectors.toList()); - } else { - return methods; - } + return methods.stream() + .filter(this::isSelected) + .sorted(Comparator.comparing( + IMethodInstance::getMethod, + Comparator.nullsFirst(Comparator.comparingInt( + ITestNGMethod::getPriority + )))) + .collect(Collectors.toList()); + } + + public boolean isSelected(final IMethodInstance instance) { + return isSelected(instance.getMethod()); } - public boolean isSelected(final ITestNGMethod instance) { + public boolean isSelected(final ITestNGMethod method) { if (testPlan instanceof TestPlanV1_0) { - return isSelected(instance, (TestPlanV1_0) testPlan); + return isSelected(method, (TestPlanV1_0) testPlan); } else { return true; } 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 index ccbc6b670..7a4ebe266 100644 --- a/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java +++ b/allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java @@ -38,6 +38,7 @@ import io.qameta.allure.test.AllureResultsWriterStub; import io.qameta.allure.testfilter.TestPlan; import io.qameta.allure.testfilter.TestPlanV1_0; +import io.qameta.allure.testng.samples.PriorityTests; import io.qameta.allure.testng.samples.TestsWithIdForFilter; import org.assertj.core.api.Condition; import org.assertj.core.groups.Tuple; @@ -50,6 +51,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Collection; +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -434,11 +436,20 @@ public void skippedSuiteTest() { List testContainers = results.getTestResultContainers(); assertThat(testResults) .extracting(TestResult::getName, TestResult::getStatus) - .contains( + .containsExactlyInAnyOrder( tuple("skippedTest", Status.SKIPPED), + tuple("skipSuite", Status.BROKEN), tuple("testWithOneStep", Status.SKIPPED) ); - assertThat(testContainers).as("Unexpected quantity of testng containers has been written").hasSize(4); + assertThat(testContainers) + .as("Unexpected quantity of testng containers has been written") + .extracting(TestResultContainer::getName) + .containsExactlyInAnyOrder( + "Test tag 8", + "Test suite 8", + "io.qameta.allure.testng.samples.SkippedSuite", + "io.qameta.allure.testng.samples.TestsWithSteps" + ); assertThat(findTestContainerByName(results, "Test suite 8").getBefores()) .as("Before suite container should have a before method with one step") @@ -677,7 +688,7 @@ public void ownerTest() { .filter(label -> "owner".equals(label.getName())) .map(Label::getValue) .sorted() - .collect(Collectors.joining(",","[","]")) + .collect(Collectors.joining(",", "[", "]")) ) .containsExactlyInAnyOrder( tuple("io.qameta.allure.testng.samples.OwnerMethodTest.testWithOwner", "[charlie]"), @@ -1141,8 +1152,6 @@ public Object[][] failedFixtures() { @Test(dataProvider = "failedFixtures") @AllureFeatures.Fixtures public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final String fixture) { - System.out.println(suite); - System.out.println(fixture); final AllureResults results = runTestNgSuites(suite); final Optional result = results.getTestResults().stream() .filter(r -> r.getName().contains(fixture)) @@ -1156,6 +1165,19 @@ public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final Str .contains(result.get().getUuid()); } + @Test + @AllureFeatures.Ordering + public void shouldOrderTests() { + final AllureResults results = runTestPlan(null, PriorityTests.class); + final List ordered = results.getTestResults().stream() + .sorted(Comparator.comparing(this::getOrderParameter)) + .map(TestResult::getName) + .collect(Collectors.toList()); + System.out.println(Arrays.toString(ordered.toArray())); + assertThat(ordered) + .containsExactly("zTest", "yTest", "xTest", "wTest", "vTest", "vTest"); + } + @Step("Run testng suites {suites}") private AllureResults runTestNgSuites(final Consumer configurer, final String... suites) { @@ -1338,7 +1360,7 @@ private static void checkTestJavadocDescriptions(List results, Strin @Test @AllureFeatures.Filtration - public void simpleFiltration() { + public void simpleFiltration() { TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(test1, test2, test3)); List testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults(); @@ -1354,7 +1376,7 @@ public void simpleFiltration() { @Test @AllureFeatures.Filtration - public void onlyId() { + public void onlyId() { TestPlanV1_0 plan = new TestPlanV1_0().setTests(Arrays.asList(onlyId2, onlyId4)); List testResults = runTestPlan(plan, TestsWithIdForFilter.class).getTestResults(); @@ -1397,7 +1419,7 @@ public void skippedTest() { @Test @AllureFeatures.Filtration - public void correctIdIncorrectSelector() { + public void correctIdIncorrectSelector() { TestPlanV1_0 plan = new TestPlanV1_0().setTests( Arrays.asList(test1, test2, correctIdIncorrectSelector, correctIdIncorrectSelectorFailed) ); @@ -1413,7 +1435,7 @@ public void correctIdIncorrectSelector() { ); } - public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class ... testClasses) { + public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class... testClasses) { final AllureResultsWriterStub results = new AllureResultsWriterStub(); final AllureLifecycle lifecycle = new AllureLifecycle(results); final AllureTestNg adapter = new AllureTestNg(lifecycle, new AllureTestNgTestFilter(plan)); @@ -1437,4 +1459,13 @@ public AllureResultsWriterStub runTestPlan(TestPlan plan, final Class ... tes } } + private Integer getOrderParameter(final TestResult result) { + return result.getParameters().stream() + .filter(p -> p.getName().equals("order")) + .map(Parameter::getValue) + .map(Integer::parseInt) + .findAny() + .orElse(0); + } + } diff --git a/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java new file mode 100644 index 000000000..43997cbdf --- /dev/null +++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java @@ -0,0 +1,64 @@ +/* + * Copyright 2021 Qameta Software OÜ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.qameta.allure.testng.samples; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import java.util.concurrent.atomic.AtomicInteger; + +import static io.qameta.allure.Allure.parameter; + +public class PriorityTests { + + private final static String ORDER_PARAMETER = "order"; + + private final AtomicInteger cnt = new AtomicInteger(); + + @DataProvider(name = "someProvider") + public static Object[][] someProvider() { + return new Object[][]{ + new Object[]{1}, + new Object[]{2} + }; + } + + @Test(dataProvider = "someProvider", priority = 4) + public void vTest(int parameter) { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); + } + + @Test(priority = 3) + public void wTest() { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); + } + + @Test(priority = 2) + public void xTest() { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); + } + + @Test(priority = 1) + public void yTest() { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); + } + + @Test + public void zTest() { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); + } + +} From 4ac3b92c92227ce3133f4d91bcd8eb08b4ebe136 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Thu, 20 May 2021 17:48:25 +0000 Subject: [PATCH 11/11] release 2.14.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1022fe6b1..b7700f216 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.14-SNAPSHOT +version=2.14.0 org.gradle.daemon=true org.gradle.parallel=true