mods

Author: piomin

trip-management/pom.xml

@@ -71,15 +71,15 @@
                 <version>3.5.21</version>
                 <configuration>
                     <pactBrokerUrl>http://192.168.99.100:9080</pactBrokerUrl>
-                    <serviceProviders>
-                        <serviceProvider>
-                            <name>passengerManagementProvider</name>
-                            <protocol>http</protocol>
-                            <host>localhost</host>
-                            <port>50925</port>
-                            <pactFileDirectory>target/pacts</pactFileDirectory>
-                        </serviceProvider>
-                    </serviceProviders>
+                    <!--<serviceProviders>-->
+                        <!--<serviceProvider>-->
+                            <!--<name>passengerManagementProvider</name>-->
+                            <!--<protocol>http</protocol>-->
+                            <!--<host>localhost</host>-->
+                            <!--<port>50925</port>-->
+                            <!--<pactFileDirectory>target/pacts</pactFileDirectory>-->
+                        <!--</serviceProvider>-->
+                    <!--</serviceProviders>-->
                 </configuration>
             </plugin>
             <plugin>

trip-management/src/main/java/pl/piomin/services/trip/model/Passenger.java

@@ -5,6 +5,7 @@ public class Passenger {
     private Long id;
     private String name;
     private String phoneNo;
+    private String login;
     private int balance;
     private int homeLocationX;
     private int homeLocationY;
@@ -75,4 +76,11 @@ public void setDiscount(int discount) {
         this.discount = discount;
     }
 
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
 }

trip-management/src/test/java/pl/piomin/services/trip/TripDiffIntegrationTests.java

@@ -49,7 +49,7 @@ public class TripDiffIntegrationTests {
             hoverflyRule = HoverflyRule.inDiffMode(SimulationSource.dsl(
                     HoverflyDsl.service(HoverflyMatchers.startsWith(InetAddress.getLocalHost().getHostName()))
                             .get(HoverflyMatchers.startsWith("/passengers/"))
-                            .willReturn(ResponseCreators.success(HttpBodyConverter.jsonWithSingleQuotes("{'id':1,'name':'John Smith'}")).header("Content-Type", "application/json;charset=UTF-8")),
+                            .willReturn(ResponseCreators.success(HttpBodyConverter.jsonWithSingleQuotes("{'id':1,'name':'John Smith','login':'{{ Request.Path.[2] }}'}")).header("Content-Type", "application/json;charset=UTF-8")),
                     HoverflyDsl.service(HoverflyMatchers.startsWith(InetAddress.getLocalHost().getHostName()))
                             .get(HoverflyMatchers.startsWith("/drivers/"))
                             .willReturn(ResponseCreators.success(HttpBodyConverter.jsonWithSingleQuotes("{'id':1,'name':'David Smith','currentLocationX': 15,'currentLocationY':25}")))

trip-management/src/test/java/pl/piomin/services/trip/TripHoverflyIntegrationTests.java

@@ -1,5 +1,6 @@
 package pl.piomin.services.trip;
 
+import io.specto.hoverfly.junit.core.SimulationSource;
 import io.specto.hoverfly.junit.rule.HoverflyRule;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -12,6 +13,8 @@
 import pl.piomin.services.trip.client.PassengerManagementClient;
 import pl.piomin.services.trip.model.Passenger;
 
+import java.nio.file.Paths;
+
 @SpringBootTest(properties = "eureka.client.registerWithEureka=false")
 @RunWith(SpringRunner.class)
 public class TripHoverflyIntegrationTests {
@@ -22,13 +25,18 @@ public class TripHoverflyIntegrationTests {
     @ClassRule
     public static HoverflyRule hoverflyRule = HoverflyRule
             .inCaptureOrSimulationMode("passenger-management.json")
+//            .inSpyMode(SimulationSource.file(Paths.get("src/test/resources/hoverfly","passenger-management.json")))
             .printSimulationData();
 
     @Test
     public void testGetPassengerByLogin() {
-        Passenger passenger = passengerManagementClient.getPassenger("walker");
+        final String login = "walker2";
+        Passenger passenger = passengerManagementClient.getPassenger(login);
         Assert.notNull(passenger, "No passenger");
+        Assert.notNull(passenger.getId(), "No passenger id");
         Assert.notNull(passenger.getName(), "No passenger name");
+        Assert.notNull(passenger.getLogin(), "No passenger login");
+        Assert.isTrue(passenger.getLogin().equals(login), "Invalid passenger login");
     }
 
 }