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

GH-708 Initial refactoring and consolidation of s-c-function-web MVC part.

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-06-02 19:56:21 +02:00
parent eddfa97b85
commit 4cc88f1124
6 changed files with 139 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpGetIntegrationTests.java
View File

@@ -209,19 +209,19 @@ public class HttpGetIntegrationTests {
@Test
public void postMoreFoo() {
assertThat(this.rest.getForObject("/post/more/foo", String.class))
.isEqualTo("(FOO)");
.isEqualTo("[\"(FOO)\"]");
}
@Test
public void uppercaseGet() {
assertThat(this.rest.getForObject("/uppercase/foo", String.class))
.isEqualTo("(FOO)");
.isEqualTo("[\"(FOO)\"]");
}
@Test
public void convertGet() {
assertThat(this.rest.getForObject("/wrap/123", String.class))
.isEqualTo("..123..");
.isEqualTo("[\"..123..\"]");
}
@Test
@@ -235,10 +235,12 @@ public class HttpGetIntegrationTests {
assertThat(this.rest
.exchange(RequestEntity.get(new URI("/entity/321"))
.accept(MediaType.APPLICATION_JSON).build(), String.class)
.getBody()).isEqualTo("{\"value\":321}");
.getBody()).isEqualTo("[{\"value\":321}]");
}
@Test
@Disabled
// this test is wrong since it is returning Flux while setting CT to TEXT_PLAIN. We can't convert it
public void compose() throws Exception {
ResponseEntity<String> result = this.rest.exchange(RequestEntity
.get(new URI("/concat,reverse/foo")).accept(MediaType.TEXT_PLAIN).build(),
@@ -338,7 +340,7 @@ public class HttpGetIntegrationTests {
public Supplier<Flux<String>> timeout() {
return () -> Flux.defer(() -> Flux.<String>create(emitter -> {
emitter.next("foo");
}).timeout(Duration.ofMillis(100L), Flux.empty()));
}).timeout(Duration.ofMillis(1000L), Flux.empty()));
}
@Bean

4
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java
View File

@@ -420,7 +420,9 @@ public class HttpPostIntegrationTests {
@Bean
public Consumer<String> bareUpdates() {
return value -> this.list.add(value);
return value -> {
this.list.add(value);
};
}
@Bean("not/a")