Remove visible assertions dependency (#4010)

bsideup · web-flow · commit cf6d15c8b8da · 2021-05-07T15:59:21.000+02:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -178,8 +178,6 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-
     compile "com.github.docker-java:docker-java-api:3.2.8"
 
     shaded ('com.github.docker-java:docker-java-core:3.2.8') {
@@ -218,6 +216,7 @@ dependencies {
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
     testCompile 'org.assertj:assertj-core:3.18.1'
     testCompile project(':test-support')
 
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -71,7 +71,6 @@
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.rnorth.visibleassertions.VisibleAssertions;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.UnstableAPI;
@@ -748,7 +747,7 @@ private void applyConfiguration(CreateContainerCmd createCommand) {
         boolean shouldCheckFileMountingSupport = binds.size() > 0 && !TestcontainersConfiguration.getInstance().isDisableChecks();
         if (shouldCheckFileMountingSupport) {
             if (!DockerClientFactory.instance().isFileMountingSupported()) {
-                VisibleAssertions.warn(
+                logger().warn(
                     "Unable to mount a file from test host into a running container. " +
                         "This may be a misconfiguration or limitation of your Docker environment. " +
                         "Some features might not work."
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testng:testng:7.3.0'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -14,4 +14,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -15,4 +15,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -15,4 +15,5 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -14,5 +14,6 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
@@ -17,4 +17,5 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -5,4 +5,6 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
     testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'
+
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     compile project(':testcontainers')
     testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.12.0"
     testCompile "org.elasticsearch.client:transport:7.10.1"
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -10,4 +10,5 @@ dependencies {
     testCompile 'org.apache.tomcat:tomcat-jdbc:10.0.0'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -8,4 +8,5 @@ dependencies {
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.986'
     testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.807'
     testCompile 'software.amazon.awssdk:s3:2.16.34'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     compile project(':testcontainers')
 
     testCompile 'org.mock-server:mockserver-client-java:5.5.4'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
@@ -3,4 +3,5 @@ description = "Testcontainers :: Nginx"
 dependencies {
     compile project(':testcontainers')
     compileOnly 'org.jetbrains:annotations:20.1.0'
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/selenium/build.gradle b/modules/selenium/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 
     testCompile 'org.mortbay.jetty:jetty:6.1.26'
     testCompile project(':nginx')
+    testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
     compileOnly 'org.jetbrains:annotations:20.1.0'
     testCompileClasspath 'org.jetbrains:annotations:20.0.0'

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ dependencies {`
`15`	`15`	`testImplementation 'ch.qos.logback:logback-classic:1.2.3'`
`16`	`16`	`testImplementation 'org.mockito:mockito-all:1.10.19'`
`17`	`17`	`testImplementation 'org.testcontainers:testcontainers'`
	`18`	`+ testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ dependencies {`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'ch.qos.logback:logback-classic:1.2.3'`
`16`	`16`	`testImplementation 'org.testng:testng:7.3.0'`
	`17`	`+ testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ dependencies {`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'junit:junit:4.13.1'`
`16`	`16`	`testImplementation 'ch.qos.logback:logback-classic:1.2.3'`
	`17`	`+ testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ dependencies {`
`14`	`14`
`15`	`15`	`testImplementation 'org.testcontainers:testcontainers'`
`16`	`16`	`testImplementation 'org.testcontainers:solr'`
	`17`	`+ testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`17`	`18`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ dependencies {`
`17`	`17`	`runtimeOnly 'org.postgresql:postgresql'`
`18`	`18`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`19`	`19`	`testImplementation 'org.testcontainers:postgresql'`
	`20`	`+ testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@ dependencies {`
`5`	`5`
`6`	`6`	`compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'`
`7`	`7`	`testCompile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.929'`
	`8`	`+`
	`9`	`+ testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`8`	`10`	`}`