From 9f8468279e4204a9afdaf59c58d7a787357a7554 Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Mon, 10 May 2021 20:08:20 +0300 Subject: [PATCH 1/7] fix test ordering --- .../io/qameta/allure/test/AllureFeatures.java | 8 +++++++ allure-testng/build.gradle.kts | 2 +- .../allure/testng/AllureTestNgTestFilter.java | 12 +++++----- .../allure/testng/AllureTestNgTest.java | 17 ++++++++++++-- .../allure/testng/samples/PriorityTests.java | 22 +++++++++++++++++++ .../src/test/resources/suites/priority.xml | 10 +++++++++ 6 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java create mode 100644 allure-testng/src/test/resources/suites/priority.xml 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/build.gradle.kts b/allure-testng/build.gradle.kts index f6b2d0107..d1f3d32a3 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -2,7 +2,7 @@ description = "Allure TestNG Integration" val agent: Configuration by configurations.creating -val testNgVersion = "6.14.3" +val testNgVersion = "7.4.0" dependencies { agent("org.aspectj:aspectjweaver") 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..6d11a2454 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 @@ -22,9 +22,11 @@ import io.qameta.allure.testfilter.TestPlanV1_0; import java.lang.reflect.Method; +import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.testng.IMethodInstance; import org.testng.IMethodInterceptor; @@ -46,13 +48,13 @@ public AllureTestNgTestFilter(final TestPlan testPlan) { @Override public List intercept(final List methods, final ITestContext context) { + Stream stream = methods.stream(); if (testPlan instanceof TestPlanV1_0) { - return methods.stream() - .filter(instance -> isSelected(instance.getMethod())) - .collect(Collectors.toList()); - } else { - return methods; + stream = stream.filter(instance -> isSelected(instance.getMethod())); } + return stream + .sorted(Comparator.comparingInt(s -> s.getMethod().getPriority())) + .collect(Collectors.toList()); } public boolean isSelected(final ITestNGMethod instance) { 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..ce0142df9 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; @@ -1141,8 +1143,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 +1156,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((o1, o2) -> (int) (o1.getStart() - o2.getStart())) + .map(TestResult::getName) + .collect(Collectors.toList()); + System.out.println(Arrays.toString(ordered.toArray())); + assertThat(ordered) + .containsExactly("wTest", "zTest", "yTest", "xTest"); + } + @Step("Run testng suites {suites}") private AllureResults runTestNgSuites(final Consumer configurer, final String... suites) { 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..58d2e7d12 --- /dev/null +++ b/allure-testng/src/test/java/io/qameta/allure/testng/samples/PriorityTests.java @@ -0,0 +1,22 @@ +package io.qameta.allure.testng.samples; + +import org.testng.annotations.Test; + +public class PriorityTests { + + @Test + public void wTest() { + } + @Test(priority = 3) + public void xTest() { + } + + @Test(priority = 2) + public void yTest() { + } + + @Test(priority = 1) + public void zTest() { + } + +} diff --git a/allure-testng/src/test/resources/suites/priority.xml b/allure-testng/src/test/resources/suites/priority.xml new file mode 100644 index 000000000..388f824de --- /dev/null +++ b/allure-testng/src/test/resources/suites/priority.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 47d7f59a85ba918e3208aed533ffe0771a2a191a Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Mon, 10 May 2021 20:10:25 +0300 Subject: [PATCH 2/7] little fixes --- .../io/qameta/allure/testng/samples/PriorityTests.java | 1 + allure-testng/src/test/resources/suites/priority.xml | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 allure-testng/src/test/resources/suites/priority.xml 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 index 58d2e7d12..34120fb1d 100644 --- 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 @@ -7,6 +7,7 @@ public class PriorityTests { @Test public void wTest() { } + @Test(priority = 3) public void xTest() { } diff --git a/allure-testng/src/test/resources/suites/priority.xml b/allure-testng/src/test/resources/suites/priority.xml deleted file mode 100644 index 388f824de..000000000 --- a/allure-testng/src/test/resources/suites/priority.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - From 76cc2b7b3c3250bf4caedc6d87f427aed4345c32 Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Mon, 10 May 2021 20:34:22 +0300 Subject: [PATCH 3/7] add parameterized test --- .../allure/testng/AllureTestNgTest.java | 33 +++++++++++++---- .../allure/testng/samples/PriorityTests.java | 36 ++++++++++++++++--- 2 files changed, 57 insertions(+), 12 deletions(-) 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 ce0142df9..8572c36a0 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 @@ -56,6 +56,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; +import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -679,7 +680,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]"), @@ -1161,12 +1162,12 @@ public void shouldAddBeforeFixtureToFakeTestResult(final String suite, final Str public void shouldOrderTests() { final AllureResults results = runTestPlan(null, PriorityTests.class); final List ordered = results.getTestResults().stream() - .sorted((o1, o2) -> (int) (o1.getStart() - o2.getStart())) + .sorted(Comparator.comparing(this::getOrderParameter)) .map(TestResult::getName) .collect(Collectors.toList()); System.out.println(Arrays.toString(ordered.toArray())); assertThat(ordered) - .containsExactly("wTest", "zTest", "yTest", "xTest"); + .containsExactly("zTest", "yTest", "xTest", "wTest", "vTest", "vTest"); } @Step("Run testng suites {suites}") @@ -1351,7 +1352,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(); @@ -1367,7 +1368,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(); @@ -1410,7 +1411,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) ); @@ -1426,7 +1427,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)); @@ -1450,4 +1451,22 @@ 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); + } + + private Function byOrderParameter() { + return new Function() { + @Override + public Integer apply(TestResult result) { + return null; + } + }; + } + } 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 index 34120fb1d..9a01d3258 100644 --- 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 @@ -1,23 +1,49 @@ 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 { - @Test - public void wTest() { + 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 xTest() { + public void wTest() { + parameter(ORDER_PARAMETER, cnt.incrementAndGet()); } @Test(priority = 2) - public void yTest() { + 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 8eeb46ef2528148130391d097bd973c5590e12fc Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Mon, 10 May 2021 20:38:43 +0300 Subject: [PATCH 4/7] check for null --- .../java/io/qameta/allure/testng/AllureTestNgTestFilter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 6d11a2454..d5fb5d45b 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 @@ -24,6 +24,7 @@ import java.lang.reflect.Method; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -53,7 +54,8 @@ public List intercept(final List methods, fina stream = stream.filter(instance -> isSelected(instance.getMethod())); } return stream - .sorted(Comparator.comparingInt(s -> s.getMethod().getPriority())) + .filter(m -> Objects.nonNull(m.getMethod())) + .sorted(Comparator.comparingInt(m -> m.getMethod().getPriority())) .collect(Collectors.toList()); } From 089789ff712b604230ef2c905f57d5a6cdcfeeb3 Mon Sep 17 00:00:00 2001 From: Artem Eroshenko Date: Wed, 12 May 2021 14:29:20 +0300 Subject: [PATCH 5/7] fix tests --- .../src/test/java/io/qameta/allure/testng/AllureTestNgTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8572c36a0..02ddff12e 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 @@ -441,7 +441,7 @@ public void skippedSuiteTest() { tuple("skippedTest", Status.SKIPPED), 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").hasSize(5); assertThat(findTestContainerByName(results, "Test suite 8").getBefores()) .as("Before suite container should have a before method with one step") From ec2a67ac884b16c7ea01308425cdf2ca7563f967 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Mon, 17 May 2021 18:06:57 +0300 Subject: [PATCH 6/7] ok then --- allure-testng/build.gradle.kts | 16 ++++++++- .../io/qameta/allure/testng/AllureTestNg.java | 8 +++-- .../allure/testng/AllureTestNgTestFilter.java | 35 ++++++++++--------- .../allure/testng/AllureTestNgTest.java | 23 ++++++------ .../allure/testng/samples/PriorityTests.java | 15 ++++++++ 5 files changed, 64 insertions(+), 33 deletions(-) diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts index d1f3d32a3..b8a8f2cc2 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -2,7 +2,8 @@ description = "Allure TestNG Integration" val agent: Configuration by configurations.creating -val testNgVersion = "7.4.0" +val testNgVersion = "6.14.3" +val latestTestNgVersion = "7.4.0" dependencies { agent("org.aspectj:aspectjweaver") @@ -39,6 +40,19 @@ tasks.test { } } +val taskSuffix = latestTestNgVersion.replace('.', '_') + +tasks.create("test_$taskSuffix", GradleBuild::class) { + buildName = "allure-testng-$taskSuffix" + startParameter = project.gradle.startParameter.newInstance() + startParameter.projectProperties["testNgVersion"] = latestTestNgVersion + tasks = listOf("test") +} + +tasks.check { + dependsOn("test_$taskSuffix") +} + val spiOffJar: Jar by tasks.creating(Jar::class) { from(sourceSets.getByName("main").output) archiveClassifier.set("spi-off") 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 d5fb5d45b..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,20 +20,17 @@ import io.qameta.allure.testfilter.TestPlan; import io.qameta.allure.testfilter.TestPlanUnknown; import io.qameta.allure.testfilter.TestPlanV1_0; +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.Objects; import java.util.Optional; import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.testng.IMethodInstance; -import org.testng.IMethodInterceptor; -import org.testng.ITestContext; -import org.testng.ITestNGMethod; -import org.testng.internal.ConstructorOrMethod; public class AllureTestNgTestFilter implements IMethodInterceptor { @@ -49,19 +46,23 @@ public AllureTestNgTestFilter(final TestPlan testPlan) { @Override public List intercept(final List methods, final ITestContext context) { - Stream stream = methods.stream(); - if (testPlan instanceof TestPlanV1_0) { - stream = stream.filter(instance -> isSelected(instance.getMethod())); - } - return stream - .filter(m -> Objects.nonNull(m.getMethod())) - .sorted(Comparator.comparingInt(m -> m.getMethod().getPriority())) + return methods.stream() + .filter(this::isSelected) + .sorted(Comparator.comparing( + IMethodInstance::getMethod, + Comparator.nullsFirst(Comparator.comparingInt( + ITestNGMethod::getPriority + )))) .collect(Collectors.toList()); } - public boolean isSelected(final ITestNGMethod instance) { + public boolean isSelected(final IMethodInstance instance) { + return isSelected(instance.getMethod()); + } + + 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 02ddff12e..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 @@ -56,7 +56,6 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; -import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -437,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(5); + 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") @@ -1460,13 +1468,4 @@ private Integer getOrderParameter(final TestResult result) { .orElse(0); } - private Function byOrderParameter() { - return new Function() { - @Override - public Integer apply(TestResult result) { - return null; - } - }; - } - } 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 index 9a01d3258..43997cbdf 100644 --- 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 @@ -1,3 +1,18 @@ +/* + * 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; From be146ee1aab21747b77279e38f9c6b73d00140e9 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Mon, 17 May 2021 19:28:50 +0300 Subject: [PATCH 7/7] fix build --- .github/workflows/build.yml | 2 +- allure-testng/build.gradle.kts | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35003690a..b59c84944 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-testng/build.gradle.kts b/allure-testng/build.gradle.kts index b8a8f2cc2..f6b2d0107 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -3,7 +3,6 @@ description = "Allure TestNG Integration" val agent: Configuration by configurations.creating val testNgVersion = "6.14.3" -val latestTestNgVersion = "7.4.0" dependencies { agent("org.aspectj:aspectjweaver") @@ -40,19 +39,6 @@ tasks.test { } } -val taskSuffix = latestTestNgVersion.replace('.', '_') - -tasks.create("test_$taskSuffix", GradleBuild::class) { - buildName = "allure-testng-$taskSuffix" - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["testNgVersion"] = latestTestNgVersion - tasks = listOf("test") -} - -tasks.check { - dependsOn("test_$taskSuffix") -} - val spiOffJar: Jar by tasks.creating(Jar::class) { from(sourceSets.getByName("main").output) archiveClassifier.set("spi-off")