feat: completed the import of the Scala modules to the new structure

consumer/pact-jvm-consumer-groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy

@@ -354,11 +354,12 @@ class PactBuilder extends BaseBuilder {
    * @param options Optional map of options for the run
    * @param closure
    */
+  @SuppressWarnings('InvertedIfElse')
   void runTestAndVerify(Map options = [:], Closure closure) {
     PactVerificationResult result = runTest(options, closure)
-    if (result != PactVerificationResult.Ok.INSTANCE) {
+    if (!(result instanceof PactVerificationResult.Ok)) {
       if (result instanceof PactVerificationResult.Error) {
-        if (result.mockServerState != PactVerificationResult.Ok.INSTANCE) {
+        if (!(result.mockServerState instanceof PactVerificationResult.Ok)) {
           throw new AssertionError('Pact Test function failed with an exception, possibly due to ' +
             result.mockServerState, result.error)
         } else {

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/ExampleFileUploadSpec.groovy

@@ -42,7 +42,7 @@ class ExampleFileUploadSpec extends Specification {
         }
 
         then:
-        result == PactVerificationResult.Ok.INSTANCE
+        result instanceof PactVerificationResult.Ok
     }
 
 }

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/ExampleFormPostTest.groovy

@@ -23,12 +23,12 @@ class ExampleFormPostTest {
             willRespondWith(status: 201, body: 'form posted ok', headers: ['Content-Type': 'text/plain'])
         }
 
-        assert PactVerificationResult.Ok.INSTANCE == service.runTest {
+        assert service.runTest {
             def http = new HTTPBuilder( 'http://localhost:8000' )
             http.post(path: '/path', body: [number: '12345678'], requestContentType: ContentType.URLENC) { resp ->
                 assert resp.statusLine.statusCode == 201
             }
-        }
+        } instanceof PactVerificationResult.Ok
     }
 
 }

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/ExampleGroovyConsumerPactTest.groovy

@@ -63,7 +63,7 @@ class ExampleGroovyConsumerPactTest {
             def data = aliceResponse.data.text()
             assert data == '"That is some good Mallory."'
         }
-        assert result == PactVerificationResult.Ok.INSTANCE
+        assert result instanceof PactVerificationResult.Ok
 
         result = bobService.runTest { mockServer, context ->
             def client = new RESTClient(mockServer.url)

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/ExampleGroovyConsumerV3PactTest.groovy

@@ -43,7 +43,7 @@ class ExampleGroovyConsumerV3PactTest {
             def data = aliceResponse.data.text()
             assert data == '"That is some good Mallory."'
         }
-        assert result == PactVerificationResult.Ok.INSTANCE
+        assert result instanceof PactVerificationResult.Ok
 
       def pactFile = new File("${PactConsumerConfig.INSTANCE.pactDirectory}/V3Consumer-V3Service.json")
       def json = new JsonSlurper().parse(pactFile)

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/GroovyConsumerMatchersPactSpec.groovy

@@ -109,7 +109,7 @@ class GroovyConsumerMatchersPactSpec extends Specification {
     }
 
     then:
-    result == PactVerificationResult.Ok.INSTANCE
+    result instanceof PactVerificationResult.Ok
   }
 
   def 'matching on query parameters'() {
@@ -136,7 +136,7 @@ class GroovyConsumerMatchersPactSpec extends Specification {
     }
 
     then:
-    result == PactVerificationResult.Ok.INSTANCE
+    result instanceof PactVerificationResult.Ok
   }
 
   def 'matching with and and or'() {
@@ -169,6 +169,6 @@ class GroovyConsumerMatchersPactSpec extends Specification {
     }
 
     then:
-    result == PactVerificationResult.Ok.INSTANCE
+    result instanceof PactVerificationResult.Ok
   }
 }

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/ProviderStateInjectedPactTest.groovy

@@ -41,7 +41,7 @@ class ProviderStateInjectedPactTest {
       assert response.status == 200
       assert response.data == [userName: 'Test', userId: 100]
     }
-    assert result == PactVerificationResult.Ok.INSTANCE
+    assert result instanceof PactVerificationResult.Ok
 
     def pactFile = new File("${PactConsumerConfig.pactDirectory}/V3Consumer-ProviderStateService.json")
     def json = new JsonSlurper().parse(pactFile)

consumer/pact-jvm-consumer-groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/WildcardPactSpec.groovy

@@ -58,7 +58,7 @@ class WildcardPactSpec extends Specification {
     }
 
     then:
-    result == PactVerificationResult.Ok.INSTANCE
+    result instanceof PactVerificationResult.Ok
     articleService.interactions.size() == 1
     articleService.interactions[0].response.matchingRules.rulesForCategory('body').matchingRules.keySet() == [
       '$.articles',
@@ -115,7 +115,7 @@ class WildcardPactSpec extends Specification {
     }
 
     then:
-    result == PactVerificationResult.Ok.INSTANCE
+    result instanceof PactVerificationResult.Ok
     articleService.interactions.size() == 1
     articleService.interactions[0].response.matchingRules.rulesForCategory('body').matchingRules.keySet() == [
       '$.events',

consumer/pact-jvm-consumer-junit/src/main/java/au/com/dius/pact/consumer/junit/BaseProviderRule.java

@@ -163,6 +163,8 @@ private PactVerificationResult runPactTest(final Statement base, RequestResponse
         if (pactFolder != null) {
           context.setPactFolder(pactFolder.value());
         }
+
+        return null;
       });
   }
 

consumer/pact-jvm-consumer-junit/src/main/java/au/com/dius/pact/consumer/junit/ConsumerPactTest.java

@@ -28,12 +28,15 @@ public void testPact() throws Throwable {
         RequestResponsePact pact = createPact(ConsumerPactBuilder.consumer(consumerName()).hasPactWith(providerName()));
         final MockProviderConfig config = MockProviderConfig.createDefault(getSpecificationVersion());
 
-        PactVerificationResult result = runConsumerTest(pact, config, this::runTest);
+        PactVerificationResult result = runConsumerTest(pact, config, (mockServer, context) -> {
+          runTest(mockServer, context);
+          return null;
+        });
 
-        if (!result.equals(PactVerificationResult.Ok.INSTANCE)) {
+        if (!(result instanceof PactVerificationResult.Ok)) {
             if (result instanceof PactVerificationResult.Error) {
               PactVerificationResult.Error error = (PactVerificationResult.Error) result;
-              if (error.getMockServerState() != PactVerificationResult.Ok.INSTANCE) {
+              if (!(error.getMockServerState() instanceof PactVerificationResult.Ok)) {
                 throw new AssertionError("Pact Test function failed with an exception, possibly due to " +
                   error.getMockServerState(), ((PactVerificationResult.Error) result).getError());
               } else {

consumer/pact-jvm-consumer-junit/src/test/clojure/au/com/dius/pact/consumer/example_clojure_consumer_pact_test.clj

@@ -16,7 +16,7 @@
                             (.status 200)
                             .toPact)
         config (-> (MockProviderConfig/createDefault))]
-    (is (= (PactVerificationResult$Ok/INSTANCE)
+    (is (instance? PactVerificationResult$Ok
         (ConsumerPactRunnerKt/runConsumerTest consumer-pact config
           (proxy [PactTestRun] []
             (run [mock-server _] (

consumer/pact-jvm-consumer-junit/src/test/java/au/com/dius/pact/consumer/examples/DirectDSLConsumerPactTest.java

@@ -12,6 +12,9 @@
 import java.util.Map;
 
 import static au.com.dius.pact.consumer.ConsumerPactRunnerKt.runConsumerTest;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -44,13 +47,14 @@ public void testPact() {
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+            return null;
         });
 
         if (result instanceof PactVerificationResult.Error) {
             throw new RuntimeException(((PactVerificationResult.Error)result).getError());
         }
 
-        assertEquals(PactVerificationResult.Ok.INSTANCE, result);
+        assertThat(result, is(instanceOf(PactVerificationResult.Ok.class)));
     }
 
 }

consumer/pact-jvm-consumer-junit/src/test/java/au/com/dius/pact/consumer/pactproviderrule/PactMultiProviderTest.java

@@ -77,7 +77,7 @@ public RequestResponsePact createFragment2(PactDslWithProvider builder) {
     public void allPass() throws IOException {
       mockTestProvider.validateResultWith((result, t) -> {
         assertThat(t, is(nullValue()));
-        assertThat(result, is(PactVerificationResult.Ok.INSTANCE));
+        assertThat(result, is(instanceOf(PactVerificationResult.Ok.class)));
       });
       doTest("/", NAME_LARRY_JSON);
     }
@@ -92,7 +92,7 @@ public void consumerTestFails() throws IOException, InterruptedException {
         PactVerificationResult.Error error = (PactVerificationResult.Error) result;
         assertThat(error.getError(), is(instanceOf(RuntimeException.class)));
         assertThat(error.getError().getMessage(), is("Oops"));
-        assertThat(error.getMockServerState(), is(PactVerificationResult.Ok.INSTANCE));
+        assertThat(error.getMockServerState(), is(instanceOf(PactVerificationResult.Ok.class)));
       });
       doTest("/", NAME_LARRY_JSON);
       throw new RuntimeException("Oops");

consumer/pact-jvm-consumer-junit/src/test/java/au/com/dius/pact/consumer/pactproviderrule/PactProviderTest.java

@@ -73,7 +73,7 @@ public void runTestWithUserCodeFailure() throws IOException {
           "<{responsetest=true, name=harry}> but was:<{responsetest=true, name=fred}>"));
         assertThat(result, is(instanceOf(PactVerificationResult.Error.class)));
         PactVerificationResult.Error error = (PactVerificationResult.Error) result;
-        assertThat(error.getMockServerState(), is(instanceOf(PactVerificationResult.Ok.INSTANCE.getClass())));
+        assertThat(error.getMockServerState(), is(instanceOf(PactVerificationResult.Ok.class)));
         assertThat(error.getError(), is(instanceOf(AssertionError.class)));
       });
       Assert.assertEquals(new ConsumerClient(mockTestProvider.getUrl()).options("/second"), 200);

consumer/pact-jvm-consumer-junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt

@@ -292,8 +292,8 @@ class PactConsumerTestExt : Extension, BeforeEachCallback, BeforeAllCallback, Pa
         val config = store["mockServerConfig"] as MockProviderConfig
         Thread.sleep(100) // give the mock server some time to have consistent state
         mockServer.close()
-        val result = mockServer.validateMockServerState()
-        if (result === PactVerificationResult.Ok) {
+        val result = mockServer.validateMockServerState(null)
+        if (result is PactVerificationResult.Ok) {
           logger.debug {
             "Writing pact ${pact.consumer.name} -> ${pact.provider.name} to file " +
               "${pact.fileForPact(pactDirectory)}"