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

Fix test

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-11-23 20:27:03 +01:00
parent 995b3425a8
commit 325c9b44b0
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -61,6 +61,7 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import org.springframework.util.ReflectionUtils;
import static java.util.Collections.singletonList;
@@ -532,14 +533,15 @@ public class BeanFactoryAwareFunctionRegistryTests {
result = (Mono<String>) f.apply(Flux.just("hello"));
assertThat(result.block()).isEqualTo("hello");
}
//
// @Test
//<<<<<<< HEAD
// public void testGH_611() {
// FunctionCatalog catalog = this.configureCatalog(NegotiatingMessageConverterConfiguration.class);
// Supplier<Message<Integer>> f = catalog.lookup("supplier", "text/*");
// assertThat(f.get().getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(MimeTypeUtils.parseMimeType("text/*"));
//=======
@Test
public void testGH_611() {
FunctionCatalog catalog = this.configureCatalog(NegotiatingMessageConverterConfiguration.class);
Supplier<Message<Integer>> f = catalog.lookup("supplier", "text/*");
assertThat(f.get().getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(MimeTypeUtils.parseMimeType("text/*"));
}
@Test
public void testGH_612() {
ApplicationContext context = new SpringApplicationBuilder(SampleFunctionConfiguration.class)
.run("--logging.level.org.springframework.cloud.function=DEBUG",
@@ -553,7 +555,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
.build()));
SampleFunctionConfiguration config = context.getBean(SampleFunctionConfiguration.class);
assertThat(((Person) config.consumerInputRef.get()).getName()).isEqualTo("Ricky");
//>>>>>>> GH-612: Better tests and implementation
}
@EnableAutoConfiguration