From 0a61633d65c14d37eeeb9ff7be9cafda4c901626 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Sat, 27 Aug 2016 12:04:22 +0100
Subject: [PATCH] Fix hystrix tests (wrong assertion)

---
 hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java | 2 +-
 hystrix/src/test/java/demo/HystrixApplicationTests.java      | 2 +-
 pom.xml                                                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java b/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
index bff821b..7535654 100644
--- a/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
+++ b/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
@@ -57,7 +57,7 @@ public class HystrixApplicationTests {
 		byte[] buffer = new byte[1024];
 		in.read(buffer);
 		String contents = new String(buffer);
-		assertTrue(contents.contains("ping"));
+		assertTrue("Wrong content: \n" + contents, contents.contains("data"));
 		in.close();
 	}
 }
diff --git a/hystrix/src/test/java/demo/HystrixApplicationTests.java b/hystrix/src/test/java/demo/HystrixApplicationTests.java
index bff821b..7535654 100644
--- a/hystrix/src/test/java/demo/HystrixApplicationTests.java
+++ b/hystrix/src/test/java/demo/HystrixApplicationTests.java
@@ -57,7 +57,7 @@ public class HystrixApplicationTests {
 		byte[] buffer = new byte[1024];
 		in.read(buffer);
 		String contents = new String(buffer);
-		assertTrue(contents.contains("ping"));
+		assertTrue("Wrong content: \n" + contents, contents.contains("data"));
 		in.close();
 	}
 }
diff --git a/pom.xml b/pom.xml
index bbc0f0e..33a1371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.7.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-samples-tests</artifactId>
-	<version>1.1.2.BUILD-SNAPSHOT</version>
+	<version>1.2.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Samples Tests</name>
 	<description>Spring Cloud Samples Tests</description>