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

Deprecate @Bindings

Browse Source 
Fixes #656

Remove @Bindings from tests

Remove deprecated @Bindings annotation from tests
Rename tests which were previously ignored due to name
This commit is contained in:
Marius Bogoevici
2016-09-19 18:00:04 -04:00
committed by Soby Chacko
parent 15b562132a
commit 6834c28674
9 changed files with 58 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/Bindings.java
View File

@@ -31,6 +31,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
*
* @author Dave Syer
* @author Marius Bogoevici
* @deprecated As of 1.1 for being redundant (beans qualified by it are already
* uniquely identified by their type)
*/
@Qualifier
@@ -38,6 +40,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
@Deprecated
public @interface Bindings {
Class<?> value();

19
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ArbitraryInterfaceBindingTestsWithBindingTargets.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ArbitraryInterfaceWithBindingTargetsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
import org.springframework.context.annotation.Import;
@@ -39,29 +38,29 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ArbitraryInterfaceBindingTestsWithBindingTargets.TestFooChannels.class)
public class ArbitraryInterfaceBindingTestsWithBindingTargets {
@SpringBootTest(classes = ArbitraryInterfaceWithBindingTargetsTests.TestFooChannels.class)
public class ArbitraryInterfaceWithBindingTargetsTests {
@Autowired
@Bindings(ArbitraryInterfaceBindingTestsWithBindingTargets.TestFooChannels.class)
public FooChannels fooChannels;
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@SuppressWarnings("unchecked")
@Test
public void testArbitraryInterfaceChannelsBound() {
verify(this.binder).bindConsumer(eq("someQueue.0"), anyString(), eq(this.fooChannels.foo()),
Binder binder = binderFactory.getBinder(null);
verify(binder).bindConsumer(eq("someQueue.0"), anyString(), eq(this.fooChannels.foo()),
Mockito.<ConsumerProperties>any());
verify(this.binder).bindConsumer(eq("someQueue.1"), anyString(), eq(this.fooChannels.bar()),
verify(binder).bindConsumer(eq("someQueue.1"), anyString(), eq(this.fooChannels.bar()),
Mockito.<ConsumerProperties>any());
verify(this.binder).bindProducer(eq("someQueue.2"), eq(this.fooChannels.baz()),
verify(binder).bindProducer(eq("someQueue.2"), eq(this.fooChannels.baz()),
Mockito.<ProducerProperties>any());
verify(this.binder).bindProducer(eq("someQueue.3"), eq(this.fooChannels.qux()),
verify(binder).bindProducer(eq("someQueue.3"), eq(this.fooChannels.qux()),
Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(FooChannels.class)

19
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ArbitraryInterfaceBindingTestsWithDefaults.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ArbitraryInterfaceWithDefaultsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
import org.springframework.context.annotation.Import;
@@ -38,29 +37,29 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ArbitraryInterfaceBindingTestsWithDefaults.TestFooChannels.class)
public class ArbitraryInterfaceBindingTestsWithDefaults {
@SpringBootTest(classes = ArbitraryInterfaceWithDefaultsTests.TestFooChannels.class)
public class ArbitraryInterfaceWithDefaultsTests {
@Autowired
@Bindings(ArbitraryInterfaceBindingTestsWithDefaults.TestFooChannels.class)
public FooChannels fooChannels;
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@SuppressWarnings("unchecked")
@Test
public void testArbitraryInterfaceChannelsBound() {
verify(this.binder).bindConsumer(eq("foo"), anyString(), eq(this.fooChannels.foo()),
final Binder binder = this.binderFactory.getBinder(null);
verify(binder).bindConsumer(eq("foo"), anyString(), eq(this.fooChannels.foo()),
Mockito.<ConsumerProperties>any());
verify(this.binder).bindConsumer(eq("bar"), anyString(), eq(this.fooChannels.bar()),
verify(binder).bindConsumer(eq("bar"), anyString(), eq(this.fooChannels.bar()),
Mockito.<ConsumerProperties>any());
verify(this.binder).bindProducer(eq("baz"), eq(this.fooChannels.baz()),
verify(binder).bindProducer(eq("baz"), eq(this.fooChannels.baz()),
Mockito.<ProducerProperties>any());
verify(this.binder).bindProducer(eq("qux"), eq(this.fooChannels.qux()),
verify(binder).bindProducer(eq("qux"), eq(this.fooChannels.qux()),
Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(FooChannels.class)

13
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ProcessorBindingTestsWithBindingTargets.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ProcessorBindingWithBindingTargetsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -39,23 +38,23 @@ import static org.mockito.Mockito.verify;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ProcessorBindingTestsWithBindingTargets.TestProcessor.class)
public class ProcessorBindingTestsWithBindingTargets {
@SpringBootTest(classes = ProcessorBindingWithBindingTargetsTests.TestProcessor.class)
public class ProcessorBindingWithBindingTargetsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestProcessor.class)
private Processor testProcessor;
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
verify(this.binder).bindConsumer(eq("testtock.0"), anyString(),
final Binder binder = binderFactory.getBinder(null);
verify(binder).bindConsumer(eq("testtock.0"), anyString(),
eq(this.testProcessor.input()), Mockito.<ConsumerProperties>any());
verify(this.binder).bindProducer(eq("testtock.1"), eq(this.testProcessor.output()),
verify(binder).bindProducer(eq("testtock.1"), eq(this.testProcessor.output()),
Mockito.<ProducerProperties>any());
}

15
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ProcessorBindingTestsWithDefaults.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ProcessorBindingsWithDefaultsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -38,25 +37,25 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ProcessorBindingTestsWithDefaults.TestProcessor.class)
public class ProcessorBindingTestsWithDefaults {
@SpringBootTest(classes = ProcessorBindingsWithDefaultsTests.TestProcessor.class)
public class ProcessorBindingsWithDefaultsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestProcessor.class)
private Processor processor;
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
Mockito.verify(this.binder).bindConsumer(eq("input"), anyString(), eq(this.processor.input()),
Binder binder = this.binderFactory.getBinder(null);
Mockito.verify(binder).bindConsumer(eq("input"), anyString(), eq(this.processor.input()),
Mockito.<ConsumerProperties>any());
Mockito.verify(this.binder).bindProducer(eq("output"), eq(this.processor.output()),
Mockito.verify(binder).bindProducer(eq("output"), eq(this.processor.output()),
Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(Processor.class)

13
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingTestsWithBindingTargets.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultTargetsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -40,23 +39,23 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SinkBindingTestsWithBindingTargets.TestSink.class)
public class SinkBindingTestsWithBindingTargets {
@SpringBootTest(classes = SinkBindingWithDefaultTargetsTests.TestSink.class)
public class SinkBindingWithDefaultTargetsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestSink.class)
private Sink testSink;
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
verify(this.binder).bindConsumer(eq("testtock"), anyString(), eq(this.testSink.input()),
Binder binder = binderFactory.getBinder(null);
verify(binder).bindConsumer(eq("testtock"), anyString(), eq(this.testSink.input()),
Mockito.<ConsumerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(Sink.class)

13
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingTestsWithDefaults.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -39,23 +38,23 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SinkBindingTestsWithDefaults.TestSink.class)
public class SinkBindingTestsWithDefaults {
@SpringBootTest(classes = SinkBindingWithDefaultsTests.TestSink.class)
public class SinkBindingWithDefaultsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestSink.class)
private Sink testSink;
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
verify(this.binder).bindConsumer(eq("input"), anyString(), eq(this.testSink.input()),
Binder binder = binderFactory.getBinder(null);
verify(binder).bindConsumer(eq("input"), anyString(), eq(this.testSink.input()),
Mockito.<ConsumerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(Sink.class)

13
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SourceBindingTestsWithBindingTargets.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SourceBindingWithBindingTargetsTests.java
View File

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -43,15 +42,14 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Ilayaperumal Gopinathan
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SourceBindingTestsWithBindingTargets.TestSource.class)
public class SourceBindingTestsWithBindingTargets {
@SpringBootTest(classes = SourceBindingWithBindingTargetsTests.TestSource.class)
public class SourceBindingWithBindingTargetsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestSource.class)
private Source testSource;
@Autowired
@@ -61,9 +59,10 @@ public class SourceBindingTestsWithBindingTargets {
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
verify(this.binder).bindProducer(eq("testtock"), eq(this.testSource.output()),
Binder binder = binderFactory.getBinder(null);
verify(binder).bindProducer(eq("testtock"), eq(this.testSource.output()),
Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(this.binder);
verifyNoMoreInteractions(binder);
}
@EnableBinding(Source.class)

13
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SourceBindingTestsWithDefaults.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SourceBindingWithDefaultsTests.java
View File

@@ -23,7 +23,6 @@ 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.Bindings;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
@@ -38,22 +37,22 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SourceBindingTestsWithDefaults.TestSource.class)
public class SourceBindingTestsWithDefaults {
@SpringBootTest(classes = SourceBindingWithDefaultsTests.TestSource.class)
public class SourceBindingWithDefaultsTests {
@SuppressWarnings("rawtypes")
@Autowired
private Binder binder;
private BinderFactory binderFactory;
@Autowired
@Bindings(TestSource.class)
private Source testSource;
@SuppressWarnings("unchecked")
@Test
public void testSourceOutputChannelBound() {
verify(this.binder).bindProducer(eq("output"), eq(this.testSource.output()), Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(this.binder);
Binder binder = binderFactory.getBinder(null);
verify(binder).bindProducer(eq("output"), eq(this.testSource.output()), Mockito.<ProducerProperties>any());
verifyNoMoreInteractions(binder);
}
@EnableBinding(Source.class)