feat: Get verification working

Author: TimothyJones

build.gradle

@@ -17,20 +17,20 @@ repositories {
 
 def caseCoreVersion = "0.15.6"
 def caseBoundaryVersion = "0.11.0"
-def grpcVersion = "1.60.1"
+def grpcVersion = "1.62.2"
 
 dependencies {
     api "io.contract-testing.contractcase:case_example_mock_types:${caseCoreVersion}"
     api "io.contract-testing.contractcase:test-equivalence-matchers:${caseCoreVersion}"
     implementation "io.contract-testing.contractcase:case_boundary:${caseBoundaryVersion}"
     implementation 'com.diogonunes:JColor:5.5.1'
-    implementation 'com.google.protobuf:protobuf-java:3.25.1'
-    implementation 'com.google.protobuf:protobuf-java-util:3.25.1'
-    implementation 'com.google.protobuf:protoc:3.25.1'
+    implementation 'com.google.protobuf:protobuf-java:3.25.3'
+    implementation 'com.google.protobuf:protobuf-java-util:3.25.3'
+    implementation 'com.google.protobuf:protoc:3.25.3'
     implementation "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
     implementation "io.grpc:grpc-core:${grpcVersion}"
     implementation "io.grpc:grpc-stub:${grpcVersion}"
-    implementation "io.grpc:grpc-okhttp:${grpcVersion}"
+    implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
     implementation 'org.jetbrains:annotations:23.0.0'

src/main/java/io/contract_testing/contractcase/BoundaryExceptionMapper.java

@@ -14,7 +14,16 @@ static String stackTraceToString(Throwable e) {
   }
 
   static BoundaryFailure map(Throwable e) {
-    return new BoundaryFailure(e.getClass().getName(), e.getMessage(), stackTraceToString(e));
+    var failure = new BoundaryFailure(
+        e.getClass().getName(),
+        e.getMessage(),
+        stackTraceToString(e)
+    );
+    if (failure.getResultType() == null) {
+      throw new ContractCaseCoreError(
+          "Missing a result type - this is almost certainly a threading issue in the Java DSL (both grpc and jsii are not thread safe)");
+    }
+    return failure;
   }
 
   static BoundaryFailure mapAsTriggerFailure(Throwable e) {

src/main/java/io/contract_testing/contractcase/ContractDefiner.java

@@ -18,7 +18,6 @@ public ContractDefiner(final @NotNull ContractCaseConfig config) {
       definer = new InternalDefinerClient(
           BoundaryConfigMapper.map(config, TEST_RUN_ID),
           logPrinter,
-          logPrinter,
           new BoundaryVersionGenerator().getVersions()
       );
     } catch (Throwable e) {

src/main/java/io/contract_testing/contractcase/ContractVerifier.java

@@ -1,17 +1,25 @@
 package io.contract_testing.contractcase;
 
-import io.contract_testing.contractcase.case_boundary.BoundaryResult;
-import io.contract_testing.contractcase.case_boundary.IInvokeCoreTest;
-import io.contract_testing.contractcase.case_boundary.IRunTestCallback;
+import io.contract_testing.contractcase.case_boundary.BoundaryCrashMessage;
 import io.contract_testing.contractcase.client.InternalVerifierClient;
 import io.contract_testing.contractcase.client.MaintainerLog;
+import io.contract_testing.contractcase.edge.ConnectorExceptionMapper;
+import io.contract_testing.contractcase.edge.ConnectorFailure;
+import io.contract_testing.contractcase.edge.ConnectorFailureKindConstants;
+import io.contract_testing.contractcase.edge.ConnectorResult;
+import io.contract_testing.contractcase.edge.ConnectorResultTypeConstants;
+import io.contract_testing.contractcase.edge.InvokeCoreTest;
+import io.contract_testing.contractcase.edge.RunTestCallback;
+import java.util.ArrayList;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 
 public class ContractVerifier {
 
   private final InternalVerifierClient verifier;
 
+  private final List<ConnectorFailure> failures = new ArrayList<>();
+
   public ContractVerifier(ContractCaseConfig config) {
     LogPrinter logPrinter = new LogPrinter();
 
@@ -20,22 +28,51 @@ public ContractVerifier(ContractCaseConfig config) {
       verification = new InternalVerifierClient(
           BoundaryConfigMapper.map(config, "VERIFICATION"),
           // TODO: Move the runTestCallback into the internals, maybe?
-          new IRunTestCallback() {
+          new RunTestCallback() {
             @Override
-            public @NotNull BoundaryResult runTest(@NotNull String testName,
-                @NotNull IInvokeCoreTest invoker) {
+            public @NotNull ConnectorResult runTest(@NotNull String testName,
+                @NotNull InvokeCoreTest invoker) {
               // TODO replace this with something that knows about JUnit
               try {
-                MaintainerLog.log("Invoking verifier");
+                MaintainerLog.log("Invoking verifier for: " + testName);
                 var result = invoker.verify();
-                MaintainerLog.log("Verifier result was: " + result);
+
+                // TODO: Replace this with something that knows what to do with these results
+                if (result.getResultType().equals(ConnectorResultTypeConstants.RESULT_SUCCESS)) {
+                  MaintainerLog.log("");
+                  MaintainerLog.log("[SUCCESS] " + testName);
+                  MaintainerLog.log("");
+
+                } else {
+                  var failure = ((ConnectorFailure) result);
+                  failures.add(failure);
+                  var kind = failure.getKind();
+                  if (kind.equals(ConnectorFailureKindConstants.CASE_CORE_ERROR)) {
+                    System.err.println(
+                        BoundaryCrashMessage.CRASH_MESSAGE_START
+                            + "\n\n"
+                            + failure.getMessage()
+                            + "\n"
+                            + failure.getLocation()
+                            + "\n\n"
+                            + BoundaryCrashMessage.CRASH_MESSAGE_END);
+                  } else if (kind.equals(ConnectorFailureKindConstants.CASE_CONFIGURATION_ERROR)) {
+                    MaintainerLog.log("");
+                    MaintainerLog.log("[CONFIGURATION ERROR] " + failure.getMessage());
+                    MaintainerLog.log("");
+                  } else {
+                    MaintainerLog.log("");
+                    MaintainerLog.log("[OTHER ERROR] " + failure.getMessage());
+                    MaintainerLog.log("");
+                  }
+                }
                 return result;
               } catch (Exception e) {
-                return BoundaryExceptionMapper.map(e);
+                return ConnectorExceptionMapper.map(e);
               }
             }
 
-          }, logPrinter, logPrinter, new BoundaryVersionGenerator().getVersions()
+          }, logPrinter, new BoundaryVersionGenerator().getVersions()
       );
     } catch (Throwable e) {
       BoundaryCrashReporter.handleAndRethrow(e);
@@ -60,5 +97,13 @@ public void runVerification(ContractCaseConfig configOverrides) {
     } catch (Throwable e) {
       BoundaryCrashReporter.handleAndRethrow(e);
     }
+    if (!failures.isEmpty()) {
+      try {
+        BoundaryResultMapper.mapVoid(ConnectorResult.toBoundaryResult(failures.get(0)));
+      } catch (Throwable e) {
+        BoundaryCrashReporter.handleAndRethrow(e);
+      }
+
+    }
   }
 }