Introduced pair-wise service integration testing.

account-cmd/src/main/java/com/ultimatesoftware/banking/account/cmd/aggregates/Account.java

@@ -86,7 +86,7 @@ public void on(DeleteAccountCommand deleteAccountCommand) throws Exception {
             return;
         }
         logger.warn("Account with ineligible balance requested for delete. Account ID: " + deleteAccountCommand.getId().toHexString());
-        throw new AccountNotEligibleForDeleteException(deleteAccountCommand.getId().toHexString(), balance.doubleValue());
+        throw new AccountNotEligibleForDeleteException(deleteAccountCommand.getId().toHexString(), this.balance.doubleValue());
     }
 
     @CommandHandler

account-cmd/src/main/java/com/ultimatesoftware/banking/account/cmd/configuration/AccountSagaManagerConfiguration.java

@@ -1,7 +1,7 @@
 package com.ultimatesoftware.banking.account.cmd.configuration;
 
 import com.ultimatesoftware.banking.account.cmd.sagas.TransactionSaga;
-import com.ultimatesoftware.banking.api.operations.SagaManagerConfiguration;
+import com.ultimatesoftware.banking.api.configuration.SagaManagerConfiguration;
 import io.micronaut.context.annotation.Infrastructure;
 import org.axonframework.axonserver.connector.AxonServerConfiguration;
 

account-cmd/src/test/java/com/ultimatesoftware/banking/account/cmd/tests/service/isolation/AccountCmdTests.java

@@ -1,14 +1,14 @@
 package com.ultimatesoftware.banking.account.cmd.tests.service.isolation;
 
 import com.ultimatesoftware.banking.account.cmd.models.AccountDto;
-import com.ultimatesoftware.banking.api.test.HttpClient;
-import com.ultimatesoftware.banking.api.test.ResponseDto;
+import com.ultimatesoftware.banking.test.utils.HttpClient;
+import com.ultimatesoftware.banking.test.utils.ResponseDto;
 import io.micronaut.test.annotation.MicronautTest;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static com.ultimatesoftware.banking.api.test.TestConstants.*;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.*;
 
 @MicronautTest
 public class AccountCmdTests {

account-query/build.gradle

@@ -5,7 +5,6 @@ dependencies {
     compile "io.micronaut.configuration:micronaut-mongo-reactive"
     compile("org.axonframework:axon-configuration:${axonVersion}")
     compile("org.axonframework:axon-server-connector:${axonVersion}")
-    testCompile("org.axonframework:axon-test:${axonVersion}")
 }
 
 mainClassName = "com.ultimatesoftware.banking.account.query.Application"

account-query/src/test/java/com/ultimatesoftware/banking/account/query/tests/service/isolation/AccountEndpointTest.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.ultimatesoftware.banking.api.configuration.ConfigurationConstants.EXTERNAL_MOCKS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

account-transactions/build.gradle

@@ -6,7 +6,6 @@ dependencies {
     compile "io.micronaut.configuration:micronaut-netflix-ribbon"
     compile("org.axonframework:axon-configuration:${axonVersion}")
     compile("org.axonframework:axon-server-connector:${axonVersion}")
-    testCompile("org.axonframework:axon-test:${axonVersion}")
     testCompile project(":test-api")
 }
 

account-transactions/src/main/java/com/ultimatesoftware/banking/account/transactions/clients/BankAccountCmdClient.java

@@ -6,7 +6,7 @@
 import io.micronaut.http.client.annotation.Client;
 import io.reactivex.Flowable;
 
-@Client(id = "account-cmd", path = "/api/v1/accounts")
+@Client(value = "account-cmd", path = "/api/v1/accounts")
 public interface BankAccountCmdClient {
     @Put("/credit")
     Flowable<MessageDto> credit(Transaction transaction);

account-transactions/src/main/java/com/ultimatesoftware/banking/account/transactions/clients/BankAccountQueryClient.java

@@ -5,7 +5,7 @@
 import io.micronaut.http.client.annotation.Client;
 import io.reactivex.Maybe;
 
-@Client(id = "account-query", path = "/api/v1/accounts")
+@Client(value = "account-query", path = "/api/v1/accounts")
 public interface BankAccountQueryClient {
     @Get("/{id}")
     Maybe<BankAccountDto> get(String id);

account-transactions/src/main/resources/application-mockcmd.yml

@@ -0,0 +1,6 @@
+micronaut:
+  http:
+    services:
+      account-cmd:
+        urls:
+          - "http://account-cmd-mock:8082"

account-transactions/src/main/resources/application-mockquery.yml

@@ -0,0 +1,6 @@
+micronaut:
+  http:
+    services:
+      account-query:
+        urls:
+          - "http://account-query-mock:8084"

account-transactions/src/test/java/com/ultimatesoftware/banking/account/transactions/tests/service/isolation/WithdrawTests.java

@@ -1,9 +1,9 @@
 package com.ultimatesoftware.banking.account.transactions.tests.service.isolation;
 
 import com.ultimatesoftware.banking.account.transactions.models.TransactionDto;
-import com.ultimatesoftware.banking.api.test.HttpClient;
-import com.ultimatesoftware.banking.api.test.MockedHttpDependencies;
-import com.ultimatesoftware.banking.api.test.ResponseDto;
+import com.ultimatesoftware.banking.test.utils.HttpClient;
+import com.ultimatesoftware.banking.test.utils.MockedHttpDependencies;
+import com.ultimatesoftware.banking.test.utils.ResponseDto;
 import io.micronaut.test.annotation.MicronautTest;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.BeforeAll;
@@ -12,10 +12,10 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.ultimatesoftware.banking.api.test.TestConstants.ACCOUNT_ID;
-import static com.ultimatesoftware.banking.api.test.TestConstants.CUSTOMER_ID;
-import static com.ultimatesoftware.banking.api.test.TestConstants.NO_ACCOUNT_ID;
-import static com.ultimatesoftware.banking.api.test.TestConstants.NO_CUSTOMER_ID;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.ACCOUNT_ID;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.CUSTOMER_ID;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.NO_ACCOUNT_ID;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.NO_CUSTOMER_ID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -74,7 +74,7 @@ public void givenAccountWithBalance_whenWithdraw_thenCustomerIsValidated()
         ResponseDto response = client.post(transactionDto, "/withdraw");
 
         // Assert
-        customersService.verify(1, getRequestedFor(urlEqualTo("/api/v1/people/5c8ffe2b7c0bec3538855a0a")));
+        personService.verify(1, getRequestedFor(urlEqualTo("/api/v1/people/5c8ffe2b7c0bec3538855a0a")));
     }
 
     @Test

account-transactions/src/test/java/com/ultimatesoftware/banking/account/transactions/tests/unit/ActionsControllerUnitTest.java

@@ -18,7 +18,7 @@
 import static com.ultimatesoftware.banking.account.transactions.tests.TestConstants.ACCOUNT_EXISTS_EXCEPTION;
 import static com.ultimatesoftware.banking.account.transactions.tests.TestConstants.ACCOUNT_UPDATE_EXCEPTION;
 import static com.ultimatesoftware.banking.account.transactions.tests.TestConstants.INSUFFICIENT_BALANCE_EXCEPTION;
-import static com.ultimatesoftware.banking.api.test.TestConstants.*;
+import static com.ultimatesoftware.banking.test.utils.TestConstants.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

account-transactions/src/test/java/com/ultimatesoftware/banking/account/transactions/tests/unit/EventHandlerUnitTest.java

@@ -7,7 +7,7 @@
 import com.ultimatesoftware.banking.account.transactions.models.TransactionStatus;
 import com.ultimatesoftware.banking.account.transactions.models.TransactionType;
 import com.ultimatesoftware.banking.api.repository.Repository;
-import com.ultimatesoftware.banking.api.test.TestConstants;
+import com.ultimatesoftware.banking.test.utils.TestConstants;
 import io.reactivex.Maybe;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.Test;

account-transactions/src/test/java/com/ultimatesoftware/banking/account/transactions/tests/unit/TransactionServiceUnitTest.java

@@ -7,7 +7,7 @@
 import com.ultimatesoftware.banking.account.transactions.models.*;
 import com.ultimatesoftware.banking.account.transactions.services.TransactionService;
 import com.ultimatesoftware.banking.api.repository.Repository;
-import com.ultimatesoftware.banking.api.test.TestConstants;
+import com.ultimatesoftware.banking.test.utils.TestConstants;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
 import io.reactivex.Single;

account-transactions/src/test/resources/application-test.yml

@@ -1,7 +1,7 @@
 micronaut:
   http:
     services:
-      people:
+      people-gateway:
         urls:
           - "http://localhost:8081"
       account-cmd:

api/src/main/java/com/ultimatesoftware/banking/api/operations/SagaManagerConfiguration.java → api/src/main/java/com/ultimatesoftware/banking/api/configuration/SagaManagerConfiguration.java

@@ -1,6 +1,6 @@
-package com.ultimatesoftware.banking.api.operations;
+package com.ultimatesoftware.banking.api.configuration;
 
-import com.ultimatesoftware.banking.api.configuration.ConfigurationConstants;
+import com.ultimatesoftware.banking.api.operations.AxonEventHandler;
 import io.micronaut.context.annotation.Requires;
 import org.axonframework.axonserver.connector.AxonServerConfiguration;
 import org.axonframework.config.Configuration;

api/src/main/java/com/ultimatesoftware/banking/api/factories/AxonConfigurationFactory.java

@@ -9,6 +9,7 @@
 
 import javax.inject.Singleton;
 
+@Singleton
 @Factory
 @Requires(property = "micronaut.application.name")
 @Requires(property = "axon.axonserver.servers")

api/src/main/java/com/ultimatesoftware/banking/api/repository/MockRepository.java

@@ -2,12 +2,16 @@
 
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
+import io.micronaut.context.annotation.Requires;
 import io.reactivex.Maybe;
 import io.reactivex.Single;
 import org.bson.types.ObjectId;
 
 import java.util.List;
 
+import static com.ultimatesoftware.banking.api.configuration.ConfigurationConstants.INTERNAL_MOCKS;
+
+@Requires(env = INTERNAL_MOCKS)
 public abstract class MockRepository<T extends Entity> implements Repository<T> {
     protected List<T> entities;
 

docker-compose-pair-wise-account-cmd-transaction.yml

@@ -12,55 +12,44 @@ services:
     depends_on:
       - redis
 
-  people-gateway:
+  people-gateway-mock:
     build: ./wiremock/images/people
     ports:
       - "8081:8081"
     volumes:
       - ./wiremock/people:/home/wiremock
     restart: on-failure
 
+  account-query-mock:
+    build: ./wiremock/images/account-query
+    ports:
+      - "8084:8084"
+    restart: on-failure
+
   account-cmd:
     build: account-cmd/
     mem_limit: 400m
     ports:
       - "8082:8082"
     restart: on-failure
     environment:
-      - PEOPLE_GATEWAY=people-gateway
+      - MICRONAUT_ENVIRONMENTS=mockquery
+      - PEOPLE_GATEWAY=people-gateway-mock
       - CONSUL_HOST=discovery-service
       - MONGO_HOST=mongo
       - AXON_HOST=axonserver
       - HOST_PORT=8082
     depends_on:
       - axonserver
 
-  ubuntu:
-    image: ubuntu
-
-  account-query:
-    build: account-query/
-    mem_limit: 400m
-    ports:
-      - "8084:8084"
-    restart: on-failure
-    environment:
-      - CONSUL_HOST=discovery-service
-      - MONGO_HOST=mongo
-      - AXON_HOST=axonserver
-      - HOST_PORT=8084
-      - ES_JAVA_OPTS= "-Xms450mb -Xmx450mb"
-    depends_on:
-      - axonserver
-      - mongo
-
   account-transaction:
     build: account-transactions/
     mem_limit: 400m
     ports:
       - "8086:8086"
     environment:
-      - PEOPLE_GATEWAY=people-gateway
+      - MICRONAUT_ENVIRONMENTS=mockquery
+      - PEOPLE_GATEWAY=people-gateway-mock
       - CONSUL_HOST=discovery-service
       - MONGO_HOST=mongo
       - AXON_HOST=axonserver

docker-compose-pair-wise-account-query-transaction.yml

@@ -12,32 +12,14 @@ services:
     depends_on:
       - redis
 
-  people-gateway:
+  people-gateway-mock:
     build: ./wiremock/images/people
     ports:
       - "8081:8081"
     volumes:
       - ./wiremock/people:/home/wiremock
     restart: on-failure
 
-  account-cmd:
-    build: account-cmd/
-    mem_limit: 400m
-    ports:
-      - "8082:8082"
-    restart: on-failure
-    environment:
-      - PEOPLE_GATEWAY=people-gateway
-      - CONSUL_HOST=discovery-service
-      - MONGO_HOST=mongo
-      - AXON_HOST=axonserver
-      - HOST_PORT=8082
-    depends_on:
-      - axonserver
-
-  ubuntu:
-    image: ubuntu
-
   account-query:
     build: account-query/
     mem_limit: 400m
@@ -60,7 +42,8 @@ services:
     ports:
       - "8086:8086"
     environment:
-      - PEOPLE_GATEWAY=people-gateway
+      - PEOPLE_GATEWAY=people-gateway-mock
+      - MICRONAUT_ENVIRONMENTS=mockcmd
       - CONSUL_HOST=discovery-service
       - MONGO_HOST=mongo
       - AXON_HOST=axonserver

docker-compose-sub-domain-testing.yml

@@ -12,7 +12,7 @@ services:
     depends_on:
       - redis
 
-  people-gateway:
+  people-gateway-mock:
     build: ./wiremock/images/people
     ports:
       - "8081:8081"
@@ -27,7 +27,7 @@ services:
       - "8082:8082"
     restart: on-failure
     environment:
-      - PEOPLE_GATEWAY=people-gateway
+      - PEOPLE_GATEWAY=people-gateway-mock
       - CONSUL_HOST=discovery-service
       - MONGO_HOST=mongo
       - AXON_HOST=axonserver
@@ -60,7 +60,7 @@ services:
     ports:
       - "8086:8086"
     environment:
-      - PEOPLE_GATEWAY=people-gateway
+      - PEOPLE_GATEWAY=people-gateway-mock
       - CONSUL_HOST=discovery-service
       - MONGO_HOST=mongo
       - AXON_HOST=axonserver

integration-tests/build.gradle

@@ -5,5 +5,6 @@ dependencies {
     compile project(":api")
     compile project(":test-api")
     compile 'org.mongodb:mongo-java-driver:3.4.1'
+    compile "com.github.tomakehurst:wiremock-jre8:2.22.0"
     compile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
 }