fix: Upgraded JUnit to 5.5.2; fixed JUnit4 tests that were not running #967

Author: Ronald Holshausen

Diff for: consumer/pact-jvm-consumer-specs2/build.gradle

@@ -12,4 +12,5 @@ dependencies {
     testCompile "org.specs2:specs2-junit_2.12:${project.specs2Version}",
       "ch.qos.logback:logback-core:${project.logbackVersion}",
       "ch.qos.logback:logback-classic:${project.logbackVersion}"
+    testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
 }

Diff for: consumer/pact-jvm-consumer-specs2/src/test/groovy/au/com/dius/pact/consumer/specs2/PrettyPrinterSpec.groovy

@@ -1,34 +1,33 @@
 package au.com.dius.pact.consumer.specs2
 
+import au.com.dius.pact.consumer.PactVerificationResult
 import au.com.dius.pact.core.matchers.BodyMismatch
 import au.com.dius.pact.core.matchers.HeaderMismatch
-import au.com.dius.pact.core.matchers.PartialRequestMatch
+import au.com.dius.pact.core.matchers.Mismatch
 import au.com.dius.pact.core.matchers.PathMismatch
 import au.com.dius.pact.core.model.OptionalBody
-import au.com.dius.pact.core.model.ProviderState
 import au.com.dius.pact.core.model.Request
-import au.com.dius.pact.core.model.RequestResponseInteraction
 import au.com.dius.pact.core.model.Response
+import scala.collection.JavaConverters
 import spock.lang.Specification
 
 class PrettyPrinterSpec extends Specification {
 
     def headers = [testreqheader: 'testreqheadervalue', 'Content-Type': 'application/json']
-    def request = new Request('POST', '/', null, headers, OptionalBody.body('{"test": true}'.bytes))
+    def request = new Request('POST', '/', [:], headers, OptionalBody.body('{"test": true}'.bytes))
     def response = new Response(200, [testreqheader: 'testreqheaderval', 'Access-Control-Allow-Origin': '*'],
       OptionalBody.body('{"responsetest": true}'.bytes))
 
-    def print(mismatch) {
-      PrettyPrinter.print(PactSessionResults.empty().addAlmostMatched(
-        new PartialRequestMatch([(new RequestResponseInteraction('test interaction', [
-          new ProviderState('test state')], request, response)): [mismatch]])))
+    def printMismatch(Mismatch mismatch) {
+      PrettyPrinter.print(JavaConverters.asScalaBuffer(
+        [new PactVerificationResult.PartialMismatch([mismatch])]).toSeq())
     }
 
     def plus = '+++ '
 
     def 'header mismatch'() {
         expect:
-        print(new HeaderMismatch('foo', 'bar', '', null)) ==
+        printMismatch(new HeaderMismatch('foo', 'bar', '', '')) ==
                 """--- Header foo
                 |$plus
                 |@@ -1,1 +1,1 @@
@@ -38,7 +37,7 @@ class PrettyPrinterSpec extends Specification {
 
     def 'path mismatch'() {
         expect:
-        print(new PathMismatch('/foo/bar', '/foo/baz')) ==
+        printMismatch(new PathMismatch('/foo/bar', '/foo/baz')) ==
               """--- Path
               |$plus
               |@@ -1,1 +1,1 @@
@@ -48,13 +47,13 @@ class PrettyPrinterSpec extends Specification {
 
     def 'body mismatch'() {
         expect:
-        print(new BodyMismatch('{"foo": "bar"}', '{"ork": "Bif"}')) ==
+        printMismatch(new BodyMismatch('{"foo": "bar"}', '{"ork": "Bif"}', '')) ==
               """--- Body
               |$plus
               |@@ -1,3 +1,3 @@
               | {
-              |-    "foo": "bar"
-              |+    "ork": "Bif"
+              |-  "foo": "bar"
+              |+  "ork": "Bif"
               | }""".stripMargin()
     }
 }