Fixed #55 - improved RestaurantJpaTest

Author: cer

ftgo-order-service/src/integration-test/java/net/chrisrichardson/ftgo/orderservice/domain/OrderJpaTest.java

@@ -27,7 +27,7 @@ public class OrderJpaTest {
   @Test
   public void shouldSaveAndLoadOrder() {
 
-    long orderId = transactionTemplate.execute((ts) -> {
+    long orderId = transactionTemplate.execute(ts -> {
       Order order = new Order(CONSUMER_ID, AJANTA_ID, chickenVindalooLineItems());
       orderRepository.save(order);
       return order.getId();

ftgo-order-service/src/integration-test/java/net/chrisrichardson/ftgo/orderservice/domain/RestaurantJpaTest.java

@@ -1,20 +1,14 @@
 package net.chrisrichardson.ftgo.orderservice.domain;
 
-import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import static net.chrisrichardson.ftgo.orderservice.OrderDetailsMother.CONSUMER_ID;
-import static net.chrisrichardson.ftgo.orderservice.OrderDetailsMother.chickenVindalooLineItems;
-import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_ID;
-import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_RESTAURANT_MENU_ITEMS;
-import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_RESTAURANT_NAME;
+import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.*;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = OrderJpaTestConfiguration.class)
@@ -27,21 +21,37 @@ public class RestaurantJpaTest {
   private TransactionTemplate transactionTemplate;
 
   @Test
-  public void shouldSaveRestaurant() {
+  public void shouldSaveAndLoadRestaurant() {
+    long restaurantId = saveRestaurant();
+    assertEquals(AJANTA_ID, restaurantId);
+    loadRestaurant(restaurantId);
+  }
 
-    transactionTemplate.execute((ts) -> {
-      Restaurant restaurant = new Restaurant(AJANTA_ID, AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU_ITEMS);
-      restaurantRepository.save(restaurant);
-      return null;
-    });
-    transactionTemplate.execute((ts) -> {
-      Restaurant restaurant = new Restaurant(AJANTA_ID, AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU_ITEMS);
-      restaurantRepository.save(restaurant);
+  @Test
+  public void shouldSaveRestaurantTwice() {
+    long restaurantId1 = saveRestaurant();
+    long restaurantId2 = saveRestaurant();
+    assertEquals(AJANTA_ID, restaurantId1);
+    assertEquals(restaurantId1, restaurantId2);
+    loadRestaurant(restaurantId1);
+  }
+
+  private void loadRestaurant(long restaurantId) {
+    transactionTemplate.execute(ts -> {
+      Restaurant restaurant = restaurantRepository.findById(restaurantId).get();
+      assertEquals(AJANTA_RESTAURANT_NAME, restaurant.getName());
+      assertEquals(AJANTA_RESTAURANT_MENU_ITEMS, restaurant.getMenuItems());
       return null;
     });
+  }
 
 
-
+  private long saveRestaurant() {
+    return transactionTemplate.execute((ts) -> {
+        Restaurant restaurant = new Restaurant(AJANTA_ID, AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU_ITEMS);
+        restaurantRepository.save(restaurant);
+        return restaurant.getId();
+      });
   }
 
 }