Merge branch 'main' into fix/parameter-index-out-of-bounds-suspend-kotlin

Author: denysgaievskyi

allure-testng/build.gradle.kts

@@ -1,6 +1,6 @@
-description = "Allure TestNG Integration"
+description = "Allure TestNG 7 Integration"
 
-val testNgVersion = "6.14.3"
+val testNgVersion = "7.11.0"
 
 dependencies {
     api(project(":allure-java-commons"))
@@ -34,6 +34,10 @@ tasks.test {
     exclude("**/samples/*")
 }
 
+tasks.withType(JavaCompile::class) {
+    options.release.set(11)
+}
+
 val spiOffJar: Jar by tasks.creating(Jar::class) {
     from(sourceSets.getByName("main").output)
     archiveClassifier.set("spi-off")

allure-testng/src/main/services/org.testng.ITestNGListener

@@ -1 +1 @@
-io.qameta.allure.testng.AllureTestNg
+io.qameta.allure.testng.AllureTestNg

allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java

@@ -476,7 +476,8 @@ public void skippedSuiteTest() {
                         "Test tag 8",
                         "Test suite 8",
                         "io.qameta.allure.testng.samples.SkippedSuite",
-                        "io.qameta.allure.testng.samples.TestsWithSteps"
+                        "io.qameta.allure.testng.samples.TestsWithSteps",
+                        "io.qameta.allure.testng.samples.SkippedSuite.skippedBeforeMethod"
                 );
 
         assertThat(findTestContainerByName(results, "Test suite 8").getBefores())
@@ -802,7 +803,8 @@ public void shouldGenerateSameHistoryIdForTheSameTests() {
         final List<TestResult> testResults = results.getTestResults();
         assertThat(testResults)
                 .extracting(TestResult::getHistoryId)
-                .containsExactlyInAnyOrder("45e3e2818aabf660b03908be12ba64f7", "45e3e2818aabf660b03908be12ba64f7");
+                .hasSize(2)
+                .containsOnly("45e3e2818aabf660b03908be12ba64f7");
     }
 
     @SuppressWarnings("unchecked")