From f7e4e036bd931bc501acafefa82b362d7dabf623 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 26 Jul 2016 16:25:25 +0100
Subject: [PATCH] Fix standalone test scripts

---
 .../verifier/spring-cloud-contract-verifier.adoc      |  2 +-
 samples/standalone/downloadGradleDeps.sh              | 11 +++++++++--
 .../http-client/src/test/resources/application.yaml   |  2 +-
 samples/standalone/runTests.sh                        |  4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
index 772c1821b4..008fcc7ced 100644
--- a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
+++ b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
@@ -5,7 +5,7 @@
 :samples_path: {core_path}/samples
 :verifier_core_path: {verifier_root_path}
 :stubrunner_core_path: {core_path}/spring-cloud-contract-stub-runner
-:standalone_samples_path: {samples_path}/standalone
+:standalone_samples_path: {samples_path}/standalone/dsl
 :tests_path: ../../../../../tests
 
 include::introduction.adoc[]
diff --git a/samples/standalone/downloadGradleDeps.sh b/samples/standalone/downloadGradleDeps.sh
index c276a139a4..e51bb9588b 100755
--- a/samples/standalone/downloadGradleDeps.sh
+++ b/samples/standalone/downloadGradleDeps.sh
@@ -12,10 +12,17 @@ LOCAL_MAVEN_REPO=${LOCAL_MAVEN_REPO}
 VERIFIER_VERSION=${VERIFIER_VERSION}
 EOF
 
-cd http-server
+cd dsl/http-server
 ./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION}
 cd $ROOT
-cd http-client
+cd dsl/http-client
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION} --stacktrace
+cd $ROOT
+
+cd restdocs/http-server
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION}
+cd $ROOT
+cd restdocs/http-client
 ./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION} --stacktrace
 cd $ROOT
 
diff --git a/samples/standalone/dsl/http-client/src/test/resources/application.yaml b/samples/standalone/dsl/http-client/src/test/resources/application.yaml
index b260e2bac4..34d4b78432 100644
--- a/samples/standalone/dsl/http-client/src/test/resources/application.yaml
+++ b/samples/standalone/dsl/http-client/src/test/resources/application.yaml
@@ -1,3 +1,3 @@
 stubrunner:
   work-offline: true
-  stubs.ids: 'com.example:http-server:+:stubs:8080'
\ No newline at end of file
+  stubs.ids: 'com.example:http-server-dsl:+:stubs:8080'
\ No newline at end of file
diff --git a/samples/standalone/runTests.sh b/samples/standalone/runTests.sh
index 5e9ebe79d5..f3fb7755d5 100755
--- a/samples/standalone/runTests.sh
+++ b/samples/standalone/runTests.sh
@@ -18,11 +18,11 @@ rm -rf $LOCAL_MAVEN_REPO/repository/com/example
 
 echo -e "\n\nRunning tests for Gradle (HTTP communication)\n\n"
 echo -e "Building server (uses Spring Cloud Contract Verifier Gradle Plugin)"
-cd http-server
+cd dsl/http-server
 ./gradlew clean build publishToMavenLocal -PverifierVersion=${VERIFIER_VERSION} --stacktrace
 cd $ROOT
 echo -e "\n\nBuilding client (uses Spring Cloud Contract Stub Runner)"
-cd http-client
+cd dsl/http-client
 ./gradlew clean build -PverifierVersion=${VERIFIER_VERSION} --stacktrace
 cd $ROOT