From 878e40a2e5a7bca674cacda97d0be1422aa6351a Mon Sep 17 00:00:00 2001 From: Kenny Bastani Date: Tue, 20 Dec 2016 11:57:35 -0800 Subject: [PATCH] Fixing tests --- .../src/main/java/demo/config/AwsLambdaConfig.java | 2 ++ .../src/main/java/demo/event/AccountEventStream.java | 2 ++ .../account-worker/src/main/resources/application.yml | 5 ++++- .../test/java/demo/AccountStreamModuleApplicationTests.java | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/account-parent/account-worker/src/main/java/demo/config/AwsLambdaConfig.java b/account-parent/account-worker/src/main/java/demo/config/AwsLambdaConfig.java index 4fed012..47022a5 100644 --- a/account-parent/account-worker/src/main/java/demo/config/AwsLambdaConfig.java +++ b/account-parent/account-worker/src/main/java/demo/config/AwsLambdaConfig.java @@ -6,8 +6,10 @@ import demo.function.LambdaFunctions; import demo.util.LambdaUtil; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; @Configuration +@Profile("cloud") public class AwsLambdaConfig { @Bean diff --git a/account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java b/account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java index 933c240..2fbb37e 100644 --- a/account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java +++ b/account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java @@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.cloud.stream.messaging.Sink; +import org.springframework.context.annotation.Profile; import org.springframework.statemachine.StateMachine; /** @@ -15,6 +16,7 @@ import org.springframework.statemachine.StateMachine; */ @EnableAutoConfiguration @EnableBinding(Sink.class) +@Profile({ "cloud", "development" }) public class AccountEventStream { private EventService eventService; diff --git a/account-parent/account-worker/src/main/resources/application.yml b/account-parent/account-worker/src/main/resources/application.yml index f29e29d..37237e4 100644 --- a/account-parent/account-worker/src/main/resources/application.yml +++ b/account-parent/account-worker/src/main/resources/application.yml @@ -18,4 +18,7 @@ server: amazon: aws: access-key-id: replace - access-key-secret: replace \ No newline at end of file + access-key-secret: replace +--- +spring: + profiles: test \ No newline at end of file diff --git a/account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java b/account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java index b2b0184..7d74e07 100644 --- a/account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java +++ b/account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java @@ -3,10 +3,12 @@ package demo; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK) +@ActiveProfiles("test") public class AccountStreamModuleApplicationTests { @Test