@@ -33,7 +33,6 @@ public class EdgeServiceIntegrationTests {
3333 private static String tripQueryURL ;
3434 private static String gmapsAdapterURL ;
3535 private static String calculationServiceURL ;
36- // private static String userServiceEndpoint;
3736
3837 //Wait for all services to have ports open
3938 @ ClassRule
@@ -46,9 +45,9 @@ public class EdgeServiceIntegrationTests {
4645 .waitingForService ("calculationservice" , HealthChecks .toHaveAllPortsOpen ())
4746 .waitingForService ("discovery-service" , HealthChecks .toHaveAllPortsOpen ())
4847 .waitingForService ("userservice" , HealthChecks .toRespondOverHttp (8091 ,
49- (port ) -> port .inFormat ("http://localhost:8091" )))
48+ (port ) -> port .inFormat ("http://localhost:8091" )))
5049 .waitingForService ("discovery-service" , HealthChecks .toRespondOverHttp (8761 ,
51- (port ) -> port .inFormat ("http://localhost:8761" )))
50+ (port ) -> port .inFormat ("http://localhost:8761" )))
5251 .build ();
5352
5453 //Get IP addresses and ports to run tests on
@@ -78,12 +77,6 @@ public static void initialize() {
7877 calculationServiceURL = String .format ("http://%s:%s" , calculationService .getIp (),
7978 calculationService .getExternalPort ());
8079 LOG .info ("Calculation Service endpoint found: " + calculationServiceURL );
81-
82- // DockerPort userService = docker.containers().container("userservice")
83- // .port(8091);
84- // userServiceEndpoint = String.format("http://%s:%s", userService.getIp(),
85- // userService.getExternalPort());
86- // LOG.info("User Service Endpoint found: " + userServiceEndpoint);
8780 }
8881
8982 private TestRestTemplate restTemplate = new TestRestTemplate ();
@@ -108,7 +101,8 @@ public void setUp() throws JSONException {
108101 HttpEntity <String > request = new HttpEntity <>(body , headers );
109102
110103 //when:
111- ResponseEntity <String > response = restTemplate .postForEntity ("http://localhost:8091/auth/oauth/token" , request , String .class , parameters );
104+ ResponseEntity <String > response = restTemplate .postForEntity ("http://localhost:8091/auth/oauth/token" ,
105+ request , String .class , parameters );
112106
113107 //then:
114108 assertThat (response .getStatusCodeValue ()).isEqualTo (200 );
@@ -128,7 +122,8 @@ public void tripCommandPOSTRequestSuccess() {
128122 HttpEntity <String > request = new HttpEntity <>(body , headers );
129123
130124 //when:
131- ResponseEntity <String > response = restTemplate .postForEntity (tripCommandURL + "/api/v1/trip" , request , String .class );
125+ ResponseEntity <String > response = restTemplate .postForEntity (tripCommandURL + "/api/v1/trip" , request ,
126+ String .class );
132127
133128 //then:
134129 assertThat (response .getStatusCodeValue ()).isEqualTo (201 );
0 commit comments