From 51a7f8bf66633189155fa0cb6e2907b9a8288313 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 13 Feb 2017 17:37:29 -0500
Subject: [PATCH] RabbitMQ - GH-43 - Support Fix For Routing Key

See spring-cloud/spring-cloud-stream-binder-rabbit#43

Make Routing Key Check Method Name More Expressive
---
 .../stream/binder/PartitionCapableBinderTests.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
index 9e271c48f..a3f9d140e 100644
--- a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
+++ b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -194,8 +194,7 @@ public abstract class PartitionCapableBinderTests<B extends AbstractTestBinder<?
 		Binding<MessageChannel> outputBinding = binder.bindProducer("part.0", output, producerProperties);
 		try {
 			Object endpoint = extractEndpoint(outputBinding);
-			assertThat(getEndpointRouting(endpoint))
-					.contains(getExpectedRoutingBaseDestination("part.0", "test") + "-' + headers['partition']");
+			checkRkExpressionForPartitionedModuleSpEL(endpoint);
 		}
 		catch (UnsupportedOperationException ignored) {
 		}
@@ -249,6 +248,11 @@ public abstract class PartitionCapableBinderTests<B extends AbstractTestBinder<?
 		outputBinding.unbind();
 	}
 
+	protected void checkRkExpressionForPartitionedModuleSpEL(Object endpoint) {
+		assertThat(getEndpointRouting(endpoint))
+				.contains(getExpectedRoutingBaseDestination("part.0", "test") + "-' + headers['partition']");
+	}
+
 	@Test
 	public void testPartitionedModuleJava() throws Exception {
 		B binder = getBinder();