updated pact provider example to JUnit 5 and Spring Boot 2

Author: thombergs

pact/pact-spring-provider/build.gradle

@@ -1,18 +1,16 @@
 buildscript {
-    ext {
-        springBootVersion = '1.5.4.RELEASE'
-    }
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springboot_version}")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
@@ -26,8 +24,7 @@ dependencies {
     compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('com.h2database:h2:1.4.196')
-    testCompile('au.com.dius:pact-jvm-provider-spring_2.12:3.5.16')
-    testCompile('junit:junit:4.12')
+    testCompile("au.com.dius:pact-jvm-provider-junit5_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }
 

pact/pact-spring-provider/gradle.properties

@@ -0,0 +1,2 @@
+springboot_version=2.0.4.RELEASE
+pact_version=3.5.20

pact/pact-spring-provider/src/main/java/io/reflectoring/UserController.java

@@ -26,15 +26,15 @@ public ResponseEntity<IdObject> createUser(@RequestBody @Valid User user) {
 
 	@PutMapping(path = "/user-service/users/{id}")
 	public ResponseEntity<User> updateUser(@RequestBody @Valid User user, @PathVariable long id) {
-		User userFromDb = userRepository.findOne(id);
+		User userFromDb = userRepository.findById(id).get();
 		userFromDb.updateFrom(user);
 		userFromDb = userRepository.save(userFromDb);
 		return ResponseEntity.ok(userFromDb);
 	}
 
 	@GetMapping(path = "/user-service/users/{id}")
 	public ResponseEntity<User> getUser(@PathVariable("id") Long id) {
-		return ResponseEntity.ok(userRepository.findOne(id));
+		return ResponseEntity.ok(userRepository.findById(id).get());
 	}
 
 

pact/pact-spring-provider/src/test/java/io/reflectoring/UserControllerProviderTest.java

@@ -1,44 +1,54 @@
 package io.reflectoring;
 
+import java.util.Optional;
+
 import au.com.dius.pact.provider.junit.Provider;
 import au.com.dius.pact.provider.junit.State;
 import au.com.dius.pact.provider.junit.loader.PactFolder;
-import au.com.dius.pact.provider.junit.target.HttpTarget;
-import au.com.dius.pact.provider.junit.target.Target;
-import au.com.dius.pact.provider.junit.target.TestTarget;
-import au.com.dius.pact.provider.spring.SpringRestPactRunner;
-import io.reflectoring.User;
-import io.reflectoring.UserRepository;
-import org.junit.runner.RunWith;
+import au.com.dius.pact.provider.junit5.HttpTestTarget;
+import au.com.dius.pact.provider.junit5.PactVerificationContext;
+import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.when;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
 
-@RunWith(SpringRestPactRunner.class)
-@Provider("userservice")
-@PactFolder("../pact-angular/pacts")
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {
-        "server.port=8080"
+				"server.port=8080"
 })
+@Provider("userservice")
+@PactFolder("../pact-angular/pacts")
 public class UserControllerProviderTest {
 
-  @MockBean
-  private UserRepository userRepository;
-
-  @TestTarget
-  public final Target target = new HttpTarget(8080);
-
-  @State({"provider accepts a new person",
-          "person 42 exists"})
-  public void toCreatePersonState() {
-    User user = new User();
-    user.setId(42L);
-    user.setFirstName("Arthur");
-    user.setLastName("Dent");
-    when(userRepository.findOne(eq(42L))).thenReturn(user);
-    when(userRepository.save(any(User.class))).thenReturn(user);
-  }
+	@MockBean
+	private UserRepository userRepository;
+
+	@BeforeEach
+	void setupTestTarget(PactVerificationContext context) {
+		context.setTarget(new HttpTestTarget("localhost", 8080, "/"));
+	}
+
+	@TestTemplate
+	@ExtendWith(PactVerificationInvocationContextProvider.class)
+	void pactVerificationTestTemplate(PactVerificationContext context) {
+		context.verifyInteraction();
+	}
+
+	@State({"provider accepts a new person",
+					"person 42 exists"})
+	public void toCreatePersonState() {
+		User user = new User();
+		user.setId(42L);
+		user.setFirstName("Arthur");
+		user.setLastName("Dent");
+		when(userRepository.findById(eq(42L))).thenReturn(Optional.of(user));
+		when(userRepository.save(any(User.class))).thenReturn(user);
+	}
 
 }