Rewriting testing utilities to use jupiter engine

README.adoc

@@ -1,7 +1,7 @@
 = sshj - SSHv2 library for Java
 Jeroen van Erp
 :sshj_groupid: com.hierynomus
-:sshj_version: 0.32.0
+:sshj_version: 0.36.0
 :source-highlighter: pygments
 
 image:https://github.com/hierynomus/sshj/actions/workflows/gradle.yml/badge.svg[link="https://github.com/hierynomus/sshj/actions/workflows/gradle.yml"]
@@ -108,6 +108,12 @@ Issue tracker: https://github.com/hierynomus/sshj/issues
 Fork away!
 
 == Release history
+SSHJ 0.36.0 (2023-07-14)::
+* Merged https://github.com/hierynomus/sshj/pull/874[#874]: Java 8 minimum version + dependency upgrades
+* Merged https://github.com/hierynomus/sshj/pull/876[#876]: Change `newStatefulSFTPClient` to return `StatefulSFTPClient`
+* Merged https://github.com/hierynomus/sshj/pull/860[#860]: Upgrade to Gradle 7.6.1
+* Merged https://github.com/hierynomus/sshj/pull/838[#838]: Replaced Curve25519 class with X25519 Key agreement
+* Merged https://github.com/hierynomus/sshj/pull/772[#772]: Remove dependency on jzlib
 SSHJ 0.35.0 (2023-01-30)::
 * Merged https://github.com/hierynomus/sshj/pull/835[#835]: TimeoutException message improved
 * Merged https://github.com/hierynomus/sshj/pull/815[#815]: Support authPassword on FreeBSD

build.gradle

@@ -1,25 +1,27 @@
 plugins {
   id "java"
+  id "jvm-test-suite"
   id "groovy"
   id "jacoco"
   id "com.github.blindpirate.osgi" version '0.0.6'
   id "maven-publish"
   id "signing"
-  id 'pl.allegro.tech.build.axion-release' version '1.13.3'
-  id "com.bmuschko.docker-remote-api" version "7.1.0"
+  id 'pl.allegro.tech.build.axion-release' version '1.15.3'
   id "com.github.hierynomus.license" version "0.16.1"
-  id 'ru.vyarus.github-info' version '1.2.0'
-  id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
+  id "com.bmuschko.docker-remote-api" version "9.2.1"
+  id 'ru.vyarus.github-info' version '1.5.0'
+  id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
 }
 
+group = "com.hierynomus"
+ext.moduleName = "${project.group}.${project.name}"
+
+defaultTasks "build"
+
 repositories {
   mavenCentral()
 }
 
-group = "com.hierynomus"
-defaultTasks ["build"]
-ext.moduleName = "${project.group}.${project.name}"
-
 scmVersion {
   tag {
     prefix = 'v'
@@ -33,6 +35,10 @@ scmVersion {
 
 project.version = scmVersion.version
 
+compileJava {
+  options.release = 8
+}
+
 configurations.implementation.transitive = false
 
 def bouncycastleVersion = "1.75"
@@ -44,20 +50,6 @@ dependencies {
   implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
   implementation "com.hierynomus:asn-one:0.6.0"
   implementation "net.i2p.crypto:eddsa:0.3.0"
-
-  testImplementation(platform("org.junit:junit-bom:5.9.3"))
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
-  testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
-  testImplementation 'org.spockframework:spock-junit4:2.3-groovy-3.0'
-  testImplementation "org.mockito:mockito-core:4.11.0"
-  testImplementation "org.apache.sshd:sshd-core:$sshdVersion"
-  testImplementation "org.apache.sshd:sshd-sftp:$sshdVersion"
-  testImplementation "org.apache.sshd:sshd-scp:$sshdVersion"
-  testImplementation "ch.qos.logback:logback-classic:1.3.8"
-  testImplementation 'org.glassfish.grizzly:grizzly-http-server:3.0.1'
-  testImplementation 'org.testcontainers:testcontainers:1.18.3'
 }
 
 license {
@@ -73,6 +65,11 @@ license {
   ])
 }
 
+java {
+	withJavadocJar()
+	withSourcesJar()
+}
+
 if (!JavaVersion.current().isJava9Compatible()) {
   throw new GradleScriptException("Minimum compilation version is Java 9")
 }
@@ -84,10 +81,80 @@ if (JavaVersion.current().isJava8Compatible()) {
   }
 }
 
-compileJava {
-  options.compilerArgs.addAll(['--release', '8'])
+testing {
+  suites {
+    configureEach {
+      useJUnitJupiter()
+      dependencies {
+        implementation "org.slf4j:slf4j-api:2.0.7"
+        implementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+        implementation "org.mockito:mockito-core:4.11.0"
+        implementation "ru.vyarus:spock-junit5:1.2.0"
+        implementation "org.apache.sshd:sshd-core:$sshdVersion"
+        implementation "org.apache.sshd:sshd-sftp:$sshdVersion"
+        implementation "org.apache.sshd:sshd-scp:$sshdVersion"
+        implementation "ch.qos.logback:logback-classic:1.3.8"
+        implementation 'org.glassfish.grizzly:grizzly-http-server:3.0.1'
+      }
+
+      targets {
+        all {
+          testTask.configure {
+            testLogging {
+              exceptionFormat = 'full'
+            }
+            include "**/*Test.*"
+            include "**/*Spec.*"
+            afterSuite { descriptor, result ->
+              def indicator = "\u001B[32m✓\u001b[0m"
+              if (result.failedTestCount > 0) {
+                indicator = "\u001B[31m✘\u001b[0m"
+              }
+              logger.lifecycle("$indicator Test ${descriptor.name}; Executed: ${result.testCount}/\u001B[32m${result.successfulTestCount}\u001B[0m/\u001B[31m${result.failedTestCount}\u001B[0m")
+            }
+          }
+        }
+      }
+    }
+
+    test {
+      sources {
+        groovy {
+          srcDirs = ['src/test/groovy']
+        }
+      }
+    }
+
+    integrationTest(JvmTestSuite) {
+      dependencies {
+        implementation project()
+        implementation 'org.testcontainers:testcontainers:1.18.3'
+        implementation 'org.testcontainers:junit-jupiter:1.18.3'
+      }
+
+      sources {
+        groovy {
+          srcDirs = ['src/itest/groovy']
+        }
+
+        resources {
+          srcDirs = ['src/itest/resources']
+        }
+      }
+
+      targets {
+        all {
+          testTask.configure {
+            shouldRunAfter(test)
+          }
+        }
+      }
+    }
+  }
 }
 
+project.tasks.compileGroovy.onlyIf { false }
+
 task writeSshjVersionProperties {
   doLast {
     project.file("${project.buildDir}/resources/main").mkdirs()
@@ -121,11 +188,6 @@ jar {
   }
 }
 
-java {
-	withJavadocJar()
-	withSourcesJar()
-}
-
 sourcesJar {
   manifest {
     attributes(
@@ -139,46 +201,6 @@ sourcesJar {
   }
 }
 
-configurations {
-  integrationTestImplementation.extendsFrom testImplementation
-  integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
-}
-
-sourceSets {
-  integrationTest {
-    groovy {
-      compileClasspath += sourceSets.main.output + sourceSets.test.output
-      runtimeClasspath += sourceSets.main.output + sourceSets.test.output
-      srcDir file('src/itest/groovy')
-    }
-    resources.srcDir file('src/itest/resources')
-  }
-}
-
-task integrationTest(type: Test) {
-  testClassesDirs = sourceSets.integrationTest.output.classesDirs
-  classpath = sourceSets.integrationTest.runtimeClasspath
-}
-
-tasks.withType(Test) {
-  testLogging {
-    exceptionFormat = 'full'
-  }
-  useJUnitPlatform()
-
-  afterSuite { descriptor, result ->
-    if (descriptor.className != null) {
-      def indicator = "\u001B[32m✓\u001b[0m"
-      if (result.failedTestCount > 0) {
-        indicator = "\u001B[31m✘\u001b[0m"
-      }
-      logger.lifecycle("$indicator Test ${descriptor.name}; Executed: ${result.testCount}/\u001B[32m${result.successfulTestCount}\u001B[0m/\u001B[31m${result.failedTestCount}\u001B[0m")
-    }
-  }
-}
-
-project.tasks.compileGroovy.onlyIf { false }
-
 github {
   user 'hierynomus'
   license 'Apache'
@@ -264,17 +286,11 @@ nexusPublishing {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled true
+        xml.required = true
+        html.required = true
     }
 }
 
-task forkedUploadRelease(type: GradleBuild) {
-  buildFile = project.buildFile
-  tasks = ["clean", "publishToSonatype", "closeAndReleaseSonatypeStagingRepository"]
-}
-
 project.tasks.release.dependsOn([project.tasks.integrationTest, project.tasks.build])
-project.tasks.release.finalizedBy(project.tasks.forkedUploadRelease)
 project.tasks.jacocoTestReport.dependsOn(project.tasks.test)
 project.tasks.check.dependsOn(project.tasks.jacocoTestReport)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/itest/groovy/com/hierynomus/sshj/IntegrationSpec.groovy

@@ -20,15 +20,17 @@ import net.schmizz.sshj.DefaultConfig
 import net.schmizz.sshj.SSHClient
 import net.schmizz.sshj.transport.TransportException
 import net.schmizz.sshj.userauth.UserAuthException
-import org.junit.ClassRule
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
 
+@Testcontainers
 class IntegrationSpec extends Specification {
     @Shared
-    @ClassRule
-    SshdContainer sshd
+    @Container
+    static SshdContainer sshd = new SshdContainer()
 
     @Unroll
     def "should accept correct key for #signatureName"() {

src/itest/groovy/com/hierynomus/sshj/sftp/FileWriteSpec.groovy

@@ -15,24 +15,27 @@
  */
 package com.hierynomus.sshj.sftp
 
-import com.hierynomus.sshj.IntegrationTestUtil
+
 import com.hierynomus.sshj.SshdContainer
 import net.schmizz.sshj.SSHClient
 import net.schmizz.sshj.sftp.OpenMode
 import net.schmizz.sshj.sftp.RemoteFile
 import net.schmizz.sshj.sftp.SFTPClient
 import org.junit.ClassRule
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import spock.lang.Shared
 import spock.lang.Specification
 
 import java.nio.charset.StandardCharsets
 
 import static org.codehaus.groovy.runtime.IOGroovyMethods.withCloseable
 
+@Testcontainers
 class FileWriteSpec extends Specification {
     @Shared
-    @ClassRule
-    SshdContainer sshd
+    @Container
+    static SshdContainer sshd = new SshdContainer()
 
     def "should append to file (GH issue #390)"() {
         given:

src/itest/groovy/com/hierynomus/sshj/signature/PublicKeyAuthWithCertificateSpec.groovy

@@ -19,7 +19,8 @@ import com.hierynomus.sshj.SshdContainer
 import net.schmizz.sshj.DefaultConfig
 import net.schmizz.sshj.SSHClient
 import net.schmizz.sshj.transport.verification.PromiscuousVerifier
-import org.junit.ClassRule
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -29,10 +30,11 @@ import spock.lang.Unroll
  *
  * Also, take a look at the unit test {@link net.schmizz.sshj.transport.verification.KeyWithCertificateUnitSpec}.
  */
+@Testcontainers
 class PublicKeyAuthWithCertificateSpec extends Specification {
     @Shared
-    @ClassRule
-    SshdContainer sshd
+    @Container
+    static SshdContainer sshd = new SshdContainer()
 
     @Unroll
     def "authorising with a signed public key #keyName"() {

src/itest/groovy/com/hierynomus/sshj/signature/RsaSignatureClientKeySpec.groovy

@@ -17,15 +17,17 @@ package com.hierynomus.sshj.signature
 
 import com.hierynomus.sshj.IntegrationTestUtil
 import com.hierynomus.sshj.SshdContainer
-import org.junit.ClassRule
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
 
+@Testcontainers
 class RsaSignatureClientKeySpec extends Specification {
     @Shared
-    @ClassRule
-    SshdContainer sshd
+    @Container
+    static SshdContainer sshd = new SshdContainer()
 
     @Unroll
     def "should correctly connect using publickey auth with RSA key with signature"() {

src/itest/groovy/com/hierynomus/sshj/signature/SignatureSpec.groovy

@@ -19,15 +19,17 @@ import com.hierynomus.sshj.IntegrationTestUtil
 import com.hierynomus.sshj.SshdContainer
 import com.hierynomus.sshj.key.KeyAlgorithms
 import net.schmizz.sshj.DefaultConfig
-import org.junit.ClassRule
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
 
+@Testcontainers
 class SignatureSpec extends Specification {
     @Shared
-    @ClassRule
-    SshdContainer sshd
+    @Container
+    static SshdContainer sshd = new SshdContainer()
 
     @Unroll
     def "should correctly connect with #sig Signature"() {