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

Restore SpelExpressionConverterConfigurationTests.

Browse Source
This commit is contained in:
Soby Chacko
2022-01-14 17:05:51 -05:00
parent 462220e473
commit b723384c8c
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore;
import org.junit.Test;
@@ -38,17 +37,12 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.converter.AbstractMessageConverter;
import org.springframework.messaging.converter.MessageConversionException;
import org.springframework.messaging.handler.annotation.Payload;
import org.springframework.messaging.handler.annotation.SendTo;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.MimeType;

7
spring-cloud-stream/deleted-tests/SpelExpressionConverterConfigurationTests.java → spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 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.
@@ -31,7 +31,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
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.Configuration;
import org.springframework.expression.EvaluationContext;
@@ -49,6 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Eric Bottard
* @author Artem Bilan
* @author Soby Chacko
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SpelExpressionConverterConfigurationTests.Config.class, properties = {
@@ -99,7 +99,6 @@ public class SpelExpressionConverterConfigurationTests {
}
@Configuration
@EnableBinding
@EnableAutoConfiguration
@EnableConfigurationProperties(Pojo.class)
public static class Config implements BeanFactoryAware {
@@ -123,7 +122,5 @@ public class SpelExpressionConverterConfigurationTests {
this.evaluationContext = ExpressionUtils
.createStandardEvaluationContext(this.beanFactory);
}
}
}

4
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
View File

@@ -41,8 +41,8 @@ import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionType;
import org.springframework.cloud.function.context.catalog.FunctionAroundWrapper;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
import org.springframework.cloud.stream.binder.Binding;
@@ -157,7 +157,7 @@ public class ImplicitFunctionBindingTests {
Function<byte[], byte[]> function = v -> v;
FunctionRegistration functionRegistration = new FunctionRegistration(function, "function");
functionRegistration = functionRegistration.type(FunctionType.from(byte[].class).to(byte[].class));
functionRegistration = functionRegistration.type(FunctionTypeUtils.functionType(byte[].class, byte[].class));
FunctionBindingTestUtils.bind(context, functionRegistration);
input.send(new GenericMessage<byte[]>("hello".getBytes()), "input");