Finished basic integration tests with trip-cmd and trip-query (#3)

* Updated dependencies for running tests/created test

* Added system tests/updated docker-compose files

* Changed docker-compose, set up testing framework

* Refined docker-compose

* Added docker-compose into resources

* Updated Integration Tests

* Fixed GET test

* Renamed tests and fixed authentication integration

* Cleaned up integration tests

* Deleted bad request test

* Wrong credentials being encoded fixed

* Deleted logging in gradle

* Updated checkstyle fixes

Updated travis with docker service

* Added script to stop mysql if already running

* Updated docker composes to pull user-service image

* Updated gradle with palantir docker-compose latest version

* Merging conflicts

* Fixed gradle, ready for merging

Author: erinyoo

.travis.yml

@@ -1,6 +1,11 @@
 language: java
-
 jdk:
   - oraclejdk8
 
-encoding: utf8
+sudo: required
+
+services:
+  - docker
+
+before_script:
+  - sudo service mysql stop

build.gradle

@@ -1,53 +1,68 @@
 buildscript {
-	ext {
-		springBootVersion = '1.5.9.RELEASE'
-	}
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
+    ext {
+        springBootVersion = '1.5.9.RELEASE'
+    }
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath("com.jayway.restassured:rest-assured:2.5.0")
+        classpath("com.jayway.restassured:spring-mock-mvc:2.5.0")
+    }
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'checkstyle'
 
+checkstyle {
+    configFile = new File(rootDir, "checkstyle.xml")
+    toolVersion = "8.7"
+}
+
 group = 'aist.edge'
 version = '0.0.1'
 sourceCompatibility = 1.8
 
 repositories {
-	mavenCentral()
+    mavenCentral()
+    maven {
+        url 'https://dl.bintray.com/palantir/releases'
+    }
 }
 
 configurations {
-	providedRuntime
+    providedRuntime
 }
 
 ext {
-	springCloudVersion = 'Edgware.SR1'
+    springCloudVersion = 'Edgware.SR1'
 }
 
 dependencies {
-	compile('org.springframework.cloud:spring-cloud-starter-eureka')
-	compile('org.springframework.cloud:spring-cloud-starter-hystrix')
-	compile('org.springframework.cloud:spring-cloud-starter-oauth2')
-	compile('org.springframework.cloud:spring-cloud-starter-zuul')
-	compile('org.springframework.boot:spring-boot-starter-web')
-	providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
-	testCompile('org.springframework.boot:spring-boot-starter-test')
+    compile('org.springframework.security:spring-security-test')
+    compile('org.springframework.cloud:spring-cloud-starter-eureka')
+    compile('org.springframework.cloud:spring-cloud-starter-hystrix')
+    compile('org.springframework.cloud:spring-cloud-starter-oauth2')
+    compile('org.springframework.cloud:spring-cloud-starter-zuul')
+    compile('org.springframework.boot:spring-boot-starter-web')
+    providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
+    testCompile ('org.springframework.cloud:spring-cloud-starter-eureka-server')
+    testCompile('com.jayway.restassured:rest-assured:2.5.0')
+    testCompile ('com.jayway.restassured:spring-mock-mvc:2.5.0')
+    testCompile ('org.springframework.cloud:spring-cloud-starter-contract-stub-runner')
+    testCompile ('com.palantir.docker.compose:docker-compose-rule-junit4:0.33.0')
 }
 
 dependencyManagement {
-	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-	}
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
 }
 
 checkstyle {
-	toolVersion = "8.7"
-	configFile = new File(rootDir, "checkstyle.xml")
-}
+    toolVersion = "8.7"
+    configFile = new File(rootDir, "checkstyle.xml")
+}

docker-compose.yml

@@ -1,12 +1,101 @@
 version: '3'
+
 services:
+
   edge-service:
     build: ./
     ports:
       - "8080:8080"
     depends_on:
       - discovery-service
+
   discovery-service:
     image: springcloud/eureka
     ports:
       - "8761:8761"
+    container_name: eureka-server
+
+#  hystrix-dashboard:
+#    image: kbastani/hystrix-dashboard
+#    container_name: hystrix-dashboard
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 6161:6161
+
+#  config-service:
+#    build: config-service
+#    container_name: config-service
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 8888:8888
+
+  mysql-server:
+    image: mysql:5.7
+    container_name: mysql-server
+    volumes:
+      - mysql-data:/var/lib/mysql:rw
+    restart: always
+    ports:
+      - '3306:3306'
+    environment:
+      MYSQL_USER:
+      MYSQL_PASSWORD:
+      MYSQL_ROOT_PASSWORD: 'root'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_DATABASE: 'user_service'
+
+  microservice--user-service:
+    image: aista/user-service
+    depends_on:
+      - discovery-service
+      - mysql-server
+    container_name: microservice--user-service
+    ports:
+      - '8091:8091'
+
+  mongo:
+    image: 'mongo:3.4.1'
+    container_name: 'mongo'
+    ports:
+      - '27017:27017'
+    volumes:
+      - 'mongo:/data/db'
+
+  rabbitmq:
+    image: rabbitmq:management
+    container_name: 'rabbitmq'
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
+  trip-management-cmd:
+    image: aista/trip-management-query
+    container_name: trip-management-cmd
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8092:8092'
+    depends_on:
+      - discovery-service
+      - rabbitmq
+      - mongo
+
+  trip-management-query:
+    image: aista/trip-management-query
+    container_name: trip-management-query
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8093:8093'
+    depends_on:
+      - rabbitmq
+      - mongo
+      - discovery-service 
+
+volumes:
+  mongo:
+  mysql-data:

src/main/resources/application.yml

@@ -14,7 +14,7 @@ zuul:
 security:
   oauth2:
     resource:
-      userInfoUri: http://192.168.99.100:8181/uaa/user
+      userInfoUri: http://localhost:8181/uaa/user
   ignored: /catalog/**
 eureka:
   instance:
@@ -23,7 +23,8 @@ eureka:
     registerWithEureka: true
     fetchRegistry: true
     serviceUrl:
-      defaultZone: http://192.168.99.100:8761/eureka/
+      defaultZone: http://localhost:8761/eureka/
+
 ---
 spring:
   profiles: docker
@@ -37,7 +38,7 @@ zuul:
 security:
   oauth2:
     resource:
-      userInfoUri: http://${DOCKER_IP:192.168.99.100}:8181/uaa/user
+      userInfoUri: http://localhost:8181/uaa/user
   ignored: /catalog/**
 eureka:
   instance:

src/test/java/aist/edge/edgeservice/EdgeServiceApplicationTests.java

@@ -0,0 +1,104 @@
+package aist.edge.edgeservice;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.connection.waiting.HealthChecks;
+
+import java.util.*;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.*;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = EdgeServiceApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class EdgeServiceIntegrationTests {
+
+    @ClassRule
+    public static DockerComposeRule docker = DockerComposeRule.builder().pullOnStartup(true)
+            .file("src/test/resources/docker-compose.yml")
+            .waitingForService("microservice--user-service", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("microservice--user-service", HealthChecks.toRespondOverHttp(8091,
+                (port) -> port.inFormat("http://localhost:8091")))
+            .waitingForService("trip-management-cmd", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("trip-management-cmd", HealthChecks.toRespondOverHttp(8080,
+                (port) -> port.inFormat("http://localhost:8092")))
+            .waitingForService("trip-management-query", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("trip-management-query", HealthChecks.toRespondOverHttp(8080,
+                (port) -> port.inFormat("http://localhost:8093")))
+            .waitingForService("discovery-service", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("discovery-service", HealthChecks.toRespondOverHttp(8761,
+                (port) -> port.inFormat("http://localhost:8761")))
+            .build();
+
+    private TestRestTemplate restTemplate = new TestRestTemplate();
+
+    private String token;
+
+    @Before
+    public void setUp() throws JSONException {
+        String plainCreds = "eagleeye:thisissecret";
+        byte[] plainCredsBytes = plainCreds.getBytes();
+        byte[] base64CredsBytes = Base64.getEncoder().encode(plainCredsBytes);
+        String base64Creds = new String(base64CredsBytes);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Authorization", "Basic " + base64Creds);
+        headers.add("Content-Type", "application/x-www-form-urlencoded");
+
+        MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
+        parameters.add("username", "eagleeye");
+        parameters.add("secret", "thisissecret");
+        String body = "grant_type=password&scope=webclient&username=user1&password=password";
+        HttpEntity<String> request = new HttpEntity<>(body, headers);
+
+        //when:
+        ResponseEntity<String> response = restTemplate.postForEntity("http://localhost:8091/auth/oauth/token", request, String.class, parameters);
+
+        //then:
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+        JSONObject json = new JSONObject(response.getBody());
+        token = json.getString("access_token");
+    }
+
+    @Test
+    public void tripCommandPOSTRequestSuccess() {
+        //given:
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Authorization", "Bearer " + token);
+        headers.add("Content-Type", "application/json");
+
+        String body = "{ \"originAddress\": \"Somewhere of the origin\", \"destinationAddress\": "
+                + "\"Somewhere destination\", \"userId\": \"123e4567-e89b-12d3-a456-426655440000\" }";
+        HttpEntity<String> request = new HttpEntity<>(body, headers);
+
+        //when:
+        ResponseEntity<String> response = restTemplate.postForEntity("http://localhost:8092/api/trip", request, String.class);
+
+        //then:
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+    }
+
+    @Test
+    public void tripQueryGETRequestSuccess() {
+        //given:
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Authorization", "Bearer " + token);
+
+        //when:
+        ResponseEntity<String> response = restTemplate.getForEntity("http://localhost:8093/api/trips", String.class);
+
+        //then:
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+    }
+}