misc fixes to get end to end tests to pass

Author: cer

build-and-test-all.sh

@@ -54,19 +54,19 @@ if [ -z "$ASSEMBLE_ONLY" ] ; then
   ./gradlew infrastructureComposeDown
   ./gradlew infrastructureComposeUp
 
-  ./gradlew cleanComponentTest componentTest
+  ./gradlew cleanComponentTest 
 
-  ./gradlew infrastructureComposeDown
-
-  ./gradlew composeUp
+  # ./gradlew :ftgo-delivery-service:componentTest
+  # ./gradlew :ftgo-order-service:componentTest
+  
+  ./gradlew componentTest
 
+  ./gradlew infrastructureComposeDown
 
 else
 
   ./gradlew $* assemble
 
-  ./gradlew composeUp
-
 fi
 
 ./run-end-to-end-tests.sh

ftgo-delivery-service/build.gradle

@@ -48,6 +48,8 @@ dockerCompose {
     environment.put "EVENTUATE_SAGA_VERSION", eventuateTramSagasImageVersion
     environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
     environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
+    
+    projectName = null
 
     componentTests {
         projectName = null

ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/RestaurantEventMother.java

@@ -3,11 +3,34 @@
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
 import net.chrisrichardson.ftgo.deliveryservice.messaging.RestaurantEventMapper;
 import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantCreated;
+import net.chrisrichardson.ftgo.restaurantservice.events.Menu;
+import net.chrisrichardson.ftgo.restaurantservice.events.MenuItem;
+
+import java.util.Collections;
+import java.util.List;
+
+import net.chrisrichardson.ftgo.common.Address;
+import net.chrisrichardson.ftgo.common.Money;
 
 public class RestaurantEventMother {
+
+  public static final String CHICKEN_VINDALOO = "Chicken Vindaloo";
+  public static final String CHICKEN_VINDALOO_MENU_ITEM_ID = "1";
+  public static final String CHICKEN_VINDALOO_PRICE = "12.34";
+  public static final Address RESTAURANT_ADDRESS = new Address("1 Main Street", "Unit 99", "Oakland", "CA", "94611");
+
+  public static MenuItem CHICKEN_VINDALOO_MENU_ITEM = new MenuItem()
+    .withId(CHICKEN_VINDALOO_MENU_ITEM_ID)
+    .withName(CHICKEN_VINDALOO)
+    .withPrice(CHICKEN_VINDALOO_PRICE);
+
+  public static final List<MenuItem> AJANTA_RESTAURANT_MENU_ITEMS = Collections.singletonList(CHICKEN_VINDALOO_MENU_ITEM);
+
+
   static RestaurantCreated makeRestaurantCreated() {
     return new RestaurantCreated()
             .withName("Delicious Indian")
-            .withAddress(RestaurantEventMapper.fromAddress(DeliveryServiceTestData.PICKUP_ADDRESS)).withMenu(null);
+            .withAddress(RestaurantEventMapper.fromAddress(DeliveryServiceTestData.PICKUP_ADDRESS))
+            .withMenu(new Menu().withMenuItems(AJANTA_RESTAURANT_MENU_ITEMS));
   }
 }

ftgo-order-history-service/build.gradle

@@ -69,6 +69,8 @@ dockerCompose {
     environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
     environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
 
+    projectName = null
+
     integrationTests {
         projectName = null
         removeOrphans = true

ftgo-order-service/build.gradle

@@ -67,6 +67,8 @@ dockerCompose {
     environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
     environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
 
+    projectName = null
+
     integrationTests {
         projectName = null
         removeOrphans = true

ftgo-restaurant-service-aws-lambda/build.gradle

@@ -43,6 +43,8 @@ dockerCompose {
     environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
     environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
 
+    projectName = null
+
     integrationTests {
         projectName = null
         removeOrphans = true