Finish JUnit5 migration

This commit is contained in:
Oleg Zhurakousky
2022-08-29 15:06:10 +02:00
parent a756bfcb3e
commit 644224802b
48 changed files with 195 additions and 260 deletions

View File

@@ -19,8 +19,8 @@ package org.springframework.cloud.stream.binder;
import java.util.Iterator;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.boot.WebApplicationType;
@@ -50,7 +50,7 @@ public class AbstractMessageChannelBinderTests {
private ApplicationContext context;
@Before
@BeforeEach
public void prepare() {
this.context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration())

View File

@@ -1,75 +0,0 @@
/*
* Copyright 2015-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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
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.PropertySource;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* @author Marius Bogoevici
* @author Janne Valkealahti
*/
// @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;
@Autowired
private BinderFactory binderFactory;
@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());
verifyNoMoreInteractions(binder);
}
@EnableBinding(FooChannels.class)
@EnableAutoConfiguration
@PropertySource("classpath:/org/springframework/cloud/stream/binder/arbitrary-binding-test.properties")
public static class TestFooChannels {
}
}

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Janne Valkealahti
*/
// @checkstyle:off
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = ArbitraryInterfaceWithDefaultsTests.TestFooChannels.class, properties = "spring.cloud.stream.default-binder=mock")
public class ArbitraryInterfaceWithDefaultsTests {

View File

@@ -24,8 +24,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.boot.WebApplicationType;
@@ -83,7 +83,7 @@ public class BinderAwareChannelResolverTests {
protected volatile DynamicDestinationsBindable dynamicDestinationsBindable;
@SuppressWarnings("unchecked")
@Before
@BeforeEach
public void setupContext() throws Exception {
this.context = new SpringApplicationBuilder(

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.integration.dispatcher.AbstractDispatcher;

View File

@@ -20,7 +20,7 @@ import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;

View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.stream.binding.Bindable;
import org.springframework.integration.channel.DirectChannel;

View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.stream.binder;
import java.util.Collections;
import java.util.HashMap;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.stream.utils.FooConsumerProperties;
import org.springframework.cloud.stream.utils.FooProducerProperties;

View File

@@ -20,7 +20,7 @@ import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.WebApplicationType;

View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.stream.binder;
import java.nio.BufferUnderflowException;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;

View File

@@ -23,8 +23,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -72,7 +72,7 @@ public class PollableConsumerTests {
private SmartMessageConverter messageConverter;
@Before
@BeforeEach
public void before() {
this.messageConverter = new CompositeMessageConverterFactory()
.getMessageConverterForAllRegistered();

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.context.annotation.PropertySource;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
* @author Marius Bogoevici
* @author Janne Valkealahti
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = ProcessorBindingWithBindingTargetsTests.TestProcessor.class, properties = "spring.cloud.stream.defaultBinder=mock")
// @checkstyle:on

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
* @author Janne Valkealahti
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = ProcessorBindingsWithDefaultsTests.TestProcessor.class, properties = "spring.cloud.stream.defaultBinder=mock")
public class ProcessorBindingsWithDefaultsTests {

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.context.annotation.PropertySource;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Janne Valkealahti
* @author Janne Valkealahti
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = SinkBindingWithDefaultTargetsTests.TestSink.class, properties = "spring.cloud.stream.defaultBinder=mock")
// @checkstyle:on

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
* @author Janne Valkealahti
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = SinkBindingWithDefaultsTests.TestSink.class, properties = "spring.cloud.stream.defaultBinder=mock")
// @checkstyle:on

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.integration.channel.PublishSubscribeChannel;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
* @author Ilayaperumal Gopinathan
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = SourceBindingWithBindingTargetsTests.TestSource.class, properties = "spring.cloud.stream.defaultBinder=mock")
// @checkstyle:on

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* @author Marius Bogoevici
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = SourceBindingWithDefaultsTests.TestSource.class, properties = "spring.cloud.stream.defaultBinder=mock")
// @checkstyle:on

View File

@@ -17,8 +17,8 @@
package org.springframework.cloud.stream.binder;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -29,13 +29,13 @@ import org.springframework.cloud.stream.config.BindingProperties;
import org.springframework.cloud.stream.config.BindingServiceProperties;
import org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
* @author Marius Bogoevici
* @author Ilayaperumal Gopinathan
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = { TestChannelBinderConfiguration.class,
SourceBindingWithGlobalPropertiesOnlyTest.TestSource.class,
SpelExpressionConverterConfiguration.class }, properties = {

View File

@@ -17,8 +17,8 @@
package org.springframework.cloud.stream.binder;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -27,7 +27,7 @@ import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.config.BindingProperties;
import org.springframework.cloud.stream.config.BindingServiceProperties;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
* @author Marius Bogoevici
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Gary Russell
* @author Oleg Zhurakousky
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = SourceBindingWithGlobalPropertiesTest.TestSource.class, properties = {
"spring.cloud.stream.default.contentType=application/json",
"spring.cloud.stream.bindings.output.destination=ticktock",

View File

@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -507,7 +507,7 @@ public class ContentTypeTckTests {
}
@Test
@Ignore
@Disabled
public void _toStringDefaultContentTypePropertyUnknownContentType() {
ApplicationContext context = new SpringApplicationBuilder(
StringToStringStreamListener.class).web(WebApplicationType.NONE).run(

View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.stream.binder.tck;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

View File

@@ -71,7 +71,7 @@ import org.springframework.util.StringUtils;
* You must also add {@link TestChannelBinderConfiguration} to your configuration. Below
* is the example using Spring Boot test. <pre class="code">
*
* &#064;RunWith(SpringJUnit4ClassRunner.class)
* &#064;@ExtendWith(SpringExtension.class)
* &#064;SpringBootTest(classes = {SpringIntegrationBinderConfiguration.class, TestWithSIBinder.MyProcessor.class})
* public class TestWithSIBinder {
* &#064;Autowired
@@ -88,12 +88,10 @@ import org.springframework.util.StringUtils;
* }
*
* &#064;SpringBootApplication
* &#064;EnableBinding(Processor.class)
* public static class MyProcessor {
* &#064;StreamListener(Processor.INPUT)
* &#064;SendTo(Processor.OUTPUT)
* public String transform(String in) {
* return in + " world";
* &#064;Bean
* public Function&lt;String, String&gt; transform() {
* return in -> in + " world";
* }
* }
* }

View File

@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.cloud.stream.binder.Binding;

View File

@@ -32,8 +32,8 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -587,7 +587,7 @@ public class BindingServiceTests {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
@Ignore
@Disabled
public void testLateBindingConsumer() throws Exception {
BindingServiceProperties properties = new BindingServiceProperties();
properties.setBindingRetryInterval(1);

View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.stream.binding;
import java.lang.reflect.Field;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.binding;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.boot.SpringApplication;
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
public class InvalidBindingConfigurationTests {
@Test
@Ignore
@Disabled
public void testDuplicateBeanByBindingConfig() {
assertThatThrownBy(() -> SpringApplication.run(TestBindingConfig.class))
.isInstanceOf(BeanDefinitionStoreException.class)

View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.stream.binding;
import java.util.Collections;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.stream.config.BindingProperties;
import org.springframework.cloud.stream.config.BindingServiceProperties;
@@ -64,7 +64,7 @@ public class MessageConverterConfigurerTests {
}
@Test
@Ignore
@Disabled
public void testConfigureOutputChannelCannotConvert() {
BindingServiceProperties props = new BindingServiceProperties();
BindingProperties bindingProps = new BindingProperties();

View File

@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.core.MethodParameter;
import org.springframework.messaging.Message;

View File

@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.stream.binder.BinderType;
import org.springframework.cloud.stream.binder.stub1.StubBinder1Configuration;

View File

@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.Map;
import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.actuate.context.properties.ConfigurationPropertiesReportEndpoint;
@@ -42,7 +42,7 @@ public class BinderPropertiesTests {
@SuppressWarnings("unchecked")
@Test
@Ignore
@Disabled
public void testSerializationWithNonStringValues() {
StaticApplicationContext context = new StaticApplicationContext();
DefaultListableBeanFactory bf = (DefaultListableBeanFactory) context

View File

@@ -19,7 +19,8 @@ package org.springframework.cloud.stream.config;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.WebApplicationType;
@@ -37,7 +38,6 @@ import org.springframework.context.annotation.Import;
import org.springframework.validation.annotation.Validated;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
// see https://github.com/spring-cloud/spring-cloud-stream/issues/1573 for more details
/**
@@ -46,10 +46,12 @@ import static org.junit.Assert.fail;
*/
public class BindingHandlerAdviseTests {
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithWrongValue() {
new SpringApplicationBuilder(SampleConfiguration.class).web(WebApplicationType.NONE).run("--props.value=-1",
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
new SpringApplicationBuilder(SampleConfiguration.class).web(WebApplicationType.NONE).run("--props.value=-1",
"--spring.jmx.enabled=false");
});
}
@Test
@@ -67,12 +69,15 @@ public class BindingHandlerAdviseTests {
// simply should not fail
}
@Test(expected = ConfigurationPropertiesBindException.class)
@Test//(expected = ConfigurationPropertiesBindException.class)
public void validatedConfigProperties() {
new SpringApplicationBuilder(ValidatedConfiguration.class).web(WebApplicationType.NONE)
ConfigurationPropertiesBindException thrown = Assertions.assertThrows(ConfigurationPropertiesBindException.class, () -> {
new SpringApplicationBuilder(ValidatedConfiguration.class).web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false");
});
fail();
//fail();
}
@EnableBinding(Processor.class)

View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.stream.config;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;

View File

@@ -20,7 +20,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

View File

@@ -20,8 +20,8 @@ import java.util.List;
import javax.annotation.PostConstruct;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -40,7 +40,7 @@ import org.springframework.expression.PropertyAccessor;
import org.springframework.integration.expression.ExpressionUtils;
import org.springframework.integration.json.JsonPropertyAccessor;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
@@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Eric Bottard
* @author Artem Bilan
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = SpelExpressionConverterConfigurationTests.Config.class, properties = {
"expression: a.b" })
public class SpelExpressionConverterConfigurationTests {

View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.stream.function;
import java.util.function.Consumer;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class DynamicDestinationFunctionTests {
@After
@AfterEach
public void after() {
System.clearProperty("spring.cloud.stream.function.definition");
System.clearProperty("spring.cloud.function.definition");

View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.function.Function;
import org.assertj.core.util.Arrays;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.stream.binder.test.InputDestination;

View File

@@ -24,8 +24,8 @@ import java.util.function.Function;
import java.util.function.Supplier;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -121,7 +121,7 @@ public class GreenfieldFunctionEnableBindingTests {
}
@Test
@Ignore
@Disabled
public void testHttpEndpoint() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
@@ -141,7 +141,7 @@ public class GreenfieldFunctionEnableBindingTests {
}
@Test
@Ignore
@Disabled
public void testPojoReturn() throws IOException {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(

View File

@@ -21,7 +21,8 @@ import java.time.Duration;
import java.util.function.Consumer;
import java.util.function.Function;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.UnicastProcessor;
import reactor.util.function.Tuple2;
@@ -54,76 +55,88 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class MultipleInputOutputFunctionTests {
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithNonReactiveFunction() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multipleInputNonReactive")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multipleInputNonReactive")) {
context.getBean(InputDestination.class);
}
});
}
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithReactiveArrayOutput() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiReactiveInputReactiveArrayOutput")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiReactiveInputReactiveArrayOutput")) {
context.getBean(InputDestination.class);
}
});
}
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithReactiveArrayOutputNonGeneric() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiReactiveInputReactiveArrayOutputNoGeneric")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiReactiveInputReactiveArrayOutputNoGeneric")) {
context.getBean(InputDestination.class);
}
});
}
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithReactiveArrayInput() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=genericReactiveArrayInput")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=genericReactiveArrayInput")) {
context.getBean(InputDestination.class);
}
});
}
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithReactiveArrayInputNonGeneric() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=nonGenericReactiveArrayInput")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=nonGenericReactiveArrayInput")) {
context.getBean(InputDestination.class);
}
});
}
@Test(expected = BeanCreationException.class)
@Test
public void testFailureWithConsumer() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
BeanCreationException thrown = Assertions.assertThrows(BeanCreationException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiInputConsumer")) {
context.getBean(InputDestination.class);
}
ReactiveFunctionConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=multiInputConsumer")) {
context.getBean(InputDestination.class);
}
});
}
@Test

View File

@@ -21,8 +21,8 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class ProcessorToFunctionsSupportTests {
private ConfigurableApplicationContext context;
@After
@AfterEach
public void cleanUp() {
this.context.close();
}

View File

@@ -21,8 +21,8 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import org.springframework.boot.WebApplicationType;
@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class RoutingFunctionTests {
@Before
@BeforeEach
public void before() {
System.getProperties().remove("spring.cloud.function.routing.enabled");
System.getProperties().remove("spring.cloud.stream.function.definition");

View File

@@ -21,13 +21,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Supplier;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.rules.ExpectedException;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import org.springframework.boot.WebApplicationType;
@@ -50,9 +47,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class SourceToFunctionsSupportTests {
@Rule
public ExpectedException expectedException = ExpectedException.none();
@BeforeEach
public void before() {
System.clearProperty("spring.cloud.stream.function.definition");
@@ -87,7 +81,7 @@ public class SourceToFunctionsSupportTests {
// }
@Test
@Ignore
@Disabled
public void testImperativeSupplierComposedWithFunctions() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(
@@ -102,7 +96,7 @@ public class SourceToFunctionsSupportTests {
}
@Test
@Ignore
@Disabled
public void testImperativeSupplierComposedWithMixedFunctions() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(

View File

@@ -28,8 +28,9 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.WebApplicationType;
@@ -67,7 +68,6 @@ import org.springframework.util.MimeTypeUtils;
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
/**
*
@@ -77,7 +77,7 @@ import static org.junit.Assert.fail;
*/
public class StreamBridgeTests {
@Before
@BeforeEach
public void before() {
System.clearProperty("spring.cloud.function.definition");
}
@@ -329,16 +329,16 @@ public class StreamBridgeTests {
}
}
@Test(expected = NoSuchBeanDefinitionException.class)
@Test
public void testNoBridgeIfNoSourcePropertyDefined() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
NoSuchBeanDefinitionException thrown = Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
.getCompleteConfiguration())
.web(WebApplicationType.NONE).run("--spring.jmx.enabled=false")) {
.web(WebApplicationType.NONE).run("--spring.jmx.enabled=false")) {
context.getBean(StreamBridge.class);
fail();
}
context.getBean(StreamBridge.class);
}
});
}
@Test

View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.stream.function.edgecases;
import java.util.function.Consumer;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.interceptor;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +32,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.MimeTypeUtils;
import static org.mockito.Mockito.mock;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Marius Bogoevici
* @author Oleg Zhurakousky
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = BoundChannelsInterceptedTest.Foo.class, properties = "spring.cloud.stream.default-binder=mock")
public class BoundChannelsInterceptedTest {

View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.partitioning;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
@@ -33,7 +33,7 @@ import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
* @author Ilayaperumal Gopinathan
* @author Janne Valkealahti
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
// @checkstyle:off
@SpringBootTest(classes = PartitionedConsumerTest.TestSink.class, properties = "spring.cloud.stream.default-binder=mock")
public class PartitionedConsumerTest {