Skip to content

Commit

Permalink
Fixed itests for missing docker container
Browse files Browse the repository at this point in the history
Migrated all tests to junit5

Signed-off-by: Jeroen van Erp <jeroen@hierynomus.com>
  • Loading branch information
hierynomus committed Sep 1, 2023
1 parent 3069138 commit a0bab10
Show file tree
Hide file tree
Showing 32 changed files with 936 additions and 1,054 deletions.
1 change: 1 addition & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ Fork away!

== Release history
SSHJ 0.36.0 (2023-07-18)::
* Merged https://github.com/hierynomus/sshj/pull/861[#861]: Add DefaultSecurityProviderConfig with has BouncyCastle disabled
* Merged https://github.com/hierynomus/sshj/pull/881[#881]: Rewrote test classes to JUnit Jupiter engine
* Merged https://github.com/hierynomus/sshj/pull/880[#880]: Removed Java 7 backport Socket utilities
* Merged https://github.com/hierynomus/sshj/pull/879[#879]: Replaced custom Base64 with java.util.Base64
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ testing {
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 "org.assertj:assertj-core:3.24.2"
implementation "ru.vyarus:spock-junit5:1.2.0"
implementation "org.apache.sshd:sshd-core:$sshdVersion"
implementation "org.apache.sshd:sshd-sftp:$sshdVersion"
Expand All @@ -101,6 +102,7 @@ testing {
all {
testTask.configure {
testLogging {
showStandardStreams = false
exceptionFormat = 'full'
}
include "**/*Test.*"
Expand Down Expand Up @@ -133,8 +135,8 @@ testing {
}

sources {
groovy {
srcDirs = ['src/itest/groovy']
java {
srcDirs = ['src/itest/java']
}

resources {
Expand Down
7 changes: 7 additions & 0 deletions src/itest/docker-image/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/ash

# generate host keys if not present
ssh-keygen -A

# do not detach (-D), log to stderr (-e), passthrough other arguments
exec /usr/sbin/sshd -D -e "$@"
104 changes: 0 additions & 104 deletions src/itest/groovy/com/hierynomus/sshj/IntegrationSpec.groovy

This file was deleted.

21 changes: 0 additions & 21 deletions src/itest/groovy/com/hierynomus/sshj/IntegrationTestUtil.groovy

This file was deleted.

74 changes: 0 additions & 74 deletions src/itest/groovy/com/hierynomus/sshj/ManyChannelsSpec.groovy

This file was deleted.

Loading

0 comments on commit a0bab10

Please sign in to comment.