end to end test fixed

Author: banadiga

client-service/src/main/java/com/lohika/jclub/client/ClientController.java

@@ -11,13 +11,20 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.PostConstruct;
+
 @Slf4j
 @RestController
 public class ClientController {
 
     @Autowired
     private StorageServiceClient storageServiceClient;
 
+    @PostConstruct
+    public void warmUp() {
+        storageServiceClient.list();
+    }
+
     @GetMapping(value = "/apartments", produces = MediaType.APPLICATION_JSON_VALUE)
     public PagedResources<Apartment> getApartments() {
         PagedResources<Apartment> list = storageServiceClient.list();

client-service/src/test/java/com/lohika/jclub/client/ClientServiceTest.java

@@ -20,8 +20,8 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.LogMessageWaitStrategy;
 
-import java.time.Duration;
-
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 
 @RunWith(SpringRunner.class)
@@ -54,6 +54,9 @@ public void testGetApartments() throws Exception {
                         .sqft(55)
                         .build());
 
+        assertThat(lviv, notNullValue());
+        assertThat(lviv.getId(), notNullValue());
+
         // When
         mockMvc.perform(MockMvcRequestBuilders.get("/apartments"))
                 .andDo(print());

dsl-executor-service/src/main/java/com/lohika/jclub/dsl/service/DslService.java

@@ -17,6 +17,8 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import javax.annotation.PostConstruct;
+
 @Service
 public class DslService {
   private static final String DSL_EXTENSION = ".mydsl";
@@ -30,6 +32,11 @@ public class DslService {
   @Autowired
   private RatingServiceClient ratingServiceClient;
 
+  @PostConstruct
+  public void warmUp() {
+    storageServiceClient.list();
+  }
+
   public MyDsl runScript(String scriptName) throws IOException {
     String script = getScriptByName(scriptName);
     return run(script);

hackster-service-client/src/main/java/com/lohika/jclub/hackster/client/EnableHacksterServiceClient.java

@@ -1,9 +1,7 @@
 package com.lohika.jclub.hackster.client;
 
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Import;
-import org.springframework.hateoas.config.EnableHypermediaSupport;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -15,9 +13,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 
-@EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL)
 @EnableFeignClients(clients = {HacksterServiceClient.class})
 @Import({FeignMappingDefaultConfiguration.class, HacksterServiceClientConfiguration.class})
-@EnableDiscoveryClient
 public @interface EnableHacksterServiceClient {
 }

integration-test/pom.xml

@@ -41,6 +41,12 @@
       <version>0.0.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.lohika.jclub.storage.client</groupId>
+      <artifactId>storage-service-client</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

integration-test/src/test/java/com/lohika/jclub/integration/BaseIntegrationTest.java

@@ -2,12 +2,17 @@
 
 import lombok.extern.log4j.Log4j;
 
+import com.lohika.jclub.storage.client.StorageServiceClient;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.ApplicationContextInitializer;
@@ -17,6 +22,8 @@
 
 import java.io.IOException;
 
+import javax.annotation.PostConstruct;
+
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -33,11 +40,25 @@ public abstract class BaseIntegrationTest {
   private static final int DISCOVERY_SERVER_PORT = 8761;
   private static final int SLEEP = 5000;
 
+  @Autowired
+  protected StorageServiceClient storageServiceClient;
+
   @BeforeClass
   public static void init() {
     assertThat(EntToEndIntegrationTestSuite.environment, notNullValue());
   }
 
+  @Before
+  public void warmUp() {
+    storageServiceClient.list();
+  }
+
+  @Before
+  public void cleanUp() {
+    storageServiceClient.list().getContent()
+        .forEach(apartment -> storageServiceClient.delete(apartment.getId()));
+  }
+
   public static void waitFor(String service) throws InterruptedException {
     HttpClient client = HttpClientBuilder.create().build();
     String gateway = "http://" + DISCOVERY_SERVER + ":" + DISCOVERY_SERVER_PORT + "/eureka/apps/" + service;

integration-test/src/test/java/com/lohika/jclub/integration/DslIntegrationTest.java

@@ -1,17 +1,21 @@
 package com.lohika.jclub.integration;
 
+import com.lohika.jclub.storage.client.Apartment;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Collection;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
 
 public class DslIntegrationTest extends BaseIntegrationTest {
   private static final String SIMPLE_DSL_EXECUTE = "http://" + DSL_EXECUTOR_SERVICE + "/dsl/end-to-end";
@@ -28,21 +32,36 @@ public static void setUpTests() throws InterruptedException {
 
   @Test
   public void apartmentShouldBeAvailableAfterDslExecution() {
+    /* GIVEN */
+
+    /* WHEN */
     ResponseEntity<Map> dslResult = restTemplate.exchange(
         SIMPLE_DSL_EXECUTE,
         HttpMethod.GET,
         null,
         Map.class
     );
 
+    /* THEN */
+    assertThat(dslResult, notNullValue());
+    assertThat(dslResult.getStatusCode().value(), is(200));
+
+    /* WHEN */
+    Collection<Apartment> apartments = storageServiceClient.list().getContent();
+
+    /* THEN */
+    assertThat(apartments, notNullValue());
+    assertThat(apartments, hasSize(1));
+
+    /* WHEN */
     ResponseEntity<Map> get = restTemplate.exchange(
         GET_APARTMENTS,
         HttpMethod.GET,
         null,
         Map.class
     );
 
+    /* THEN */
     assertThat(get.getStatusCode().value(), is(200));
-    assertThat(get.getBody().get("id"), notNullValue());
   }
 }

integration-test/src/test/java/com/lohika/jclub/integration/GetWayIntegrationTest.java

@@ -1,5 +1,7 @@
 package com.lohika.jclub.integration;
 
+import com.lohika.jclub.storage.client.Apartment;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,16 +10,16 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
 
 public class GetWayIntegrationTest extends BaseIntegrationTest {
-
-
   private static final String STORE_APARTMENTS = "http://" + API_GATEWAY_SERVICE +
                                                  "/api/realtor-service/storeApartments";
   private static final String GET_APARTMENTS = "http://" + API_GATEWAY_SERVICE + "/api/client-service/apartments";
@@ -32,33 +34,50 @@ public static void setUpTests() throws InterruptedException {
 
   @Test
   public void apartmentShouldBeAvailableAfterAdding() {
-    Map<String, Object> params = new HashMap() {
+    /* GIVEN */
+    final String email = "mail@domen.com";
+    Map params = new HashMap() {
       {
         put("location", "location");
         put("price", 1500.5);
         put("sqft", 1.5);
         put("phone", "123");
-        put("realtorName", "vas");
-        put("mail", "mail@exem.comn");
+        put("realtorName", "realtorName");
+        put("mail", email);
 
       }
     };
 
+    /* WHEN */
     ResponseEntity<Map> create = restTemplate.exchange(
         STORE_APARTMENTS,
         HttpMethod.POST,
         new HttpEntity<>(params),
         Map.class
     );
 
+    /* THEN */
+    assertThat(create, notNullValue());
+    assertThat(create.getStatusCode().value(), is(200));
+    String createdId = (String) create.getBody().get("id");
+    assertThat(createdId, notNullValue());
+
+    /* WHEN */
+    Collection<Apartment> apartments = storageServiceClient.list().getContent();
+
+    /* THEN */
+    assertThat(apartments, notNullValue());
+    assertThat(apartments, hasSize(1));
+
+    /* WHEN */
     ResponseEntity<Map> get = restTemplate.exchange(
         GET_APARTMENTS,
         HttpMethod.GET,
         null,
         Map.class
     );
 
+    /* THEN */
     assertThat(get.getStatusCode().value(), is(200));
-    assertThat(get.getBody().get("id"), notNullValue());
   }
 }

integration-test/src/test/java/com/lohika/jclub/integration/IntegrationTestApplication.java

@@ -1,13 +1,19 @@
 package com.lohika.jclub.integration;
 
+import com.lohika.jclub.storage.client.EnableStorageServiceClient;
+import com.lohika.jclub.storage.client.StorageServiceClient;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
 
 @EnableDiscoveryClient
+@EnableStorageServiceClient
+@EnableFeignClients(clients = {StorageServiceClient.class})
 @SpringBootApplication
 public class IntegrationTestApplication {
 

integration-test/src/test/resources/dsl/end-to-end.mydsl

@@ -4,5 +4,5 @@ apartment {
   sqft 3.4
   phone 'phone'
   realtorName 'realtorName'
-  mail 'mail'
+  mail 'ent-to-end-mail@domen.com'
 }