From 8a878b286a6f12149e7ec69278b5d2e2fdd0df76 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Fri, 13 Jan 2017 16:41:37 +0100
Subject: [PATCH] Fixed broken indentation

without this change tests are improperly indented

fixes #189
---
 .../verifier/builder/MethodBodyBuilder.groovy |  2 +-
 .../builder/SingleTestGeneratorSpec.groovy    | 70 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
index e67d405936..eddc53d8d6 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
@@ -305,9 +305,9 @@ abstract class MethodBodyBuilder {
 			String postProcessedMethod = postProcessJsonPathCall(method)
 			bb.addLine("assertThatJson(parsedJson)" + postProcessedMethod)
 			addColonIfRequired(bb)
-			bb.endBlock()
 		}
 		if (bodyMatchers?.hasMatchers()) {
+			bb.endBlock()
 			bb.addLine(addCommentSignIfRequired('and:'))
 			bb.startBlock()
 			// for the rest we'll do JsonPath matching in brute force
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
index 5fa08b4f7e..0866b7b83b 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
@@ -22,6 +22,7 @@ import org.springframework.cloud.contract.verifier.config.ContractVerifierConfig
 import org.springframework.cloud.contract.verifier.config.TestMode
 import org.springframework.cloud.contract.verifier.file.ContractMetadata
 import org.springframework.cloud.contract.verifier.util.SyntaxChecker
+import org.springframework.util.StringUtils
 import spock.lang.Issue
 import spock.lang.Specification
 
@@ -112,6 +113,75 @@ class SingleTestGeneratorSpec extends Specification {
 			SPOCK         | TestMode.EXPLICIT | explicitSpockClassStrings | GROOVY_ASSERTER
 	}
 
+	def "should build test class for #testFramework and mode #mode with two files"() {
+		given:
+			File file = tmpFolder.newFile()
+			file.write("""
+					org.springframework.cloud.contract.spec.Contract.make {
+						request {
+							method 'PUT'
+							url 'url1'
+							headers {
+								contentType(applicationJson())
+							}
+						}
+						response {
+							status 200
+							body(foo:"foo", bar:"bar")
+							headers {
+								contentType(applicationJson())
+							}
+						}
+					}
+	""")
+		and:
+		File file2 = tmpFolder.newFile()
+		file2.write("""
+				org.springframework.cloud.contract.spec.Contract.make {
+					request {
+						method 'PUT'
+						url 'url2'
+						headers {
+							contentType(applicationJson())
+						}
+					}
+					response {
+						status 200
+						body(foo:"foo", bar:"bar")
+						headers {
+							contentType(applicationJson())
+						}
+					}
+				}
+""")
+		and:
+			ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties()
+			properties.targetFramework = testFramework
+			ContractMetadata contract = new ContractMetadata(file.toPath(), false, 1, null)
+			contract.ignored >> false
+		and:
+			ContractMetadata contract2 = new ContractMetadata(file2.toPath(), false, 1, null)
+			contract2.ignored >> false
+		and:
+			SingleTestGenerator testGenerator = new SingleTestGenerator(properties)
+
+		when:
+			String clazz = testGenerator.buildClass([contract, contract2], "test", "test", 'com/foo')
+
+		then:
+			classStrings.each { clazz.contains(it) }
+		and:
+			asserter(clazz)
+		and:
+			textAssertion(clazz)
+		where:
+			testFramework | mode              | classStrings              | asserter        | textAssertion
+			JUNIT         | TestMode.MOCKMVC  | mockMvcJUnitClassStrings  | JAVA_ASSERTER   | { String test -> StringUtils.countOccurrencesOf(test, "\t\t\tMockMvcRequestSpecification") == 2 }
+			JUNIT         | TestMode.EXPLICIT | explicitJUnitClassStrings | JAVA_ASSERTER   | { String test -> StringUtils.countOccurrencesOf(test, "\t\t\tMockMvcRequestSpecification") == 2 }
+			SPOCK         | TestMode.MOCKMVC  | spockClassStrings         | GROOVY_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, "\t\t\tdef request") == 2 }
+			SPOCK         | TestMode.EXPLICIT | explicitSpockClassStrings | GROOVY_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, "\t\t\tdef request") == 2 }
+	}
+
 	def "should build JaxRs test class for #testFramework"() {
 		given:
 			ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties()