fix: after upgrade of Spock

pact-foundation · Sep 20, 2020 · 62bdb1e · 62bdb1e
1 parent 4165ca8
commit 62bdb1e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 7 deletions.
diff --git a/consumer/java8/build.gradle b/consumer/java8/build.gradle
@@ -2,6 +2,7 @@ dependencies {
   api project(path: ":consumer", configuration: 'default')
 
   testImplementation "org.junit.jupiter:junit-jupiter:${project.junit5Version}"
+  testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
   testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"

diff --git a/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslJsonArrayTest.java b/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslJsonArrayTest.java
@@ -8,7 +8,7 @@
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class LambdaDslJsonArrayTest {
 

diff --git a/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslObjectTest.java b/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslObjectTest.java
@@ -13,7 +13,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class LambdaDslObjectTest {
 

diff --git a/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslTest.java b/consumer/java8/src/test/java/io/pactfoundation/consumer/dsl/LambdaDslTest.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class LambdaDslTest {
 

diff --git a/consumer/java8/src/test/kotlin/io/pactfoundation/consumer/dsl/ExtensionsTest.kt b/consumer/java8/src/test/kotlin/io/pactfoundation/consumer/dsl/ExtensionsTest.kt
@@ -1,7 +1,7 @@
 package io.pactfoundation.consumer.dsl
 
 import org.hamcrest.CoreMatchers.equalTo
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 class ExtensionsTest {

diff --git a/core/matchers/build.gradle b/core/matchers/build.gradle
@@ -11,6 +11,7 @@ dependencies {
   testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
   testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
+  testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
   testCompile('org.spockframework:spock-core:2.0-M3-groovy-3.0') {
     exclude group: 'org.codehaus.groovy'
   }

diff --git a/core/matchers/src/test/groovy/au/com/dius/pact/core/matchers/MatchersSpec.groovy b/core/matchers/src/test/groovy/au/com/dius/pact/core/matchers/MatchersSpec.groovy
@@ -123,8 +123,8 @@ class MatchersSpec extends Specification {
   @Unroll
   def 'wildcardMatchingEnabled - #enabledOrDisabled when pact.matching.wildcard = "#value"'() {
     given:
-    def testInvocation = { String value ->
-      System.setProperty('pact.matching.wildcard', value)
+    def testInvocation = { String v ->
+      System.setProperty('pact.matching.wildcard', v)
       Matchers.wildcardMatchingEnabled()
     }
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt
@@ -103,7 +103,8 @@ class ContentType(val contentType: MediaType?) {
 
     val JSON_TYPE = ".*json".toRegex(setOf(RegexOption.IGNORE_CASE))
 
-    val registry: MediaTypeRegistry = MimeTypes.getDefaultMimeTypes(ContentType::class.java.classLoader).mediaTypeRegistry
+    val registry: MediaTypeRegistry = MimeTypes.getDefaultMimeTypes(ContentType::class.java.classLoader)
+      .mediaTypeRegistry
 
     @JvmStatic
     val UNKNOWN = ContentType(null)

diff --git a/provider/maven/build.gradle b/provider/maven/build.gradle
@@ -7,6 +7,7 @@ dependencies {
   compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
   implementation 'com.github.ajalt:mordant:1.2.1'
 
+  testImplementation "junit:junit:${project.junitVersion}"
   testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testCompile "org.codehaus.groovy:groovy-nio:${project.groovyVersion}"