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

Migrate to JUnit 5

Browse Source 
spring-cloud-function-context

spring-cloud-function-context: fix

spring-cloud-function-web

spring-cloud-function-adapters

spring-cloud-function-samples

spring-cloud-function-deployer; spring-cloud-function-kotlin

Resolves #535
This commit is contained in:
anshlykov
2020-06-10 12:08:12 +03:00
committed by Oleg Zhurakousky
parent 6ea91a77a8
commit dfa02750c1
83 changed files with 290 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java
View File

@@ -26,8 +26,8 @@ import java.util.function.Supplier;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
@@ -47,7 +47,7 @@ public class SpringBootApiGatewayRequestHandlerTests {
private SpringBootApiGatewayRequestHandler handler; private SpringBootApiGatewayRequestHandler handler;
@After @AfterEach
public void after() { public void after() {
System.clearProperty("function.name"); System.clearProperty("function.name");
} }

2
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootKinesisEventHandlerTests.java
View File

@@ -27,7 +27,7 @@ import com.amazonaws.kinesis.agg.RecordAggregator;
import com.amazonaws.services.lambda.runtime.events.KinesisEvent; import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;

6
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandlerTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.function.adapter.aws;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
@@ -37,7 +37,7 @@ public class SpringBootRequestHandlerTests {
private SpringBootRequestHandler<Foo, Bar> handler; private SpringBootRequestHandler<Foo, Bar> handler;
@Before @BeforeEach
public void after() { public void after() {
System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.definition");
} }

6
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java
View File

@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +45,7 @@ public class SpringBootStreamHandlerTests {
private SpringBootStreamHandler handler; private SpringBootStreamHandler handler;
@Before @BeforeEach
public void before() { public void before() {
System.clearProperty("function.name"); System.clearProperty("function.name");
} }

6
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootHttpRequestHandlerTests.java
View File

@@ -31,8 +31,8 @@ import com.microsoft.azure.functions.HttpResponseMessage;
import com.microsoft.azure.functions.HttpResponseMessage.Builder; import com.microsoft.azure.functions.HttpResponseMessage.Builder;
import com.microsoft.azure.functions.HttpStatus; import com.microsoft.azure.functions.HttpStatus;
import com.microsoft.azure.functions.HttpStatusType; import com.microsoft.azure.functions.HttpStatusType;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -108,7 +108,7 @@ public class AzureSpringBootHttpRequestHandlerTests {
assertThat(body).isNull(); assertThat(body).isNull();
} }
@After @AfterEach
public void close() throws IOException { public void close() throws IOException {
if (this.handler != null) { if (this.handler != null) {
this.handler.close(); this.handler.close();

6
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java
View File

@@ -25,8 +25,8 @@ import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.microsoft.azure.functions.ExecutionContext; import com.microsoft.azure.functions.ExecutionContext;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -142,7 +142,7 @@ public class AzureSpringBootRequestHandlerTests {
assertThat(consumerResult).isEqualTo("foo1"); assertThat(consumerResult).isEqualTo("foo1");
} }
@After @AfterEach
public void close() throws IOException { public void close() throws IOException {
if (this.handler != null) { if (this.handler != null) {
this.handler.close(); this.handler.close();

8
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml
View File

@@ -63,11 +63,11 @@
<version>${google.cloud.functions.invoker.version}</version> <version>${google.cloud.functions.invoker.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- replace com.github.stefanbirkner:system-rules:1.19.0. Used in FunctionInvokerBackgroundTests -->
<dependency> <dependency>
<groupId>com.github.stefanbirkner</groupId> <groupId>com.github.blindpirate</groupId>
<artifactId>system-rules</artifactId> <artifactId>junit5-capture-system-output-extension</artifactId>
<version>1.19.0</version> <version>0.1.2</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

68
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
View File

@@ -20,10 +20,10 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.github.blindpirate.extensions.CaptureSystemOutput;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.junit.Rule; import org.hamcrest.Matchers;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
import org.springframework.cloud.function.json.JsonMapper; import org.springframework.cloud.function.json.JsonMapper;
@@ -35,85 +35,77 @@ import org.springframework.messaging.converter.AbstractMessageConverter;
import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Unit tests for the background functions adapter for Google Cloud Functions. * Unit tests for the background functions adapter for Google Cloud Functions.
* *
* @author Dmitry Solomakha * @author Dmitry Solomakha
* @author Mike Eltsufin * @author Mike Eltsufin
*/ */
@CaptureSystemOutput
public class FunctionInvokerBackgroundTests { public class FunctionInvokerBackgroundTests {
private static final Gson gson = new Gson(); private static final Gson gson = new Gson();
/**
* The rule for log.
*/
@Rule
public final SystemOutRule systemOutRule = new SystemOutRule().enableLog();
private static final String DROPPED_LOG_PREFIX = "Dropping background function result: "; private static final String DROPPED_LOG_PREFIX = "Dropping background function result: ";
@Test @Test
public void testHelloWorldSupplier_Background() throws Exception { public void testHelloWorldSupplier_Background(CaptureSystemOutput.OutputCapture outputCapture) {
testBackgroundFunction(HelloWorldSupplier.class, null, "Hello World!", null, null); testBackgroundFunction(outputCapture, HelloWorldSupplier.class, null, "Hello World!", null, null);
} }
@Test @Test
public void testJsonInputFunction_Background() throws Exception { public void testJsonInputFunction_Background(CaptureSystemOutput.OutputCapture outputCapture) {
testBackgroundFunction(JsonInputFunction.class, new IncomingRequest("hello"), testBackgroundFunction(outputCapture, JsonInputFunction.class, new IncomingRequest("hello"),
"Thank you for sending the message: hello", null, null); "Thank you for sending the message: hello", null, null);
} }
@Test @Test
public void testJsonInputOutputFunction_Background() throws Exception { public void testJsonInputOutputFunction_Background(CaptureSystemOutput.OutputCapture outputCapture) {
testBackgroundFunction(JsonInputOutputFunction.class, new IncomingRequest("hello"), testBackgroundFunction(outputCapture, JsonInputOutputFunction.class, new IncomingRequest("hello"),
new OutgoingResponse("Thank you for sending the message: hello"), null, null); new OutgoingResponse("Thank you for sending the message: hello"), null, null);
} }
@Test @Test
public void testJsonInputConsumer() throws Exception { public void testJsonInputConsumer(CaptureSystemOutput.OutputCapture outputCapture) {
testBackgroundFunction(JsonInputConsumer.class, new IncomingRequest("hello"), null, testBackgroundFunction(outputCapture, JsonInputConsumer.class, new IncomingRequest("hello"), null,
"Thank you for sending the message: hello", null); "Thank you for sending the message: hello", null);
} }
@Test @Test
public void testPubSubBackgroundFunction_PubSub() throws Exception { public void testPubSubBackgroundFunction_PubSub(CaptureSystemOutput.OutputCapture outputCapture) {
PubSubMessage pubSubMessage = new PubSubMessage(); PubSubMessage pubSubMessage = new PubSubMessage();
pubSubMessage.setData("hello"); pubSubMessage.setData("hello");
testBackgroundFunction(PubsubBackgroundFunction.class, pubSubMessage, null, testBackgroundFunction(outputCapture, PubsubBackgroundFunction.class, pubSubMessage, null,
"Thank you for sending the message: hello", "google.pubsub.topic.publish"); "Thank you for sending the message: hello", "google.pubsub.topic.publish");
} }
@Test @Test
public void testPubSubBackgroundFunction_PubSubPayload() throws Exception { public void testPubSubBackgroundFunction_PubSubPayload(CaptureSystemOutput.OutputCapture outputCapture) {
PubSubMessage pubSubMessage = new PubSubMessage(); PubSubMessage pubSubMessage = new PubSubMessage();
IncomingRequest message = new IncomingRequest("Hello"); IncomingRequest message = new IncomingRequest("Hello");
pubSubMessage.setData(gson.toJson(message)); pubSubMessage.setData(gson.toJson(message));
testBackgroundFunction(PubsubBackgroundFunctionPayload.class, pubSubMessage, null, testBackgroundFunction(outputCapture, PubsubBackgroundFunctionPayload.class, pubSubMessage, null,
"Thank you for sending the message: Hello", "google.pubsub.topic.publish"); "Thank you for sending the message: Hello", "google.pubsub.topic.publish");
} }
@Test @Test
public void testPubSubBackgroundFunction_StringMessage() throws Exception { public void testPubSubBackgroundFunction_StringMessage(CaptureSystemOutput.OutputCapture outputCapture) {
PubSubMessage pubSubMessage = new PubSubMessage(); PubSubMessage pubSubMessage = new PubSubMessage();
pubSubMessage.setMessageId("1234"); pubSubMessage.setMessageId("1234");
pubSubMessage.setData("Hello"); pubSubMessage.setData("Hello");
testBackgroundFunction(PubsubBackgroundFunctionStringMessage.class, pubSubMessage, null, testBackgroundFunction(outputCapture, PubsubBackgroundFunctionStringMessage.class, pubSubMessage, null,
"Message: Hello; Type: google.pubsub.topic.publish; Message ID: 1234", "google.pubsub.topic.publish"); "Message: Hello; Type: google.pubsub.topic.publish; Message ID: 1234", "google.pubsub.topic.publish");
} }
@Test @Test
public void testPubSubBackgroundFunction_PubSubMessage() throws Exception { public void testPubSubBackgroundFunction_PubSubMessage(CaptureSystemOutput.OutputCapture outputCapture) {
PubSubMessage pubSubMessage = new PubSubMessage(); PubSubMessage pubSubMessage = new PubSubMessage();
pubSubMessage.setMessageId("1234"); pubSubMessage.setMessageId("1234");
pubSubMessage.setData("Hello"); pubSubMessage.setData("Hello");
testBackgroundFunction(PubsubBackgroundFunctionPubSubMessage.class, pubSubMessage, null, testBackgroundFunction(outputCapture, PubsubBackgroundFunctionPubSubMessage.class, pubSubMessage, null,
"Message: Hello; Type: google.pubsub.topic.publish; Message ID: 1234", "google.pubsub.topic.publish"); "Message: Hello; Type: google.pubsub.topic.publish; Message ID: 1234", "google.pubsub.topic.publish");
} }
private <I, O> void testBackgroundFunction(Class<?> configurationClass, I input, O expectedResult, private <I, O> void testBackgroundFunction(CaptureSystemOutput.OutputCapture outputCapture, Class<?> configurationClass, I input, O expectedResult,
String expectedSysOut, String eventType) { String expectedSysOut, String eventType) {
FunctionInvoker handler = new FunctionInvoker(configurationClass); FunctionInvoker handler = new FunctionInvoker(configurationClass);
@@ -122,15 +114,15 @@ public class FunctionInvokerBackgroundTests {
// verify function sysout statements // verify function sysout statements
if (expectedSysOut != null) { if (expectedSysOut != null) {
assertThat(systemOutRule.getLog()).contains(expectedSysOut); outputCapture.expect(Matchers.containsString(expectedSysOut));
} }
// verify that if function had a return type, it was logged as being dropped // verify that if function had a return type, it was logged as being dropped
if (expectedResult != null) { if (expectedResult != null) {
assertThat(systemOutRule.getLog()).contains(DROPPED_LOG_PREFIX + gson.toJson(expectedResult)); outputCapture.expect(Matchers.containsString(DROPPED_LOG_PREFIX + gson.toJson(expectedResult)));
} }
else { else {
assertThat(systemOutRule.getLog()).doesNotContain(DROPPED_LOG_PREFIX); outputCapture.expect(Matchers.not(Matchers.containsString(DROPPED_LOG_PREFIX)));
} }
} }
@@ -163,11 +155,9 @@ public class FunctionInvokerBackgroundTests {
@Bean @Bean
public Function<IncomingRequest, Message<OutgoingResponse>> function() { public Function<IncomingRequest, Message<OutgoingResponse>> function() {
return (in) -> { return (in) -> MessageBuilder
return MessageBuilder .withPayload(new OutgoingResponse("Thank you for sending the message: " + in.message))
.withPayload(new OutgoingResponse("Thank you for sending the message: " + in.message)) .setHeader("foo", "bar").build();
.setHeader("foo", "bar").build();
};
} }
} }
@@ -200,9 +190,7 @@ public class FunctionInvokerBackgroundTests {
@Bean @Bean
public Consumer<IncomingRequest> consumerPayload() { public Consumer<IncomingRequest> consumerPayload() {
return (in) -> { return (in) -> System.out.println("Thank you for sending the message: " + in.message);
System.out.println("Thank you for sending the message: " + in.message);
};
} }
@Bean @Bean

2
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
View File

@@ -27,7 +27,7 @@ import java.util.function.Supplier;
import com.google.cloud.functions.HttpRequest; import com.google.cloud.functions.HttpRequest;
import com.google.cloud.functions.HttpResponse; import com.google.cloud.functions.HttpResponse;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;

2
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.function.adapter.gcp.integration;
import java.io.IOException; import java.io.IOException;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

5
spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/test/java/org/springframework/cloud/function/adapter/openwhisk/OpenWhiskActionHandlerTest.java
View File

@@ -21,8 +21,7 @@ import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -34,14 +33,12 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Kamesh Sampath * @author Kamesh Sampath
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableAutoConfiguration @EnableAutoConfiguration
@TestPropertySource(locations = "classpath:/application-test.properties") @TestPropertySource(locations = "classpath:/application-test.properties")

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java
View File

@@ -35,7 +35,7 @@ import java.util.zip.ZipEntry;
import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.LoggerContext;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.function.compiler.java.CompilationResult; import org.springframework.cloud.function.compiler.java.CompilationResult;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.cloud.function.core.FunctionFactoryUtils; import org.springframework.cloud.function.core.FunctionFactoryUtils;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java
View File

@@ -20,7 +20,7 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.cloud.function.compiler.CompiledFunctionFactory; import org.springframework.cloud.function.compiler.CompiledFunctionFactory;

2
spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java
View File

@@ -21,7 +21,7 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.context;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionTypeTests.java
View File

@@ -24,7 +24,7 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
import reactor.util.function.Tuple3; import reactor.util.function.Tuple3;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.context;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;

20
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/SpringFunctionAdapterInitializerTests.java
View File

@@ -21,9 +21,10 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Ignore; import org.junit.jupiter.api.Assertions;
import org.junit.Test; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
@@ -33,8 +34,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
@@ -46,7 +45,7 @@ public class SpringFunctionAdapterInitializerTests {
private AbstractSpringFunctionAdapterInitializer<Object> initializer; private AbstractSpringFunctionAdapterInitializer<Object> initializer;
@After @AfterEach
public void after() { public void after() {
System.clearProperty("function.name"); System.clearProperty("function.name");
if (this.initializer != null) { if (this.initializer != null) {
@@ -54,11 +53,12 @@ public class SpringFunctionAdapterInitializerTests {
} }
} }
@Test(expected = IllegalArgumentException.class) @Test
public void nullSource() { public void nullSource() {
this.initializer = new AbstractSpringFunctionAdapterInitializer<Object>(null) { Assertions.assertThrows(IllegalArgumentException.class, () ->
this.initializer = new AbstractSpringFunctionAdapterInitializer<Object>(null) {
}; });
} }
@Test @Test
@@ -106,7 +106,7 @@ public class SpringFunctionAdapterInitializerTests {
} }
@Test @Test
@Ignore // related to boot 2.1 no bean override change @Disabled // related to boot 2.1 no bean override change
public void functionRegistrar() { public void functionRegistrar() {
this.initializer = new AbstractSpringFunctionAdapterInitializer<Object>(FunctionRegistrar.class) { this.initializer = new AbstractSpringFunctionAdapterInitializer<Object>(FunctionRegistrar.class) {

6
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryMultiInOutTests.java
View File

@@ -24,8 +24,8 @@ import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
@@ -100,7 +100,7 @@ public class BeanFactoryAwareFunctionRegistryMultiInOutTests {
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Test @Test
@Ignore @Disabled
public void testMultiInputBiFunction() { public void testMultiInputBiFunction() {
FunctionCatalog catalog = this.configureCatalog(); FunctionCatalog catalog = this.configureCatalog();
BiFunction<Flux<String>, Flux<Integer>, Flux<String>> multiInputFunction = BiFunction<Flux<String>, Flux<Integer>, Flux<String>> multiInputFunction =

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

@@ -28,9 +28,10 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Before; import org.junit.jupiter.api.Assertions;
import org.junit.Ignore; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
@@ -78,7 +79,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
return catalog; return catalog;
} }
@Before @BeforeEach
public void before() { public void before() {
System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.definition");
} }
@@ -156,7 +157,7 @@ public class BeanFactoryAwareFunctionRegistryTests {
* - the input wrapper must match the output wrapper (e.g., <Flux, Flux> or <Mono, Mono>) * - the input wrapper must match the output wrapper (e.g., <Flux, Flux> or <Mono, Mono>)
*/ */
@Test @Test
@Ignore @Disabled
public void testImperativeVoidInputFunction() { public void testImperativeVoidInputFunction() {
FunctionCatalog catalog = this.configureCatalog(); FunctionCatalog catalog = this.configureCatalog();
@@ -245,11 +246,13 @@ public class BeanFactoryAwareFunctionRegistryTests {
* Further more, such flux will need to be triggered (e.g., subscribe(..) ) * Further more, such flux will need to be triggered (e.g., subscribe(..) )
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Test(expected = ClassCastException.class) @Test
public void testReactiveFunctionWithImperativeInputAndOutputFail() { public void testReactiveFunctionWithImperativeInputAndOutputFail() {
FunctionCatalog catalog = this.configureCatalog(); FunctionCatalog catalog = this.configureCatalog();
Function<String, String> reverse = catalog.lookup("reverseFlux"); Function<String, String> reverse = catalog.lookup("reverseFlux");
String result = reverse.apply("reverseFlux"); Assertions.assertThrows(ClassCastException.class, () -> {
String result = reverse.apply("reverseFlux");
});
} }
@Test @Test

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.function.context.catalog;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java
View File

@@ -25,7 +25,7 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageConsumerTests.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageSupplierTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;

10
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java
View File

@@ -22,9 +22,9 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistration;
@@ -56,7 +56,7 @@ public class SimpleFunctionRegistryTests {
private ConversionService conversionService; private ConversionService conversionService;
@Before @BeforeEach
public void before() { public void before() {
List<MessageConverter> messageConverters = new ArrayList<>(); List<MessageConverter> messageConverters = new ArrayList<>();
JsonMapper jsonMapper = new GsonMapper(new Gson()); JsonMapper jsonMapper = new GsonMapper(new Gson());
@@ -121,7 +121,7 @@ public class SimpleFunctionRegistryTests {
} }
@Test @Test
@Ignore @Disabled
public void testFunctionCompletelyImplicitComposition() { public void testFunctionCompletelyImplicitComposition() {
FunctionRegistration<Words> wordsRegistration = new FunctionRegistration<>( FunctionRegistration<Words> wordsRegistration = new FunctionRegistration<>(
new Words(), "words").type(FunctionType.of(Words.class)); new Words(), "words").type(FunctionType.of(Words.class));

22
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
View File

@@ -27,9 +27,9 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -88,7 +88,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
ContextFunctionCatalogAutoConfigurationTests.value = value.toString(); ContextFunctionCatalogAutoConfigurationTests.value = value.toString();
} }
@After @AfterEach
public void close() { public void close() {
if (this.context != null) { if (this.context != null) {
this.context.close(); this.context.close();
@@ -119,7 +119,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
// do we really need this test and behavior? What does this even mean? // do we really need this test and behavior? What does this even mean?
public void ambiguousFunction() { public void ambiguousFunction() {
create(AmbiguousConfiguration.class); create(AmbiguousConfiguration.class);
@@ -137,7 +137,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
public void configurationFunction() { public void configurationFunction() {
create(FunctionConfiguration.class); create(FunctionConfiguration.class);
assertThat(this.context.getBean("foos")).isInstanceOf(Function.class); assertThat(this.context.getBean("foos")).isInstanceOf(Function.class);
@@ -293,7 +293,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@Test//(expected = IllegalArgumentException.class) @Test
public void monoToMonoNonVoidFunction() { public void monoToMonoNonVoidFunction() {
create(MonoToMonoNonVoidConfiguration.class); create(MonoToMonoNonVoidConfiguration.class);
assertThat(this.context.getBean("function")).isInstanceOf(Function.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class);
@@ -369,7 +369,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
public void singletonMessageFunction() { public void singletonMessageFunction() {
create(SingletonMessageConfiguration.class); create(SingletonMessageConfiguration.class);
assertThat(this.context.getBean("function")).isInstanceOf(Function.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class);
@@ -474,7 +474,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
public void simpleSupplier() { public void simpleSupplier() {
create(SimpleConfiguration.class); create(SimpleConfiguration.class);
assertThat(this.context.getBean("supplier")).isInstanceOf(Supplier.class); assertThat(this.context.getBean("supplier")).isInstanceOf(Supplier.class);
@@ -493,7 +493,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
public void qualifiedBean() { public void qualifiedBean() {
create(QualifiedConfiguration.class); create(QualifiedConfiguration.class);
assertThat(this.context.getBean("function")).isInstanceOf(Function.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class);
@@ -517,7 +517,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
@Test @Test
@Ignore @Disabled
public void registrationBean() { public void registrationBean() {
create(RegistrationConfiguration.class); create(RegistrationConfiguration.class);
assertThat(this.context.getBean("function")).isInstanceOf(Function.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class);

23
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java
View File

@@ -26,9 +26,10 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Ignore; import org.junit.jupiter.api.Assertions;
import org.junit.Test; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -61,7 +62,7 @@ public class ContextFunctionCatalogInitializerTests {
private FunctionInspector inspector; private FunctionInspector inspector;
@After @AfterEach
public void close() { public void close() {
if (this.context != null) { if (this.context != null) {
this.context.close(); this.context.close();
@@ -102,7 +103,7 @@ public class ContextFunctionCatalogInitializerTests {
} }
@Test @Test
@Ignore @Disabled
public void compose() { public void compose() {
create(SimpleConfiguration.class); create(SimpleConfiguration.class);
assertThat(this.context.getBean("function")) assertThat(this.context.getBean("function"))
@@ -115,14 +116,16 @@ public class ContextFunctionCatalogInitializerTests {
// TODO: support for function composition // TODO: support for function composition
} }
@Test(expected = BeanCreationException.class) @Test
public void missingType() { public void missingType() {
create(MissingTypeConfiguration.class); Assertions.assertThrows(BeanCreationException.class, () -> {
assertThat(this.context.getBean("function")) create(MissingTypeConfiguration.class);
assertThat(this.context.getBean("function"))
.isInstanceOf(FunctionRegistration.class); .isInstanceOf(FunctionRegistration.class);
assertThat((Function<?, ?>) this.catalog.lookup(Function.class, "function")) assertThat((Function<?, ?>) this.catalog.lookup(Function.class, "function"))
.isInstanceOf(Function.class); .isInstanceOf(Function.class);
// TODO: support for type inference from functional bean registrations // TODO: support for type inference from functional bean registrations
});
} }
@Test @Test

2
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/NegotiatingMessageConverterWrapperTests.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
import reactor.util.function.Tuples; import reactor.util.function.Tuples;

25
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java
View File

@@ -18,8 +18,9 @@ package org.springframework.cloud.function.context.config;
import java.util.function.Function; import java.util.function.Function;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
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.Flux;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -33,7 +34,6 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
/** /**
* *
@@ -44,7 +44,7 @@ public class RoutingFunctionTests {
private ConfigurableApplicationContext context; private ConfigurableApplicationContext context;
@After @AfterEach
public void before() { public void before() {
System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.definition");
System.clearProperty("spring.cloud.function.routing-expression"); System.clearProperty("spring.cloud.function.routing-expression");
@@ -55,8 +55,7 @@ public class RoutingFunctionTests {
context = new SpringApplicationBuilder(RoutingFunctionConfiguration.class).run( context = new SpringApplicationBuilder(RoutingFunctionConfiguration.class).run(
"--logging.level.org.springframework.cloud.function=DEBUG", "--logging.level.org.springframework.cloud.function=DEBUG",
"--spring.cloud.function.routing.enabled=true"); "--spring.cloud.function.routing.enabled=true");
FunctionCatalog catalog = context.getBean(FunctionCatalog.class); return context.getBean(FunctionCatalog.class);
return catalog;
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -82,7 +81,7 @@ public class RoutingFunctionTests {
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
@Test(expected = Exception.class) @Test
public void testRoutingReactiveInputWithReactiveFunctionAndDefinitionMessageHeader() { public void testRoutingReactiveInputWithReactiveFunctionAndDefinitionMessageHeader() {
FunctionCatalog functionCatalog = this.configureCatalog(); FunctionCatalog functionCatalog = this.configureCatalog();
Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME);
@@ -90,11 +89,11 @@ public class RoutingFunctionTests {
Message<String> message = MessageBuilder.withPayload("hello") Message<String> message = MessageBuilder.withPayload("hello")
.setHeader(FunctionProperties.PREFIX + ".definition", "echoFlux").build(); .setHeader(FunctionProperties.PREFIX + ".definition", "echoFlux").build();
Flux resultFlux = (Flux) function.apply(Flux.just(message)); Flux resultFlux = (Flux) function.apply(Flux.just(message));
resultFlux.subscribe(); Assertions.assertThrows(Exception.class, resultFlux::subscribe);
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
@Test(expected = Exception.class) @Test
public void testRoutingReactiveInputWithReactiveFunctionAndExpressionMessageHeader() { public void testRoutingReactiveInputWithReactiveFunctionAndExpressionMessageHeader() {
FunctionCatalog functionCatalog = this.configureCatalog(); FunctionCatalog functionCatalog = this.configureCatalog();
Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME);
@@ -102,7 +101,7 @@ public class RoutingFunctionTests {
Message<String> message = MessageBuilder.withPayload("hello") Message<String> message = MessageBuilder.withPayload("hello")
.setHeader(FunctionProperties.PREFIX + ".routing-expression", "'echoFlux'").build(); .setHeader(FunctionProperties.PREFIX + ".routing-expression", "'echoFlux'").build();
Flux resultFlux = (Flux) function.apply(Flux.just(message)); Flux resultFlux = (Flux) function.apply(Flux.just(message));
resultFlux.subscribe(); Assertions.assertThrows(Exception.class, resultFlux::subscribe);
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -135,7 +134,7 @@ public class RoutingFunctionTests {
// no function.definition header or function property // no function.definition header or function property
try { try {
function.apply(MessageBuilder.withPayload("hello").build()); function.apply(MessageBuilder.withPayload("hello").build());
fail(); Assertions.fail();
} }
catch (Exception e) { catch (Exception e) {
//ignore //ignore
@@ -144,7 +143,7 @@ public class RoutingFunctionTests {
// non existing function // non existing function
try { try {
function.apply(MessageBuilder.withPayload("hello").setHeader(FunctionProperties.PREFIX + ".definition", "blah").build()); function.apply(MessageBuilder.withPayload("hello").setHeader(FunctionProperties.PREFIX + ".definition", "blah").build());
fail(); Assertions.fail();
} }
catch (Exception e) { catch (Exception e) {
//ignore //ignore
@@ -176,7 +175,7 @@ public class RoutingFunctionTests {
@Bean @Bean
public Function<String, String> uppercase() { public Function<String, String> uppercase() {
return v -> v.toUpperCase(); return String::toUpperCase;
} }
@Bean @Bean

5
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/string/FunctionalStringSourceTests.java
View File

@@ -18,14 +18,12 @@ package org.springframework.cloud.function.context.string;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -35,7 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
// @checkstyle:off // @checkstyle:off
@FunctionalSpringBootTest(classes = Object.class, properties = "spring.main.sources=org.springframework.cloud.function.context.string.FunctionalStringSourceTests.TestConfiguration") @FunctionalSpringBootTest(classes = Object.class, properties = "spring.main.sources=org.springframework.cloud.function.context.string.FunctionalStringSourceTests.TestConfiguration")
// @checkstyle:on // @checkstyle:on

5
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/test/FunctionalTests.java
View File

@@ -18,14 +18,12 @@ package org.springframework.cloud.function.context.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest @FunctionalSpringBootTest
public class FunctionalTests { public class FunctionalTests {

74
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java
View File

@@ -16,15 +16,13 @@
package org.springframework.cloud.function.utils; package org.springframework.cloud.function.utils;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.junit.Test; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.runner.RunWith; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.springframework.cloud.function.json.GsonMapper; import org.springframework.cloud.function.json.GsonMapper;
import org.springframework.cloud.function.json.JacksonMapper; import org.springframework.cloud.function.json.JacksonMapper;
@@ -38,70 +36,68 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(Parameterized.class)
public class JsonMapperTests { public class JsonMapperTests {
private JsonMapper mapper; public static Stream<JsonMapper> params() {
return Stream.of(new GsonMapper(new Gson()), new JacksonMapper(new ObjectMapper()));
public JsonMapperTests(JsonMapper mapper) {
this.mapper = mapper;
} }
@Parameters @ParameterizedTest
public static List<Object[]> params() { @MethodSource("params")
return Arrays.asList(new Object[] { new GsonMapper(new Gson()) }, public void vanillaArray(JsonMapper mapper) {
new Object[] { new JacksonMapper(new ObjectMapper()) });
}
@Test
public void vanillaArray() {
String json = "[{\"value\":\"foo\"},{\"value\":\"foo\"}]"; String json = "[{\"value\":\"foo\"},{\"value\":\"foo\"}]";
List<Foo> list = this.mapper.fromJson(json, List<Foo> list = mapper.fromJson(json,
ResolvableType.forClassWithGenerics(List.class, Foo.class).getType()); ResolvableType.forClassWithGenerics(List.class, Foo.class).getType());
assertThat(list).hasSize(2); assertThat(list).hasSize(2);
assertThat(list.get(0).getValue()).isEqualTo("foo"); assertThat(list.get(0).getValue()).isEqualTo("foo");
assertThat(this.mapper.toString(list)).isEqualTo(json); assertThat(mapper.toString(list)).isEqualTo(json);
} }
@Test @ParameterizedTest
public void intArray() { @MethodSource("params")
List<Integer> list = this.mapper.fromJson("[123,456]", public void intArray(JsonMapper mapper) {
List<Integer> list = mapper.fromJson("[123,456]",
ResolvableType.forClassWithGenerics(List.class, Integer.class).getType()); ResolvableType.forClassWithGenerics(List.class, Integer.class).getType());
assertThat(list).hasSize(2); assertThat(list).hasSize(2);
assertThat(list.get(0)).isEqualTo(123); assertThat(list.get(0)).isEqualTo(123);
} }
@Test @ParameterizedTest
public void emptyArray() { @MethodSource("params")
List<Foo> list = this.mapper.fromJson("[]", public void emptyArray(JsonMapper mapper) {
List<Foo> list = mapper.fromJson("[]",
ResolvableType.forClassWithGenerics(List.class, Foo.class).getType()); ResolvableType.forClassWithGenerics(List.class, Foo.class).getType());
assertThat(list).hasSize(0); assertThat(list).hasSize(0);
} }
@Test @ParameterizedTest
public void vanillaObject() { @MethodSource("params")
public void vanillaObject(JsonMapper mapper) {
String json = "{\"value\":\"foo\"}"; String json = "{\"value\":\"foo\"}";
Foo foo = this.mapper.fromJson(json, Foo.class); Foo foo = mapper.fromJson(json, Foo.class);
assertThat(foo.getValue()).isEqualTo("foo"); assertThat(foo.getValue()).isEqualTo("foo");
assertThat(this.mapper.toString(foo)).isEqualTo(json); assertThat(mapper.toString(foo)).isEqualTo(json);
} }
@Test @ParameterizedTest
public void stringRepresentingJson() { @MethodSource("params")
public void stringRepresentingJson(JsonMapper mapper) {
String json = "{\"value\":\"foo\"}"; String json = "{\"value\":\"foo\"}";
byte[] bytes = this.mapper.toJson(json); byte[] bytes = mapper.toJson(json);
assertThat(new String(bytes)).isEqualTo(json); assertThat(new String(bytes)).isEqualTo(json);
} }
@Test @ParameterizedTest
public void intValue() { @MethodSource("params")
int foo = this.mapper.fromJson("123", Integer.class); public void intValue(JsonMapper mapper) {
int foo = mapper.fromJson("123", Integer.class);
assertThat(foo).isEqualTo(123); assertThat(foo).isEqualTo(123);
} }
@Test @ParameterizedTest
public void empty() { @MethodSource("params")
Foo foo = this.mapper.fromJson("{}", Foo.class); public void empty(JsonMapper mapper) {
Foo foo = mapper.fromJson("{}", Foo.class);
assertThat(foo.getValue()).isNull(); assertThat(foo.getValue()).isNull();
} }

6
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java
View File

@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
import reactor.util.function.Tuples; import reactor.util.function.Tuples;
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
public class FunctionDeployerTests { public class FunctionDeployerTests {
@Before @BeforeEach
public void before() { public void before() {
System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.definition");
} }

7
spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java
View File

@@ -21,8 +21,8 @@ import java.util.function.Supplier;
import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function1;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -32,7 +32,6 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
@@ -46,7 +45,7 @@ public class ContextFunctionCatalogAutoConfigurationKotlinTests {
private FunctionInspector inspector; private FunctionInspector inspector;
@After @AfterEach
public void close() { public void close() {
if (this.context != null) { if (this.context != null) {
this.context.close(); this.context.close();

5
spring-cloud-function-samples/function-sample-aws-custom/src/test/java/com/example/LambdaApplicationTests.java
View File

@@ -1,12 +1,9 @@
package com.example; package com.example;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest @FunctionalSpringBootTest
public class LambdaApplicationTests { public class LambdaApplicationTests {

2
spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java
View File

@@ -16,7 +16,7 @@
package example; package example;
import org.junit.Test; import org.junit.jupiter.api.Test;
/** /**
* @author Dave Syer * @author Dave Syer

2
spring-cloud-function-samples/function-sample-azure/src/test/java/example/MapTests.java
View File

@@ -16,7 +16,7 @@
package example; package example;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.cloud.function.adapter.azure.AzureSpringBootRequestHandler; import org.springframework.cloud.function.adapter.azure.AzureSpringBootRequestHandler;

5
spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java
View File

@@ -16,21 +16,18 @@
package com.example; package com.example;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Mark Fisher * @author Mark Fisher
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.cloud.function.compile.test.lambda=com.example.SampleCompiledConsumerTests.Reference::set", "spring.cloud.function.compile.test.lambda=com.example.SampleCompiledConsumerTests.Reference::set",
"spring.cloud.function.compile.test.inputType=String", "spring.cloud.function.compile.test.inputType=String",

5
spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java
View File

@@ -16,21 +16,18 @@
package com.example; package com.example;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Mark Fisher * @author Mark Fisher
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.cloud.function.compile.test.lambda=f->f.map(s->s+\"!!!\")", "spring.cloud.function.compile.test.lambda=f->f.map(s->s+\"!!!\")",
"spring.cloud.function.compile.test.inputType=Flux<String>", "spring.cloud.function.compile.test.inputType=Flux<String>",

2
spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java
View File

@@ -18,7 +18,7 @@ package com.example;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;

5
spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationMvcTests.java
View File

@@ -18,8 +18,7 @@ package com.example;
import java.net.URI; import java.net.URI;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@@ -28,14 +27,12 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class SampleApplicationMvcTests { public class SampleApplicationMvcTests {

9
spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
View File

@@ -19,9 +19,8 @@ package com.example;
import java.net.URI; import java.net.URI;
import java.util.Arrays; import java.util.Arrays;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -31,7 +30,6 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -40,7 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class SampleApplicationTests { public class SampleApplicationTests {
@@ -51,7 +48,7 @@ public class SampleApplicationTests {
private TestRestTemplate rest = new TestRestTemplate(); private TestRestTemplate rest = new TestRestTemplate();
@Before @BeforeEach
public void before() { public void before() {
this.headers = new HttpHeaders(); this.headers = new HttpHeaders();
this.headers.setContentType(MediaType.APPLICATION_JSON); this.headers.setContentType(MediaType.APPLICATION_JSON);

5
spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java
View File

@@ -18,8 +18,7 @@ package example;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@@ -27,9 +26,7 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class FunctionSampleSpringIntegrationApplicationTests { public class FunctionSampleSpringIntegrationApplicationTests {

2
spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import com.example.functions.CharCounter; import com.example.functions.CharCounter;
import com.example.functions.Exclaimer; import com.example.functions.Exclaimer;
import com.example.functions.Greeter; import com.example.functions.Greeter;
import org.junit.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

9
spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationMvcTests.java
View File

@@ -21,24 +21,21 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.MvcResult;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@Ignore @Disabled
public class SampleApplicationMvcTests { public class SampleApplicationMvcTests {
@Autowired @Autowired

5
spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java
View File

@@ -22,15 +22,12 @@ import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
@RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class SampleApplicationTests { public class SampleApplicationTests {

5
spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java
View File

@@ -1,12 +1,10 @@
package com.example; package com.example;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -14,7 +12,6 @@ import reactor.core.publisher.Mono;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest @FunctionalSpringBootTest
@AutoConfigureWebTestClient @AutoConfigureWebTestClient
public class WebTestClientTests { public class WebTestClientTests {

15
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java
View File

@@ -24,10 +24,9 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -44,7 +43,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@@ -62,7 +60,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
// @checkstyle:off // @checkstyle:off
@SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive")
// @checkstyle:on // @checkstyle:on
@@ -79,7 +76,7 @@ public class FluxRestApplicationTests {
@Autowired @Autowired
private TestConfiguration test; private TestConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }
@@ -100,7 +97,7 @@ public class FluxRestApplicationTests {
} }
@Test @Test
@Ignore("Fix error handling") @Disabled("Fix error handling")
public void errorJson() throws Exception { public void errorJson() throws Exception {
assertThat(this.rest assertThat(this.rest
.exchange(RequestEntity.get(new URI("/bang")) .exchange(RequestEntity.get(new URI("/bang"))
@@ -134,7 +131,7 @@ public class FluxRestApplicationTests {
} }
@Test @Test
@Ignore("Should this even work? Or do we need to be explicit about the JSON?") @Disabled("Should this even work? Or do we need to be explicit about the JSON?")
public void updates() throws Exception { public void updates() throws Exception {
ResponseEntity<String> result = this.rest.exchange( ResponseEntity<String> result = this.rest.exchange(
RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class); RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class);

15
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/mvc/MvcRestApplicationTests.java
View File

@@ -24,10 +24,9 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -43,7 +42,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@@ -64,7 +62,6 @@ import static org.assertj.core.api.Assertions.assertThat;
// @checkstyle:off // @checkstyle:off
@SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") @SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet")
// @checkstyle:on // @checkstyle:on
@RunWith(SpringRunner.class)
public class MvcRestApplicationTests { public class MvcRestApplicationTests {
private static final MediaType EVENT_STREAM = MediaType.valueOf("text/event-stream"); private static final MediaType EVENT_STREAM = MediaType.valueOf("text/event-stream");
@@ -78,7 +75,7 @@ public class MvcRestApplicationTests {
@Autowired @Autowired
private TestConfiguration test; private TestConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }
@@ -99,7 +96,7 @@ public class MvcRestApplicationTests {
} }
@Test @Test
@Ignore("Fix error handling") @Disabled("Fix error handling")
public void errorJson() throws Exception { public void errorJson() throws Exception {
assertThat(this.rest assertThat(this.rest
.exchange(RequestEntity.get(new URI("/bang")) .exchange(RequestEntity.get(new URI("/bang"))
@@ -133,7 +130,7 @@ public class MvcRestApplicationTests {
} }
@Test @Test
@Ignore("Should this even work? Or do we need to be explicit about the JSON?") @Disabled("Should this even work? Or do we need to be explicit about the JSON?")
public void updates() throws Exception { public void updates() throws Exception {
ResponseEntity<String> result = this.rest.exchange( ResponseEntity<String> result = this.rest.exchange(
RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class); RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class);

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/scan/ComponentTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.scan;
import java.net.URI; import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +34,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -43,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class ComponentTests { public class ComponentTests {

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ExplicitNonFunctionalTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,14 +27,12 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest({ "spring.main.web-application-type=REACTIVE", @SpringBootTest({ "spring.main.web-application-type=REACTIVE",
"spring.functional.enabled=false" }) "spring.functional.enabled=false" })
@AutoConfigureWebTestClient @AutoConfigureWebTestClient

13
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java
View File

@@ -20,10 +20,9 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import org.junit.AfterClass; import org.junit.jupiter.api.AfterAll;
import org.junit.BeforeClass; import org.junit.jupiter.api.BeforeAll;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@@ -39,7 +38,6 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -48,7 +46,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
*/ */
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest(classes = ApplicationConfiguration.class, webEnvironment = WebEnvironment.NONE, properties = { @FunctionalSpringBootTest(classes = ApplicationConfiguration.class, webEnvironment = WebEnvironment.NONE, properties = {
"spring.main.web-application-type=none", "spring.main.web-application-type=none",
"spring.cloud.function.web.export.sink.url=http://localhost:${my.port}", "spring.cloud.function.web.export.sink.url=http://localhost:${my.port}",
@@ -67,7 +64,7 @@ public class FunctionalExporterTests {
private static Map<String, Object> headers = new HashMap<>(); private static Map<String, Object> headers = new HashMap<>();
@BeforeClass @BeforeAll
public static void init() throws Exception { public static void init() throws Exception {
headers.clear(); headers.clear();
String port = "" + SocketUtils.findAvailableTcpPort(); String port = "" + SocketUtils.findAvailableTcpPort();
@@ -80,7 +77,7 @@ public class FunctionalExporterTests {
Thread.sleep(500L); Thread.sleep(500L);
} }
@AfterClass @AfterAll
public static void close() { public static void close() {
headers.clear(); headers.clear();
System.clearProperty("server.port"); System.clearProperty("server.port");

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalTests.java
View File

@@ -18,22 +18,19 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
// Only need web-application-type because MVC is on the classpath // Only need web-application-type because MVC is on the classpath
@FunctionalSpringBootTest("spring.main.web-application-type=reactive") @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java
View File

@@ -20,22 +20,19 @@ import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest("spring.main.web-application-type=reactive") @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient
public class FunctionalWithInputListTests { public class FunctionalWithInputListTests {

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java
View File

@@ -20,15 +20,13 @@ import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -37,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@FunctionalSpringBootTest("spring.main.web-application-type=reactive") @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient
public class FunctionalWithInputSetTests { public class FunctionalWithInputSetTests {

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/HeadersToMessageTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,14 +27,12 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
// Only need web-application-type because MVC is on the classpath // Only need web-application-type because MVC is on the classpath
@FunctionalSpringBootTest("spring.main.web-application-type=reactive") @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ImplicitNonFunctionalTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,14 +28,12 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest("spring.main.web-application-type=REACTIVE") @SpringBootTest("spring.main.web-application-type=REACTIVE")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient
@DirtiesContext @DirtiesContext

9
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/MoreThenOneFunctionRootMappingTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,14 +28,12 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest({ "spring.main.web-application-type=REACTIVE", @SpringBootTest({ "spring.main.web-application-type=REACTIVE",
"spring.functional.enabled=false", "spring.functional.enabled=false",
"spring.cloud.function.definition=uppercase|reverse" }) "spring.cloud.function.definition=uppercase|reverse" })
@@ -48,7 +45,7 @@ public class MoreThenOneFunctionRootMappingTests {
private WebTestClient client; private WebTestClient client;
@Test @Test
public void words() throws Exception { public void words() {
this.client.post().uri("/").body(Mono.just("star"), String.class).exchange() this.client.post().uri("/").body(Mono.just("star"), String.class).exchange()
.expectStatus().isOk().expectBody(String.class).isEqualTo("RATS"); .expectStatus().isOk().expectBody(String.class).isEqualTo("RATS");
} }
@@ -59,7 +56,7 @@ public class MoreThenOneFunctionRootMappingTests {
@Bean @Bean
public Function<String, String> uppercase() { public Function<String, String> uppercase() {
return v -> v.toUpperCase(); return String::toUpperCase;
} }
@Bean @Bean

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/PojoTests.java
View File

@@ -18,22 +18,19 @@ package org.springframework.cloud.function.test;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
/** /**
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
// Only need web-application-type because MVC is on the classpath // Only need web-application-type because MVC is on the classpath
@FunctionalSpringBootTest("spring.main.web-application-type=reactive") @FunctionalSpringBootTest("spring.main.web-application-type=reactive")
@AutoConfigureWebTestClient @AutoConfigureWebTestClient

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HeadersToMessageTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux;
import java.net.URI; import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -36,7 +35,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -45,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.cloud.function.web.path=/functions", "spring.cloud.function.web.path=/functions",
"spring.main.web-application-type=reactive" }) "spring.main.web-application-type=reactive" })

9
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpGetIntegrationTests.java
View File

@@ -27,9 +27,8 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +47,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -57,7 +55,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive")
@ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class })
public class HttpGetIntegrationTests { public class HttpGetIntegrationTests {
@@ -73,7 +70,7 @@ public class HttpGetIntegrationTests {
@Autowired @Autowired
private ApplicationConfiguration test; private ApplicationConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }

13
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java
View File

@@ -26,10 +26,9 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -52,7 +51,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
@@ -63,7 +61,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive")
@ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class })
public class HttpPostIntegrationTests { public class HttpPostIntegrationTests {
@@ -79,7 +76,7 @@ public class HttpPostIntegrationTests {
@Autowired @Autowired
private ApplicationConfiguration test; private ApplicationConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }
@@ -182,7 +179,7 @@ public class HttpPostIntegrationTests {
} }
@Test @Test
@Ignore("WebFlux would split the request body into lines: TODO make this work the same") @Disabled("WebFlux would split the request body into lines: TODO make this work the same")
public void uppercasePlainText() throws Exception { public void uppercasePlainText() throws Exception {
ResponseEntity<String> result = this.rest.exchange( ResponseEntity<String> result = this.rest.exchange(
RequestEntity.post(new URI("/uppercase")) RequestEntity.post(new URI("/uppercase"))

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/PrefixTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux;
import java.net.URI; import java.net.URI;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.main.web-application-type=reactive", "spring.main.web-application-type=reactive",
"spring.cloud.function.web.path=/functions", "debug" }) "spring.cloud.function.web.path=/functions", "debug" })

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/SingletonTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux;
import java.net.URI; import java.net.URI;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
@@ -41,7 +40,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -49,7 +47,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive")
@ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class })
public class SingletonTests { public class SingletonTests {

10
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java
View File

@@ -19,9 +19,9 @@ package org.springframework.cloud.function.web.function;
import java.net.URI; import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -40,13 +40,13 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
public class FunctionEndpointInitializerMVCTests { public class FunctionEndpointInitializerMVCTests {
@Before @BeforeEach
public void init() throws Exception { public void init() throws Exception {
String port = "" + SocketUtils.findAvailableTcpPort(); String port = "" + SocketUtils.findAvailableTcpPort();
System.setProperty("server.port", port); System.setProperty("server.port", port);
} }
@After @AfterEach
public void close() throws Exception { public void close() throws Exception {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }

10
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
View File

@@ -20,9 +20,9 @@ import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -45,13 +45,13 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
public class FunctionEndpointInitializerTests { public class FunctionEndpointInitializerTests {
@Before @BeforeEach
public void init() throws Exception { public void init() throws Exception {
String port = "" + SocketUtils.findAvailableTcpPort(); String port = "" + SocketUtils.findAvailableTcpPort();
System.setProperty("server.port", port); System.setProperty("server.port", port);
} }
@After @AfterEach
public void close() throws Exception { public void close() throws Exception {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }

10
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java
View File

@@ -19,9 +19,9 @@ package org.springframework.cloud.function.web.function;
import java.net.URI; import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -41,13 +41,13 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
public class UserSubmittedTests { public class UserSubmittedTests {
@Before @BeforeEach
public void init() throws Exception { public void init() throws Exception {
String port = "" + SocketUtils.findAvailableTcpPort(); String port = "" + SocketUtils.findAvailableTcpPort();
System.setProperty("server.port", port); System.setProperty("server.port", port);
} }
@After @AfterEach
public void close() throws Exception { public void close() throws Exception {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }

11
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/DefaultRouteTests.java
View File

@@ -19,9 +19,8 @@ package org.springframework.cloud.function.web.mvc;
import java.net.URI; import java.net.URI;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +36,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -45,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "")
@ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class })
public class DefaultRouteTests { public class DefaultRouteTests {
@@ -57,7 +54,7 @@ public class DefaultRouteTests {
private TestRestTemplate rest; private TestRestTemplate rest;
@Test @Test
@Ignore("FIXME") @Disabled("FIXME")
public void explicit() throws Exception { public void explicit() throws Exception {
ResponseEntity<String> result = this.rest.exchange( ResponseEntity<String> result = this.rest.exchange(
RequestEntity.post(new URI("/uppercase")).body("foo"), String.class); RequestEntity.post(new URI("/uppercase")).body("foo"), String.class);
@@ -66,7 +63,7 @@ public class DefaultRouteTests {
} }
@Test @Test
@Ignore("FIXME") @Disabled("FIXME")
public void implicit() throws Exception { public void implicit() throws Exception {
ResponseEntity<String> result = this.rest ResponseEntity<String> result = this.rest
.exchange(RequestEntity.post(new URI("/")).body("foo"), String.class); .exchange(RequestEntity.post(new URI("/")).body("foo"), String.class);

5
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HeadersToMessageTests.java
View File

@@ -21,8 +21,7 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -38,7 +37,6 @@ import org.springframework.http.RequestEntity;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.main.web-application-type=servlet", "spring.main.web-application-type=servlet",
"spring.cloud.function.web.path=/functions" }) "spring.cloud.function.web.path=/functions" })

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

@@ -27,10 +27,9 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +48,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -58,7 +56,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet")
@ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class })
public class HttpGetIntegrationTests { public class HttpGetIntegrationTests {
@@ -74,7 +71,7 @@ public class HttpGetIntegrationTests {
@Autowired @Autowired
private ApplicationConfiguration test; private ApplicationConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }
@@ -101,7 +98,7 @@ public class HttpGetIntegrationTests {
} }
@Test @Test
@Ignore("Fix error handling") @Disabled("Fix error handling")
public void errorJson() throws Exception { public void errorJson() throws Exception {
assertThat(this.rest assertThat(this.rest
.exchange(RequestEntity.get(new URI("/bang")) .exchange(RequestEntity.get(new URI("/bang"))

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

@@ -26,10 +26,9 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@@ -52,7 +51,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -62,7 +60,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet")
@ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class })
public class HttpPostIntegrationTests { public class HttpPostIntegrationTests {
@@ -78,13 +75,13 @@ public class HttpPostIntegrationTests {
@Autowired @Autowired
private ApplicationConfiguration test; private ApplicationConfiguration test;
@Before @BeforeEach
public void init() { public void init() {
this.test.list.clear(); this.test.list.clear();
} }
@Test @Test
@Ignore @Disabled
public void qualifierFoos() throws Exception { public void qualifierFoos() throws Exception {
ResponseEntity<String> result = this.rest.exchange(RequestEntity ResponseEntity<String> result = this.rest.exchange(RequestEntity
.post(new URI("/foos")).contentType(MediaType.APPLICATION_JSON) .post(new URI("/foos")).contentType(MediaType.APPLICATION_JSON)
@@ -177,7 +174,7 @@ public class HttpPostIntegrationTests {
} }
@Test @Test
@Ignore("WebFlux would split the request body into lines: TODO make this work the same") @Disabled("WebFlux would split the request body into lines: TODO make this work the same")
public void uppercasePlainText() throws Exception { public void uppercasePlainText() throws Exception {
ResponseEntity<String> result = this.rest.exchange( ResponseEntity<String> result = this.rest.exchange(
RequestEntity.post(new URI("/uppercase")) RequestEntity.post(new URI("/uppercase"))

9
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.mvc;
import java.net.URI; import java.net.URI;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.function.web.RestApplication; import org.springframework.cloud.function.web.RestApplication;
import org.springframework.cloud.function.web.mvc.PrefixTests.TestConfiguration; import org.springframework.cloud.function.web.mvc.PrefixTests.TestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -36,7 +34,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -44,16 +41,12 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.main.web-application-type=servlet", "spring.main.web-application-type=servlet",
"spring.cloud.function.web.path=/functions" }) "spring.cloud.function.web.path=/functions" })
@ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class })
public class PrefixTests { public class PrefixTests {
@LocalServerPort
private int port;
@Autowired @Autowired
private TestRestTemplate rest; private TestRestTemplate rest;

13
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java
View File

@@ -21,9 +21,8 @@ import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +44,6 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -53,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
"spring.main.web-application-type=servlet", "spring.main.web-application-type=servlet",
"spring.cloud.function.web.path=/functions", "spring.cloud.function.web.path=/functions",
@@ -134,7 +131,7 @@ public class RoutingFunctionTests {
@Test @Test
@DirtiesContext @DirtiesContext
@Ignore @Disabled
public void testFluxConsumer() throws Exception { public void testFluxConsumer() throws Exception {
ResponseEntity<String> postForEntity = this.rest ResponseEntity<String> postForEntity = this.rest
.exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME))
@@ -148,7 +145,7 @@ public class RoutingFunctionTests {
@Test @Test
@DirtiesContext @DirtiesContext
@Ignore @Disabled
public void testFunctionPojo() throws Exception { public void testFunctionPojo() throws Exception {
ResponseEntity<String> postForEntity = this.rest ResponseEntity<String> postForEntity = this.rest
.exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME))
@@ -161,7 +158,7 @@ public class RoutingFunctionTests {
@Test @Test
@DirtiesContext @DirtiesContext
@Ignore @Disabled
public void testConsumerMessage() throws Exception { public void testConsumerMessage() throws Exception {
ResponseEntity<String> postForEntity = this.rest ResponseEntity<String> postForEntity = this.rest
.exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME))

9
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/SingletonTests.java
View File

@@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.mvc;
import java.net.URI; import java.net.URI;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
@@ -33,7 +32,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.function.web.RestApplication; import org.springframework.cloud.function.web.RestApplication;
import org.springframework.cloud.function.web.mvc.SingletonTests.TestConfiguration; import org.springframework.cloud.function.web.mvc.SingletonTests.TestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -41,7 +39,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -49,14 +46,10 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class })
public class SingletonTests { public class SingletonTests {
@LocalServerPort
private int port;
@Autowired @Autowired
private TestRestTemplate rest; private TestRestTemplate rest;

13
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java
View File

@@ -24,10 +24,9 @@ import java.util.function.Function;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass; import org.junit.jupiter.api.AfterAll;
import org.junit.BeforeClass; import org.junit.jupiter.api.BeforeAll;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -38,7 +37,6 @@ import org.springframework.cloud.function.web.source.FunctionAutoConfigurationIn
import org.springframework.cloud.function.web.source.FunctionAutoConfigurationIntegrationTests.RestConfiguration; import org.springframework.cloud.function.web.source.FunctionAutoConfigurationIntegrationTests.RestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -51,7 +49,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { RestConfiguration.class, @SpringBootTest(classes = { RestConfiguration.class,
ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = { ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = {
"spring.cloud.function.web.export.sink.url=http://localhost:${server.port}", "spring.cloud.function.web.export.sink.url=http://localhost:${server.port}",
@@ -67,12 +64,12 @@ public class FunctionAutoConfigurationIntegrationTests {
@Autowired @Autowired
private RestConfiguration app; private RestConfiguration app;
@BeforeClass @BeforeAll
public static void init() { public static void init() {
System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort());
} }
@AfterClass @AfterAll
public static void close() { public static void close() {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }

17
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java
View File

@@ -22,11 +22,10 @@ import java.util.function.Function;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass; import org.junit.jupiter.api.AfterAll;
import org.junit.BeforeClass; import org.junit.jupiter.api.BeforeAll;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -37,7 +36,6 @@ import org.springframework.cloud.function.web.source.FunctionAutoConfigurationWi
import org.springframework.cloud.function.web.source.FunctionAutoConfigurationWithRetriesIntegrationTests.RestConfiguration; import org.springframework.cloud.function.web.source.FunctionAutoConfigurationWithRetriesIntegrationTests.RestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -50,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { RestConfiguration.class, @SpringBootTest(classes = { RestConfiguration.class,
ApplicationConfiguration.class }, ApplicationConfiguration.class },
webEnvironment = WebEnvironment.DEFINED_PORT, properties = { webEnvironment = WebEnvironment.DEFINED_PORT, properties = {
@@ -66,18 +63,18 @@ public class FunctionAutoConfigurationWithRetriesIntegrationTests {
@Autowired @Autowired
private RestConfiguration app; private RestConfiguration app;
@BeforeClass @BeforeAll
public static void init() { public static void init() {
System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort());
} }
@AfterClass @AfterAll
public static void close() { public static void close() {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }
@Test @Test
@Ignore @Disabled
public void copiesMessages() throws Exception { public void copiesMessages() throws Exception {
int count = 0; int count = 0;
while (this.forwarder.isRunning() && count++ < 30) { while (this.forwarder.isRunning() && count++ < 30) {

9
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/SourceAutoConfigurationIntegrationTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.function.web.source;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -30,7 +29,6 @@ import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.cloud.function.web.source.SourceAutoConfigurationIntegrationTests.ApplicationConfiguration; import org.springframework.cloud.function.web.source.SourceAutoConfigurationIntegrationTests.ApplicationConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -38,19 +36,18 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
// @formatter:off // @formatter:off
@SpringBootTest(webEnvironment = WebEnvironment.NONE, @SpringBootTest(webEnvironment = WebEnvironment.NONE,
properties = "spring.cloud.function.web.export.sink.url=https://nosuchhost") properties = "spring.cloud.function.web.export.sink.url=https://nosuchhost")
// @formatter:on // @formatter:on
@ContextConfiguration(classes = { ApplicationConfiguration.class }) @ContextConfiguration(classes = { ApplicationConfiguration.class })
@Disabled
public class SourceAutoConfigurationIntegrationTests { public class SourceAutoConfigurationIntegrationTests {
@Autowired @Autowired
private SupplierExporter forwarder; private SupplierExporter forwarder;
@Test @Test
@Ignore
public void fails() throws Exception { public void fails() throws Exception {
int count = 0; int count = 0;
while (this.forwarder.isRunning() && count++ < 1000) { while (this.forwarder.isRunning() && count++ < 1000) {

17
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java
View File

@@ -24,11 +24,10 @@ import java.util.function.Supplier;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass; import org.junit.jupiter.api.AfterAll;
import org.junit.BeforeClass; import org.junit.jupiter.api.BeforeAll;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -38,7 +37,6 @@ import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.cloud.function.web.RestApplication; import org.springframework.cloud.function.web.RestApplication;
import org.springframework.cloud.function.web.source.WebAppIntegrationTests.ApplicationConfiguration; import org.springframework.cloud.function.web.source.WebAppIntegrationTests.ApplicationConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -50,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* *
*/ */
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { RestApplication.class, ApplicationConfiguration.class }, @SpringBootTest(classes = { RestApplication.class, ApplicationConfiguration.class },
webEnvironment = WebEnvironment.DEFINED_PORT, properties = { webEnvironment = WebEnvironment.DEFINED_PORT, properties = {
"spring.main.web-application-type=reactive", "spring.main.web-application-type=reactive",
@@ -67,18 +64,18 @@ public class WebAppIntegrationTests {
@Autowired @Autowired
private ApplicationConfiguration app; private ApplicationConfiguration app;
@BeforeClass @BeforeAll
public static void init() { public static void init() {
System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort());
} }
@AfterClass @AfterAll
public static void close() { public static void close() {
System.clearProperty("server.port"); System.clearProperty("server.port");
} }
@Test @Test
@Ignore @Disabled
public void posts() throws Exception { public void posts() throws Exception {
this.forwarder.start(); this.forwarder.start();
this.app.latch.await(10, TimeUnit.SECONDS); this.app.latch.await(10, TimeUnit.SECONDS);