Skip to content

Commit

Permalink
Updated testing to use latest testcontainers (#25)
Browse files Browse the repository at this point in the history
* Updated dependencies versions

* Test script fixes
  • Loading branch information
bczoma authored Feb 10, 2021
1 parent 0f2b7c7 commit 29abade
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ testSets {

dependencies {
integrationTestImplementation 'junit:junit:4.12'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.2'
integrationTestImplementation 'org.junit.platform:junit-platform-engine:1.5.2'
integrationTestImplementation 'org.mockito:mockito-core:3.2.4'
integrationTestImplementation 'org.mockito:mockito-junit-jupiter:3.2.4'
integrationTestImplementation 'org.testcontainers:testcontainers:1.12.4'
integrationTestImplementation 'org.testcontainers:junit-jupiter:1.12.4'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
integrationTestImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
integrationTestImplementation 'org.junit.platform:junit-platform-engine:1.7.1'
integrationTestImplementation 'org.mockito:mockito-core:3.7.7'
integrationTestImplementation 'org.mockito:mockito-junit-jupiter:3.7.7'
integrationTestImplementation 'org.testcontainers:testcontainers:1.15.1'
integrationTestImplementation 'org.testcontainers:junit-jupiter:1.15.1'
integrationTestImplementation 'org.slf4j:slf4j-api:1.7.28'
integrationTestImplementation 'org.slf4j:slf4j-simple:1.7.28'
integrationTestImplementation 'org.apache.commons:commons-configuration2:2.6'
integrationTestImplementation 'commons-beanutils:commons-beanutils:1.9.4'
integrationTestImplementation 'com.google.code.gson:gson:2.3.1'
integrationTestImplementation 'commons-io:commons-io:2.4'
integrationTestImplementation 'com.squareup.okhttp3:okhttp:4.4.0'
integrationTestImplementation 'com.squareup.okhttp3:okhttp:4.9.1'
integrationTestImplementation 'org.apache.kafka:kafka-clients:$kafkaVersion'
compile "org.apache.kafka:connect-api:$kafkaVersion"
compile "com.solacesystems:sol-jcsmp:$solaceJavaAPIVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ public interface MessagingServiceFullLocalSetupApache extends TestConstants {
new File(FULL_DOCKER_COMPOSE_FILE_PATH + "docker-compose-kafka-apache.yml"))
.withEnv("KAFKA_TOPIC", KAFKA_SINK_TOPIC)
.withEnv("KAFKA_HOST", dockerIpAddress)
.withLocalCompose(true)
.waitingFor("schema-registry_1",
Wait.forHttp("/subjects").forStatusCode(200));
.withLocalCompose(true);

@BeforeAll
static void checkContainer() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.7'
version: '3'

services:
zookeeper:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.7'
version: '3'

services:
zookeeper:
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/resources/docker-compose-solace.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.5'
version: '3'

services:
solbroker:
Expand Down

0 comments on commit 29abade

Please sign in to comment.