fix: small cleanup of interactionId #1033

pact-foundation · May 18, 2020 · 314f4c8 · 314f4c8
1 parent 1fd0360
commit 314f4c8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/pact-publish/src/test/groovy/broker/PactBrokerClientPactSpec.groovy b/pact-publish/src/test/groovy/broker/PactBrokerClientPactSpec.groovy
@@ -349,7 +349,7 @@ class PactBrokerClientPactSpec extends Specification {
         providerApplicationVersion '10.0.0'
         buildUrl 'http://localhost:8080/build'
         testResults eachLike {
-          interactionId string()
+          interactionId string('12345678')
           success false
           exceptions eachLike {
             message string('Boom!')

diff --git a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt
@@ -159,7 +159,7 @@ open class InteractionRunner<I>(
           notifier.fireTestFailure(Failure(description, e))
         }
         testResult = VerificationResult.Failed(listOf(mapOf("message" to "Request to provider failed with an exception",
-          "exception" to e, "interactionId" to interaction.interactionId)),
+          "exception" to e)),
           "Request to provider failed with an exception", description.displayName,
           listOf(VerificationFailureType.ExceptionFailure(e)), pending, interaction.interactionId)
       } finally {

diff --git a/...junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt b/...junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt
@@ -119,7 +119,7 @@ data class PactVerificationContext @JvmOverloads constructor(
             verifier!!.projectHasProperty.apply(ProviderVerifier.PACT_SHOW_STACKTRACE))
         }
         listOf(VerificationResult.Failed(listOf(mapOf("message" to "Request to provider failed with an exception",
-          "exception" to e, "interactionId" to interaction.interactionId)),
+          "exception" to e)),
           "Request to provider failed with an exception", interactionMessage,
           listOf(VerificationFailureType.ExceptionFailure(e)), consumer.pending, interaction.interactionId))
       }

diff --git a/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt b/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt
@@ -67,7 +67,7 @@ open class MvcProviderVerifier(private val debugRequestResponse: Boolean = false
         it.requestFailed(provider, interaction, interactionMessage, e, projectHasProperty.apply(PACT_SHOW_STACKTRACE))
       }
       return VerificationResult.Failed(listOf(mapOf("message" to "Request to provider method failed with an exception",
-        "exception" to e, "interactionId" to interaction.interactionId)),
+        "exception" to e)),
         "Request to provider method failed with an exception", interactionMessage,
         listOf(VerificationFailureType.ExceptionFailure(e)), pending, interaction.interactionId)
     }

diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt
@@ -330,7 +330,7 @@ open class ProviderVerifier @JvmOverloads constructor (
       failures[interactionMessage] = e
       reporters.forEach { it.verificationFailed(interaction, e, projectHasProperty.apply(PACT_SHOW_STACKTRACE)) }
       return VerificationResult.Failed(listOf(mapOf("message" to "Request to provider method failed with an exception",
-        "exception" to e, "interactionId" to interaction.interactionId)),
+        "exception" to e)),
         "Request to provider method failed with an exception", interactionMessage,
         listOf(VerificationFailureType.ExceptionFailure(e)), consumer.pending, interaction.interactionId)
     }
@@ -351,15 +351,13 @@ open class ProviderVerifier @JvmOverloads constructor (
       when (comparison) {
         is Err -> {
           failures["$comparisonDescription has a matching body"] = comparison.error.description()
-          VerificationResult.Failed(listOf(comparison.error.toMap() +
-            mapOf("interactionId" to interactionId, "type" to "body")),
+          VerificationResult.Failed(listOf(comparison.error.toMap() + ("type" to "body")),
             "Body had differences", comparisonDescription,
             listOf(VerificationFailureType.MismatchFailure(comparison.error)), pending, interactionId)
         }
         is Ok -> {
           failures["$comparisonDescription has a matching body"] = comparison.value
-          VerificationResult.Failed(listOf(comparison.value.mismatches +
-            mapOf("interactionId" to interactionId, "type" to "body")),
+          VerificationResult.Failed(listOf(comparison.value.mismatches + ("type" to "body")),
             "Body had differences", comparisonDescription, comparison.value.mismatches.values.flatten()
               .map { VerificationFailureType.MismatchFailure(it) }, pending, interactionId)
         }
@@ -437,7 +435,7 @@ open class ProviderVerifier @JvmOverloads constructor (
           failures["$comparisonDescription includes metadata \"$key\" with value \"$expectedValue\""] =
             metadataComparison
           result = result.merge(VerificationResult.Failed(listOf(mapOf(key to metadataComparison,
-            "interactionId" to interactionId, "type" to "metadata")),
+            "type" to "metadata")),
             verificationDescription = comparisonDescription,
             failures = metadataComparison.map { VerificationFailureType.MismatchFailure(it) }, pending = pending,
             interactionId = interactionId
@@ -503,8 +501,7 @@ open class ProviderVerifier @JvmOverloads constructor (
       return result
     } else {
       return VerificationResult.Failed(listOf(mapOf("message" to "State change request failed",
-        "exception" to stateChangeResult.stateChangeResult.getError(),
-        "interactionId" to interaction.interactionId)), "State change request failed",
+        "exception" to stateChangeResult.stateChangeResult.getError())), "State change request failed",
         stateChangeResult.message,
         listOf(VerificationFailureType.StateChangeFailure(stateChangeResult)),
         consumer.pending, interaction.interactionId
@@ -557,8 +554,8 @@ open class ProviderVerifier @JvmOverloads constructor (
     } else {
       reporters.forEach { it.statusComparisonFailed(status, mismatch.description()) }
       failures["$comparisonDescription has status code $status"] = mismatch.description()
-      VerificationResult.Failed(listOf(mismatch.toMap() + mapOf("interactionId" to interactionId,
-        "type" to "status")), "Response status did not match", comparisonDescription,
+      VerificationResult.Failed(listOf(mismatch.toMap() + ("type" to "status")),
+        "Response status did not match", comparisonDescription,
         listOf(VerificationFailureType.MismatchFailure(mismatch)), pending, interactionId)
     }
   }
@@ -625,7 +622,7 @@ open class ProviderVerifier @JvmOverloads constructor (
         it.requestFailed(provider, interaction, interactionMessage, e, projectHasProperty.apply(PACT_SHOW_STACKTRACE))
       }
       VerificationResult.Failed(listOf(mapOf("message" to "Request to provider failed with an exception",
-        "exception" to e, "interactionId" to interaction.interactionId)),
+        "exception" to e)),
         "Request to provider method failed with an exception", interactionMessage,
         listOf(VerificationFailureType.ExceptionFailure(e)), pending, interaction.interactionId)
     }

diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationResult.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationResult.kt
@@ -118,7 +118,8 @@ sealed class VerificationResult {
         interactionId ?: result.interactionId)
     }
 
-    override fun toTestResult() = TestResult.Failed(results, description)
+    override fun toTestResult() =
+      TestResult.Failed(results.map { it + ("interactionId" to interactionId) }, description)
   }
 
   /**