test: add tests for generated values with XML within JSON #1031

Author: Ronald Holshausen

core/model/src/test/groovy/au/com/dius/pact/core/model/PactReaderSpec.groovy

@@ -7,8 +7,12 @@ import com.amazonaws.services.s3.model.S3Object
 import com.amazonaws.services.s3.model.S3ObjectInputStream
 import com.google.gson.JsonParser
 import org.apache.http.impl.client.BasicCredentialsProvider
+import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
+import spock.util.environment.RestoreSystemProperties
+
+import static au.com.dius.pact.core.model.generators.Category.BODY
 
 @SuppressWarnings('DuplicateMapLiteral')
 class PactReaderSpec extends Specification {
@@ -313,7 +317,7 @@ class PactReaderSpec extends Specification {
   @Unroll
   def 'determining pact spec version'() {
     expect:
-    DefaultPactReader.INSTANCE.determineSpecVersion(new JsonParser().parse(json)) == version
+    DefaultPactReader.INSTANCE.determineSpecVersion(JsonParser.parseString(json)) == version
 
     where:
 
@@ -329,4 +333,20 @@ class PactReaderSpec extends Specification {
 
   }
 
+  @Issue('#1031')
+  def 'handle encoded values in the pact file'() {
+    given:
+    def pactUrl = PactReaderSpec.classLoader.getResource('encoded-values-pact.json')
+
+    when:
+    def pact = DefaultPactReader.INSTANCE.loadPact(pactUrl)
+
+    then:
+    pact instanceof RequestResponsePact
+    pact.interactions[0].request.body.valueAsString() ==
+      '{"entityName":"mock-name","xml":"<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>\\n"}'
+    pact.interactions[0].request.generators.categories[BODY]['$'].expression ==
+      '{\n  "entityName": "${eName}",\n  "xml": "<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>\\n"\n}'
+  }
+
 }

core/model/src/test/groovy/au/com/dius/pact/core/model/generators/ProviderStateGeneratorSpec.groovy

@@ -1,5 +1,6 @@
 package au.com.dius.pact.core.model.generators
 
+import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -40,4 +41,17 @@ class ProviderStateGeneratorSpec extends Specification {
     [a: 'A', b: 100] | '/${a}/${c}' | '/A/null'
   }
 
+  @Issue('#1031')
+  def 'handles encoded values in the expressions'() {
+    given:
+    def expression = '{\n  "entityName": "${eName}",\n  "xml": "<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>\\n"\n}'
+    def context = [eName: 'Entity-Name']
+
+    when:
+    def result = new ProviderStateGenerator(expression).generate([providerState: context])
+
+    then:
+    result == '{\n  "entityName": "Entity-Name",\n  "xml": "<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>\\n"\n}'
+  }
+
 }

core/model/src/test/resources/encoded-values-pact.json

@@ -0,0 +1,66 @@
+{
+  "provider": {
+    "name": "Test_Provider"
+  },
+  "consumer": {
+    "name": "Test_Consumer"
+  },
+  "interactions": [
+    {
+      "description": "A request to create new entity",
+      "request": {
+        "method": "POST",
+        "path": "/test",
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "entityName": "mock-name",
+          "xml": "\u003c?xml version\u003d\"1.0\" encoding\u003d\"UTF-8\"?\u003e\n"
+        },
+        "generators": {
+          "body": {
+            "$": {
+              "type": "ProviderState",
+              "expression": "{\n  \"entityName\": \"${eName}\",\n  \"xml\": \"\u003c?xml version\u003d\\\"1.0\\\" encoding\u003d\\\"UTF-8\\\"?\u003e\\n\"\n}"
+            }
+          }
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/json;charset\u003dUTF-8"
+        },
+        "body": {
+          "workflowDefinitionName": "mock-name"
+        },
+        "matchingRules": {
+          "body": {
+            "$.workflowDefinitionName": {
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ],
+              "combine": "AND"
+            }
+          }
+        }
+      },
+      "providerStates": [
+        {
+          "name": "A entity name not exists"
+        }
+      ]
+    }
+  ],
+  "metadata": {
+    "pactSpecification": {
+      "version": "3.0.0"
+    },
+    "pact-jvm": {
+      "version": "3.6.11"
+    }
+  }
+}