Merge branch 'master' into verbose-pact-sources

Author: Ronald Holshausen

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

@@ -3,6 +3,7 @@ package au.com.dius.pact.consumer
 import au.com.dius.pact.consumer.dsl.Matchers
 import au.com.dius.pact.consumer.dsl.PactDslJsonBody
 import au.com.dius.pact.core.model.messaging.Message
+import au.com.dius.pact.core.model.ProviderState
 import groovy.json.JsonSlurper
 import spock.lang.Issue
 import spock.lang.Specification
@@ -117,4 +118,33 @@ class MessagePactBuilderSpec extends Specification {
     messageMetadata == [contentType: 'application/json', otherValue: 10L]
   }
 
+  def 'provider state can accept key/value pairs'() {
+    given:
+    def description = 'some state description'
+    def params = ['stateKey': 'stateValue']
+    def expectedProviderState = new ProviderState(description, params)
+
+    when:
+    def pact = MessagePactBuilder
+      .consumer('MessagePactBuilderSpec')
+      .given(description, params)
+
+    then:
+    pact.providerStates.last() == expectedProviderState
+  }
+
+  def 'provider state can accept ProviderState object'() {
+    given:
+    def description = 'some state description'
+    def params = ['stateKey': 'stateValue']
+    def expectedProviderState = new ProviderState(description, params)
+
+    when:
+    def pact = MessagePactBuilder
+            .consumer('MessagePactBuilderSpec')
+            .given(expectedProviderState)
+
+    then:
+    pact.providerStates.last() == expectedProviderState
+  }
 }

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

@@ -50,14 +50,37 @@ class MessagePactBuilder(
   /**
    * Sets the provider state.
    *
-   * @param providerState state of the provider
+   * @param providerState description of the provider state
    * @return this builder.
    */
   fun given(providerState: String): MessagePactBuilder {
     this.providerStates.add(ProviderState(providerState))
     return this
   }
 
+  /**
+   * Sets the provider state.
+   *
+   * @param providerState description of the provider state
+   * @param params key/value pairs to describe state
+   * @return this builder.
+   */
+  fun given(providerState: String, params: Map<String, Any>): MessagePactBuilder {
+    this.providerStates.add(ProviderState(providerState, params))
+    return this
+  }
+
+  /**
+   * Sets the provider state.
+   *
+   * @param providerState state of the provider
+   * @return this builder.
+   */
+  fun given(providerState: ProviderState): MessagePactBuilder {
+    this.providerStates.add(providerState)
+    return this
+  }
+
   /**
    * Adds a message expectation in the pact.
    *