SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SNAPSHOT to 1.1.0.M1

Browse Source
This commit is contained in:
Spencer Gibb
2016-08-26 08:43:18 -06:00
parent 7c93f9d0e8
commit ee548d06d6
17 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java
View File

@@ -90,7 +90,7 @@ public class ConsulBinderTests {
*/
@Test
public void testMessageSendReceive() throws Exception {
testMessageSendReceive(null, false);
testMessageSendReceive(null);
}
/**
@@ -120,21 +120,17 @@ public class ConsulBinderTests {
* @param partitioned if true, execute test with a partition selector
* @throws Exception
*/
private void testMessageSendReceive(String[] groups, boolean partitioned) throws Exception {
private void testMessageSendReceive(String[] groups) throws Exception {
Set<AppId> consumers = null;
AppId producer = null;
try {
consumers = launchConsumers(groups);
producer = launchProducer(partitioned);
producer = launchProducer();
for (AppId consumer : consumers) {
assertEquals(MESSAGE_PAYLOAD, waitForMessage(consumer.port));
}
if (partitioned) {
assertTrue(partitionSelectorUsed(producer.port));
}
}
finally {
if (producer != null) {
@@ -182,16 +178,15 @@ public class ConsulBinderTests {
/**
* Launch a producer that publishes a test message.
*
* @param partitioned if true, configure producer to use a partition selector
* @return {@link AppId} for producer
*/
private AppId launchProducer(boolean partitioned) {
private AppId launchProducer() {
int producerPort = SocketUtils.findAvailableTcpPort();
Map<String, String> appProperties = new HashMap<>();
appProperties.put("server.port", String.valueOf(producerPort));
List<String> args = new ArrayList<>();
args.add(String.format("--server.port=%d", producerPort));
args.add(String.format("--partitioned=%b", partitioned));
args.add(String.format("--partitioned=%b", false));
args.add("--debug");
return new AppId(launchApplication(TestProducer.class, appProperties, args), producerPort);

4
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java
View File

@@ -60,10 +60,10 @@ public class TestProducer implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
if (args.containsOption("partitioned")
/*if (args.containsOption("partitioned")
&& Boolean.valueOf(args.getOptionValues("partitioned").get(0))) {
binder.setPartitionSelector(stubPartitionSelectorStrategy());
}
}*/
SubscribableChannel producerChannel = producerChannel();
ProducerProperties properties = new ProducerProperties();
properties.setPartitionKeyExpression(new SpelExpressionParser().parseExpression("payload"));