Fixed integration test and local tests with Testcontainers on macOS (…

…see testcontainers/testcontainers-java#3166 )
stratospheric-dev · Oct 7, 2020 · 8ea4ac7 · 8ea4ac7
1 parent 980149d
commit 8ea4ac7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/application/build.gradle b/application/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
-  def testcontainersVersion = '1.14.3'
+  def testcontainersVersion = '1.15.0-rc2'
   testCompile('org.testcontainers:localstack:' + testcontainersVersion)
   testCompile('org.testcontainers:junit-jupiter:' + testcontainersVersion)
 }

diff --git a/application/src/main/java/dev/aws101/config/AwsConfig.java b/application/src/main/java/dev/aws101/config/AwsConfig.java
@@ -50,6 +50,11 @@ public NotificationMessagingTemplate notificationMessagingTemplate(AmazonSNS ama
   }
 
   @Bean
+  @ConditionalOnProperty(
+    value = "custom.local-sns-enabled",
+    havingValue = "false",
+    matchIfMissing = true
+  )
   public AmazonSNS amazonSNS(AWSCredentialsProvider awsCredentialsProvider) {
     AwsClientBuilder.EndpointConfiguration endpointConfiguration = null;
     if (endpoint != null) {

diff --git a/application/src/test/java/dev/aws101/AwsTestConfig.java b/application/src/test/java/dev/aws101/AwsTestConfig.java
@@ -6,6 +6,7 @@
 import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 
 import static dev.aws101.TodoApplicationTests.localStack;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SNS;
@@ -15,6 +16,7 @@
 public class AwsTestConfig {
 
   @Bean
+  @Primary
   public AmazonSQSAsync amazonSQS() {
     return AmazonSQSAsyncClientBuilder.standard()
       .withCredentials(localStack.getDefaultCredentialsProvider())
@@ -23,6 +25,7 @@ public AmazonSQSAsync amazonSQS() {
   }
 
   @Bean
+  @Primary
   public AmazonSNS amazonSNS() {
     return AmazonSNSClientBuilder
       .standard()

diff --git a/application/src/test/resources/application.yml b/application/src/test/resources/application.yml
@@ -24,5 +24,10 @@ spring:
             usernameAttribute: username
 
 custom:
+  security:
+    enabled: false
   sharing-queue: test-todo-sharing
   updates-topic: test-todo-updates
+  websocket-url: ws://localhost:8080/websocket
+  external-url: ${EXTERNAL_URL:#{null}}
+  local-sns-enabled: true