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

Restoring ArbitraryInterfaceWithBindingTargetsTests

Browse Source 
Test is renamed to BindingTargetTests
Checkstyle fixes in BindingServiceConfiguration
This commit is contained in:
Soby Chacko
2022-01-25 15:34:14 -05:00
parent 54ced22de9
commit 301985090d
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
View File

@@ -153,7 +153,7 @@ public class BindingServiceConfiguration {
if (!existingBinderConfigurations.contains(binderEntry.getKey())) {
binderConfigurations.put(binderEntry.getKey(),
new BinderConfiguration(binderEntry.getKey(), new HashMap<>(),
true, "integration".equals(binderEntry.getKey()) ? false : true));
true, !"integration".equals(binderEntry.getKey())));
}
}
}

46
spring-cloud-stream/deleted-tests/ArbitraryInterfaceWithBindingTargetsTests.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2017 the original author or authors.
* Copyright 2015-2022 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.
@@ -16,6 +16,8 @@
package org.springframework.cloud.stream.binder;
import java.util.function.Function;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -23,7 +25,7 @@ import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.PropertySource;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -36,40 +38,44 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* @author Marius Bogoevici
* @author Janne Valkealahti
* @author Soby Chacko
*/
// @checkstyle:off
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ArbitraryInterfaceWithBindingTargetsTests.TestFooChannels.class, properties = "spring.cloud.stream.default-binder=mock")
public class ArbitraryInterfaceWithBindingTargetsTests {
// @checkstyle:on
@Autowired
public FooChannels fooChannels;
@SpringBootTest(classes = BindingTargetTests.TestFooChannels.class, properties = {"spring.cloud.stream.default-binder=mock",
"spring.cloud.function.definition=process1;process2"})
public class BindingTargetTests {
@Autowired
private BinderFactory binderFactory;
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
@Test
public void testArbitraryInterfaceChannelsBound() {
Binder binder = this.binderFactory.getBinder(null, MessageChannel.class);
verify(binder).bindConsumer(eq("someQueue.0"), isNull(),
eq(this.fooChannels.foo()), Mockito.any());
verify(binder).bindConsumer(eq("someQueue.1"), isNull(),
eq(this.fooChannels.bar()), Mockito.any());
verify(binder).bindProducer(eq("someQueue.2"), eq(this.fooChannels.baz()),
Mockito.any());
verify(binder).bindProducer(eq("someQueue.3"), eq(this.fooChannels.qux()),
Mockito.any());
Mockito.any(MessageChannel.class), Mockito.any());
verify(binder).bindConsumer(eq("someQueue.2"), isNull(),
Mockito.any(MessageChannel.class), Mockito.any());
verify(binder).bindProducer(eq("someQueue.1"), Mockito.any(MessageChannel.class),
Mockito.any());
verify(binder).bindProducer(eq("someQueue.3"), Mockito.any(MessageChannel.class),
Mockito.any());
verifyNoMoreInteractions(binder);
}
@EnableBinding(FooChannels.class)
@EnableAutoConfiguration
@PropertySource("classpath:/org/springframework/cloud/stream/binder/arbitrary-binding-test.properties")
public static class TestFooChannels {
}
@Bean
public Function<String, String> process1() {
return s -> s;
}
@Bean
public Function<String, String> process2() {
return s -> s;
}
}
}

8
spring-cloud-stream/src/test/resources/org/springframework/cloud/stream/binder/arbitrary-binding-test.properties
View File

@@ -1,4 +1,4 @@
spring.cloud.stream.bindings.foo.destination=someQueue.0
spring.cloud.stream.bindings.bar.destination=someQueue.1
spring.cloud.stream.bindings.baz.destination=someQueue.2
spring.cloud.stream.bindings.qux.destination=someQueue.3
spring.cloud.stream.bindings.process1-in-0.destination=someQueue.0
spring.cloud.stream.bindings.process1-out-0.destination=someQueue.1
spring.cloud.stream.bindings.process2-in-0.destination=someQueue.2
spring.cloud.stream.bindings.process2-out-0.destination=someQueue.3