From dfa02750c1e6dd84e77228ed678b6cb8a601934d Mon Sep 17 00:00:00 2001 From: anshlykov Date: Wed, 10 Jun 2020 12:08:12 +0300 Subject: [PATCH] Migrate to JUnit 5 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 --- ...ringBootApiGatewayRequestHandlerTests.java | 6 +- .../SpringBootKinesisEventHandlerTests.java | 2 +- .../aws/SpringBootRequestHandlerTests.java | 6 +- .../aws/SpringBootStreamHandlerTests.java | 6 +- ...zureSpringBootHttpRequestHandlerTests.java | 6 +- .../AzureSpringBootRequestHandlerTests.java | 6 +- .../spring-cloud-function-adapter-gcp/pom.xml | 8 +- .../gcp/FunctionInvokerBackgroundTests.java | 68 +++++++---------- .../adapter/gcp/FunctionInvokerHttpTests.java | 2 +- .../FunctionInvokerIntegrationTests.java | 2 +- .../openwhisk/OpenWhiskActionHandlerTest.java | 5 +- .../CompilerDependencyResolutionTests.java | 2 +- .../compiler/ConsumerCompilerTests.java | 2 +- .../compiler/FunctionCompilerTests.java | 2 +- .../compiler/SupplierCompilerTests.java | 2 +- .../java/RuntimeJavaCompilerTests.java | 2 +- .../proxy/ByteCodeLoadingFunctionTests.java | 2 +- .../core/FunctionFactoryUtilsTests.java | 2 +- .../context/FunctionRegistrationTests.java | 2 +- .../function/context/FunctionTypeTests.java | 2 +- .../HybridFunctionalRegistrationTests.java | 2 +- ...SpringFunctionAdapterInitializerTests.java | 20 ++--- ...yAwareFunctionRegistryMultiInOutTests.java | 6 +- ...BeanFactoryAwareFunctionRegistryTests.java | 17 +++-- ...FactoryAwarePojoFunctionRegistryTests.java | 2 +- .../catalog/FunctionTypeUtilsTests.java | 2 +- .../context/catalog/MessageConsumerTests.java | 2 +- .../context/catalog/MessageFunctionTests.java | 2 +- .../context/catalog/MessageSupplierTests.java | 2 +- .../catalog/SimpleFunctionRegistryTests.java | 10 +-- ...FunctionCatalogAutoConfigurationTests.java | 22 +++--- ...ontextFunctionCatalogInitializerTests.java | 23 +++--- ...gotiatingMessageConverterWrapperTests.java | 2 +- .../context/config/RoutingFunctionTests.java | 25 +++---- .../string/FunctionalStringSourceTests.java | 5 +- .../context/test/FunctionalTests.java | 5 +- .../cloud/function/utils/JsonMapperTests.java | 74 +++++++++---------- .../deployer/FunctionDeployerTests.java | 6 +- ...onCatalogAutoConfigurationKotlinTests.java | 7 +- .../com/example/LambdaApplicationTests.java | 5 +- .../src/test/java/example/MapTests.java | 2 +- .../src/test/java/example/MapTests.java | 2 +- .../example/SampleCompiledConsumerTests.java | 5 +- .../example/SampleCompiledFunctionTests.java | 5 +- .../FunctionSampleGcpIntegrationTest.java | 2 +- .../example/SampleApplicationMvcTests.java | 5 +- .../com/example/SampleApplicationTests.java | 9 +-- ...mpleSpringIntegrationApplicationTests.java | 5 +- .../test/java/com/example/FunctionTests.java | 2 +- .../example/SampleApplicationMvcTests.java | 9 +-- .../com/example/SampleApplicationTests.java | 5 +- .../java/com/example/WebTestClientTests.java | 5 +- .../flux/FluxRestApplicationTests.java | 15 ++-- .../function/mvc/MvcRestApplicationTests.java | 15 ++-- .../cloud/function/scan/ComponentTests.java | 5 +- .../test/ExplicitNonFunctionalTests.java | 5 +- .../test/FunctionalExporterTests.java | 13 ++-- .../cloud/function/test/FunctionalTests.java | 5 +- .../test/FunctionalWithInputListTests.java | 5 +- .../test/FunctionalWithInputSetTests.java | 5 +- .../function/test/HeadersToMessageTests.java | 5 +- .../test/ImplicitNonFunctionalTests.java | 5 +- .../MoreThenOneFunctionRootMappingTests.java | 9 +-- .../cloud/function/test/PojoTests.java | 5 +- .../web/flux/HeadersToMessageTests.java | 5 +- .../web/flux/HttpGetIntegrationTests.java | 9 +-- .../web/flux/HttpPostIntegrationTests.java | 13 ++-- .../cloud/function/web/flux/PrefixTests.java | 5 +- .../function/web/flux/SingletonTests.java | 5 +- .../FunctionEndpointInitializerMVCTests.java | 10 +-- .../FunctionEndpointInitializerTests.java | 10 +-- .../web/function/UserSubmittedTests.java | 10 +-- .../function/web/mvc/DefaultRouteTests.java | 11 +-- .../web/mvc/HeadersToMessageTests.java | 5 +- .../web/mvc/HttpGetIntegrationTests.java | 13 ++-- .../web/mvc/HttpPostIntegrationTests.java | 15 ++-- .../cloud/function/web/mvc/PrefixTests.java | 9 +-- .../web/mvc/RoutingFunctionTests.java | 13 ++-- .../function/web/mvc/SingletonTests.java | 9 +-- ...tionAutoConfigurationIntegrationTests.java | 13 ++-- ...figurationWithRetriesIntegrationTests.java | 17 ++--- ...urceAutoConfigurationIntegrationTests.java | 9 +-- .../web/source/WebAppIntegrationTests.java | 17 ++--- 83 files changed, 290 insertions(+), 430 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java index 0a2fde916..425e040cd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandlerTests.java @@ -26,8 +26,8 @@ import java.util.function.Supplier; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; @@ -47,7 +47,7 @@ public class SpringBootApiGatewayRequestHandlerTests { private SpringBootApiGatewayRequestHandler handler; - @After + @AfterEach public void after() { System.clearProperty("function.name"); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootKinesisEventHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootKinesisEventHandlerTests.java index 381c03f48..4bfea8350 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootKinesisEventHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootKinesisEventHandlerTests.java @@ -27,7 +27,7 @@ import com.amazonaws.kinesis.agg.RecordAggregator; import com.amazonaws.services.lambda.runtime.events.KinesisEvent; import com.fasterxml.jackson.core.JsonProcessingException; 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.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandlerTests.java index abe3fc8f1..979ad0c1a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandlerTests.java @@ -18,8 +18,8 @@ package org.springframework.cloud.function.adapter.aws; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; @@ -37,7 +37,7 @@ public class SpringBootRequestHandlerTests { private SpringBootRequestHandler handler; - @Before + @BeforeEach public void after() { System.clearProperty("spring.cloud.function.definition"); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java index d7e6d93cc..c9aa2d935 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/SpringBootStreamHandlerTests.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +45,7 @@ public class SpringBootStreamHandlerTests { private SpringBootStreamHandler handler; - @Before + @BeforeEach public void before() { System.clearProperty("function.name"); } diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootHttpRequestHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootHttpRequestHandlerTests.java index d9b7a6aa8..e232edc99 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootHttpRequestHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootHttpRequestHandlerTests.java @@ -31,8 +31,8 @@ import com.microsoft.azure.functions.HttpResponseMessage; import com.microsoft.azure.functions.HttpResponseMessage.Builder; import com.microsoft.azure.functions.HttpStatus; import com.microsoft.azure.functions.HttpStatusType; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.context.annotation.Bean; @@ -108,7 +108,7 @@ public class AzureSpringBootHttpRequestHandlerTests { assertThat(body).isNull(); } - @After + @AfterEach public void close() throws IOException { if (this.handler != null) { this.handler.close(); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java index e0853f298..e91d7125a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java @@ -25,8 +25,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import com.microsoft.azure.functions.ExecutionContext; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -142,7 +142,7 @@ public class AzureSpringBootRequestHandlerTests { assertThat(consumerResult).isEqualTo("foo1"); } - @After + @AfterEach public void close() throws IOException { if (this.handler != null) { this.handler.close(); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml index 523e54458..bae4b0d25 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml @@ -63,11 +63,11 @@ ${google.cloud.functions.invoker.version} test + - com.github.stefanbirkner - system-rules - 1.19.0 - test + com.github.blindpirate + junit5-capture-system-output-extension + 0.1.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java index 98d78e688..e62123703 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java @@ -20,10 +20,10 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +import com.github.blindpirate.extensions.CaptureSystemOutput; import com.google.gson.Gson; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.SystemOutRule; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; 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.support.MessageBuilder; -import static org.assertj.core.api.Assertions.assertThat; - /** * Unit tests for the background functions adapter for Google Cloud Functions. * * @author Dmitry Solomakha * @author Mike Eltsufin */ +@CaptureSystemOutput public class FunctionInvokerBackgroundTests { 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: "; @Test - public void testHelloWorldSupplier_Background() throws Exception { - testBackgroundFunction(HelloWorldSupplier.class, null, "Hello World!", null, null); + public void testHelloWorldSupplier_Background(CaptureSystemOutput.OutputCapture outputCapture) { + testBackgroundFunction(outputCapture, HelloWorldSupplier.class, null, "Hello World!", null, null); } - @Test - public void testJsonInputFunction_Background() throws Exception { - testBackgroundFunction(JsonInputFunction.class, new IncomingRequest("hello"), + public void testJsonInputFunction_Background(CaptureSystemOutput.OutputCapture outputCapture) { + testBackgroundFunction(outputCapture, JsonInputFunction.class, new IncomingRequest("hello"), "Thank you for sending the message: hello", null, null); } @Test - public void testJsonInputOutputFunction_Background() throws Exception { - testBackgroundFunction(JsonInputOutputFunction.class, new IncomingRequest("hello"), + public void testJsonInputOutputFunction_Background(CaptureSystemOutput.OutputCapture outputCapture) { + testBackgroundFunction(outputCapture, JsonInputOutputFunction.class, new IncomingRequest("hello"), new OutgoingResponse("Thank you for sending the message: hello"), null, null); } @Test - public void testJsonInputConsumer() throws Exception { - testBackgroundFunction(JsonInputConsumer.class, new IncomingRequest("hello"), null, + public void testJsonInputConsumer(CaptureSystemOutput.OutputCapture outputCapture) { + testBackgroundFunction(outputCapture, JsonInputConsumer.class, new IncomingRequest("hello"), null, "Thank you for sending the message: hello", null); } @Test - public void testPubSubBackgroundFunction_PubSub() throws Exception { + public void testPubSubBackgroundFunction_PubSub(CaptureSystemOutput.OutputCapture outputCapture) { PubSubMessage pubSubMessage = new PubSubMessage(); 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"); } @Test - public void testPubSubBackgroundFunction_PubSubPayload() throws Exception { + public void testPubSubBackgroundFunction_PubSubPayload(CaptureSystemOutput.OutputCapture outputCapture) { PubSubMessage pubSubMessage = new PubSubMessage(); IncomingRequest message = new IncomingRequest("Hello"); 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"); } @Test - public void testPubSubBackgroundFunction_StringMessage() throws Exception { + public void testPubSubBackgroundFunction_StringMessage(CaptureSystemOutput.OutputCapture outputCapture) { PubSubMessage pubSubMessage = new PubSubMessage(); pubSubMessage.setMessageId("1234"); 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"); } @Test - public void testPubSubBackgroundFunction_PubSubMessage() throws Exception { + public void testPubSubBackgroundFunction_PubSubMessage(CaptureSystemOutput.OutputCapture outputCapture) { PubSubMessage pubSubMessage = new PubSubMessage(); pubSubMessage.setMessageId("1234"); 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"); } - private void testBackgroundFunction(Class configurationClass, I input, O expectedResult, + private void testBackgroundFunction(CaptureSystemOutput.OutputCapture outputCapture, Class configurationClass, I input, O expectedResult, String expectedSysOut, String eventType) { FunctionInvoker handler = new FunctionInvoker(configurationClass); @@ -122,15 +114,15 @@ public class FunctionInvokerBackgroundTests { // verify function sysout statements 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 if (expectedResult != null) { - assertThat(systemOutRule.getLog()).contains(DROPPED_LOG_PREFIX + gson.toJson(expectedResult)); + outputCapture.expect(Matchers.containsString(DROPPED_LOG_PREFIX + gson.toJson(expectedResult))); } 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 public Function> function() { - return (in) -> { - return MessageBuilder - .withPayload(new OutgoingResponse("Thank you for sending the message: " + in.message)) - .setHeader("foo", "bar").build(); - }; + return (in) -> MessageBuilder + .withPayload(new OutgoingResponse("Thank you for sending the message: " + in.message)) + .setHeader("foo", "bar").build(); } } @@ -200,9 +190,7 @@ public class FunctionInvokerBackgroundTests { @Bean public Consumer consumerPayload() { - return (in) -> { - System.out.println("Thank you for sending the message: " + in.message); - }; + return (in) -> System.out.println("Thank you for sending the message: " + in.message); } @Bean diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java index c2d5f832a..bbb4f9d28 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; import com.google.cloud.functions.HttpRequest; import com.google.cloud.functions.HttpResponse; import com.google.gson.Gson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java index d9b69394b..cf8e7ffce 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java @@ -19,7 +19,7 @@ package org.springframework.cloud.function.adapter.gcp.integration; import java.io.IOException; 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.context.annotation.Bean; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/test/java/org/springframework/cloud/function/adapter/openwhisk/OpenWhiskActionHandlerTest.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/test/java/org/springframework/cloud/function/adapter/openwhisk/OpenWhiskActionHandlerTest.java index c322340f2..f8f7e8409 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/test/java/org/springframework/cloud/function/adapter/openwhisk/OpenWhiskActionHandlerTest.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/test/java/org/springframework/cloud/function/adapter/openwhisk/OpenWhiskActionHandlerTest.java @@ -21,8 +21,7 @@ import java.util.Map; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.Scope; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Kamesh Sampath */ -@RunWith(SpringRunner.class) @SpringBootTest @EnableAutoConfiguration @TestPropertySource(locations = "classpath:/application-test.properties") diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java index f9e530657..5480e8a9c 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/CompilerDependencyResolutionTests.java @@ -35,7 +35,7 @@ import java.util.zip.ZipEntry; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import org.springframework.cloud.function.compiler.java.CompilationResult; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java index 5c7c37e23..962823b13 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/ConsumerCompilerTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.core.FunctionFactoryUtils; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java index 1a4c8fc26..0a00deffc 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/FunctionCompilerTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.core.FunctionFactoryUtils; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java index a3f86cd20..fa2a0a225 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/SupplierCompilerTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.compiler; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.cloud.function.core.FunctionFactoryUtils; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java index c3b351f20..10ec123eb 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/java/RuntimeJavaCompilerTests.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Locale; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java index 94bbbe43a..47d86b89f 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/compiler/proxy/ByteCodeLoadingFunctionTests.java @@ -20,7 +20,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.cloud.function.compiler.CompiledFunctionFactory; diff --git a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java index 5b99b88f0..2331285f8 100644 --- a/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java +++ b/spring-cloud-function-compiler/src/test/java/org/springframework/cloud/function/core/FunctionFactoryUtilsTests.java @@ -21,7 +21,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java index 12238e5ff..10f755f55 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionRegistrationTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.context; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionTypeTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionTypeTests.java index 08b030239..94b0abb81 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionTypeTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/FunctionTypeTests.java @@ -24,7 +24,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.util.function.Tuple2; import reactor.util.function.Tuple3; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java index c7077f1fb..f49d301be 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/HybridFunctionalRegistrationTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.context; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.boot.SpringBootConfiguration; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/SpringFunctionAdapterInitializerTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/SpringFunctionAdapterInitializerTests.java index 3919b35fa..4216e32e2 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/SpringFunctionAdapterInitializerTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/SpringFunctionAdapterInitializerTests.java @@ -21,9 +21,10 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.support.GenericApplicationContext; - - import static org.assertj.core.api.Assertions.assertThat; /** @@ -46,7 +45,7 @@ public class SpringFunctionAdapterInitializerTests { private AbstractSpringFunctionAdapterInitializer initializer; - @After + @AfterEach public void after() { System.clearProperty("function.name"); if (this.initializer != null) { @@ -54,11 +53,12 @@ public class SpringFunctionAdapterInitializerTests { } } - @Test(expected = IllegalArgumentException.class) + @Test public void nullSource() { - this.initializer = new AbstractSpringFunctionAdapterInitializer(null) { + Assertions.assertThrows(IllegalArgumentException.class, () -> + this.initializer = new AbstractSpringFunctionAdapterInitializer(null) { - }; + }); } @Test @@ -106,7 +106,7 @@ public class SpringFunctionAdapterInitializerTests { } @Test - @Ignore // related to boot 2.1 no bean override change + @Disabled // related to boot 2.1 no bean override change public void functionRegistrar() { this.initializer = new AbstractSpringFunctionAdapterInitializer(FunctionRegistrar.class) { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryMultiInOutTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryMultiInOutTests.java index 4fda53fdd..7b5bb6e6b 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryMultiInOutTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryMultiInOutTests.java @@ -24,8 +24,8 @@ import java.util.function.BiFunction; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -100,7 +100,7 @@ public class BeanFactoryAwareFunctionRegistryMultiInOutTests { @SuppressWarnings("unused") @Test - @Ignore + @Disabled public void testMultiInputBiFunction() { FunctionCatalog catalog = this.configureCatalog(); BiFunction, Flux, Flux> multiInputFunction = diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java index f9dcedf4c..01dee90ec 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java @@ -28,9 +28,10 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -78,7 +79,7 @@ public class BeanFactoryAwareFunctionRegistryTests { return catalog; } - @Before + @BeforeEach public void before() { System.clearProperty("spring.cloud.function.definition"); } @@ -156,7 +157,7 @@ public class BeanFactoryAwareFunctionRegistryTests { * - the input wrapper must match the output wrapper (e.g., or ) */ @Test - @Ignore + @Disabled public void testImperativeVoidInputFunction() { FunctionCatalog catalog = this.configureCatalog(); @@ -245,11 +246,13 @@ public class BeanFactoryAwareFunctionRegistryTests { * Further more, such flux will need to be triggered (e.g., subscribe(..) ) */ @SuppressWarnings("unused") - @Test(expected = ClassCastException.class) + @Test public void testReactiveFunctionWithImperativeInputAndOutputFail() { FunctionCatalog catalog = this.configureCatalog(); Function reverse = catalog.lookup("reverseFlux"); - String result = reverse.apply("reverseFlux"); + Assertions.assertThrows(ClassCastException.class, () -> { + String result = reverse.apply("reverseFlux"); + }); } @Test diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java index 6010d8c50..b4ec238ff 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java @@ -18,7 +18,7 @@ package org.springframework.cloud.function.context.catalog; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java index a7b91fffb..beab4b7d2 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtilsTests.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageConsumerTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageConsumerTests.java index 58799b630..08221e709 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageConsumerTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageConsumerTests.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.messaging.support.MessageBuilder; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java index c01067f94..54094ac64 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageSupplierTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageSupplierTests.java index d3360907b..8ff2bd6be 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageSupplierTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageSupplierTests.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java index aad1652a4..0dadde068 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java @@ -22,9 +22,9 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.gson.Gson; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.cloud.function.context.FunctionRegistration; @@ -56,7 +56,7 @@ public class SimpleFunctionRegistryTests { private ConversionService conversionService; - @Before + @BeforeEach public void before() { List messageConverters = new ArrayList<>(); JsonMapper jsonMapper = new GsonMapper(new Gson()); @@ -121,7 +121,7 @@ public class SimpleFunctionRegistryTests { } @Test - @Ignore + @Disabled public void testFunctionCompletelyImplicitComposition() { FunctionRegistration wordsRegistration = new FunctionRegistration<>( new Words(), "words").type(FunctionType.of(Words.class)); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java index a506e7c37..6ff4e55db 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java @@ -27,9 +27,9 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -88,7 +88,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { ContextFunctionCatalogAutoConfigurationTests.value = value.toString(); } - @After + @AfterEach public void close() { if (this.context != null) { this.context.close(); @@ -119,7 +119,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled // do we really need this test and behavior? What does this even mean? public void ambiguousFunction() { create(AmbiguousConfiguration.class); @@ -137,7 +137,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled public void configurationFunction() { create(FunctionConfiguration.class); assertThat(this.context.getBean("foos")).isInstanceOf(Function.class); @@ -293,7 +293,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @SuppressWarnings({ "rawtypes", "unchecked" }) - @Test//(expected = IllegalArgumentException.class) + @Test public void monoToMonoNonVoidFunction() { create(MonoToMonoNonVoidConfiguration.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class); @@ -369,7 +369,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled public void singletonMessageFunction() { create(SingletonMessageConfiguration.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class); @@ -474,7 +474,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled public void simpleSupplier() { create(SimpleConfiguration.class); assertThat(this.context.getBean("supplier")).isInstanceOf(Supplier.class); @@ -493,7 +493,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled public void qualifiedBean() { create(QualifiedConfiguration.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class); @@ -517,7 +517,7 @@ public class ContextFunctionCatalogAutoConfigurationTests { } @Test - @Ignore + @Disabled public void registrationBean() { create(RegistrationConfiguration.class); assertThat(this.context.getBean("function")).isInstanceOf(Function.class); diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java index c8950e9e8..d285a62d3 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializerTests.java @@ -26,9 +26,10 @@ import java.util.function.Function; import java.util.function.Supplier; import com.google.gson.Gson; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -61,7 +62,7 @@ public class ContextFunctionCatalogInitializerTests { private FunctionInspector inspector; - @After + @AfterEach public void close() { if (this.context != null) { this.context.close(); @@ -102,7 +103,7 @@ public class ContextFunctionCatalogInitializerTests { } @Test - @Ignore + @Disabled public void compose() { create(SimpleConfiguration.class); assertThat(this.context.getBean("function")) @@ -115,14 +116,16 @@ public class ContextFunctionCatalogInitializerTests { // TODO: support for function composition } - @Test(expected = BeanCreationException.class) + @Test public void missingType() { - create(MissingTypeConfiguration.class); - assertThat(this.context.getBean("function")) + Assertions.assertThrows(BeanCreationException.class, () -> { + create(MissingTypeConfiguration.class); + assertThat(this.context.getBean("function")) .isInstanceOf(FunctionRegistration.class); - assertThat((Function) this.catalog.lookup(Function.class, "function")) + assertThat((Function) this.catalog.lookup(Function.class, "function")) .isInstanceOf(Function.class); - // TODO: support for type inference from functional bean registrations + // TODO: support for type inference from functional bean registrations + }); } @Test diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/NegotiatingMessageConverterWrapperTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/NegotiatingMessageConverterWrapperTests.java index 8a23b1c76..5041e307a 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/NegotiatingMessageConverterWrapperTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/NegotiatingMessageConverterWrapperTests.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java index ed7b758a6..ebfd047c1 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/RoutingFunctionTests.java @@ -18,8 +18,9 @@ package org.springframework.cloud.function.context.config; import java.util.function.Function; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -33,7 +34,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; /** * @@ -44,7 +44,7 @@ public class RoutingFunctionTests { private ConfigurableApplicationContext context; - @After + @AfterEach public void before() { System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.routing-expression"); @@ -55,8 +55,7 @@ public class RoutingFunctionTests { context = new SpringApplicationBuilder(RoutingFunctionConfiguration.class).run( "--logging.level.org.springframework.cloud.function=DEBUG", "--spring.cloud.function.routing.enabled=true"); - FunctionCatalog catalog = context.getBean(FunctionCatalog.class); - return catalog; + return context.getBean(FunctionCatalog.class); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -82,7 +81,7 @@ public class RoutingFunctionTests { } @SuppressWarnings({ "unchecked", "rawtypes" }) - @Test(expected = Exception.class) + @Test public void testRoutingReactiveInputWithReactiveFunctionAndDefinitionMessageHeader() { FunctionCatalog functionCatalog = this.configureCatalog(); Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); @@ -90,11 +89,11 @@ public class RoutingFunctionTests { Message message = MessageBuilder.withPayload("hello") .setHeader(FunctionProperties.PREFIX + ".definition", "echoFlux").build(); Flux resultFlux = (Flux) function.apply(Flux.just(message)); - resultFlux.subscribe(); + Assertions.assertThrows(Exception.class, resultFlux::subscribe); } @SuppressWarnings({ "unchecked", "rawtypes" }) - @Test(expected = Exception.class) + @Test public void testRoutingReactiveInputWithReactiveFunctionAndExpressionMessageHeader() { FunctionCatalog functionCatalog = this.configureCatalog(); Function function = functionCatalog.lookup(RoutingFunction.FUNCTION_NAME); @@ -102,7 +101,7 @@ public class RoutingFunctionTests { Message message = MessageBuilder.withPayload("hello") .setHeader(FunctionProperties.PREFIX + ".routing-expression", "'echoFlux'").build(); Flux resultFlux = (Flux) function.apply(Flux.just(message)); - resultFlux.subscribe(); + Assertions.assertThrows(Exception.class, resultFlux::subscribe); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -135,7 +134,7 @@ public class RoutingFunctionTests { // no function.definition header or function property try { function.apply(MessageBuilder.withPayload("hello").build()); - fail(); + Assertions.fail(); } catch (Exception e) { //ignore @@ -144,7 +143,7 @@ public class RoutingFunctionTests { // non existing function try { function.apply(MessageBuilder.withPayload("hello").setHeader(FunctionProperties.PREFIX + ".definition", "blah").build()); - fail(); + Assertions.fail(); } catch (Exception e) { //ignore @@ -176,7 +175,7 @@ public class RoutingFunctionTests { @Bean public Function uppercase() { - return v -> v.toUpperCase(); + return String::toUpperCase; } @Bean diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/string/FunctionalStringSourceTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/string/FunctionalStringSourceTests.java index f9e53f1a6..585e2043a 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/string/FunctionalStringSourceTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/string/FunctionalStringSourceTests.java @@ -18,14 +18,12 @@ package org.springframework.cloud.function.context.string; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) // @checkstyle:off @FunctionalSpringBootTest(classes = Object.class, properties = "spring.main.sources=org.springframework.cloud.function.context.string.FunctionalStringSourceTests.TestConfiguration") // @checkstyle:on diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/test/FunctionalTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/test/FunctionalTests.java index 5fb8895e3..a22958732 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/test/FunctionalTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/test/FunctionalTests.java @@ -18,14 +18,12 @@ package org.springframework.cloud.function.context.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.cloud.function.context.FunctionCatalog; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @FunctionalSpringBootTest public class FunctionalTests { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java index e69c558a5..4be618a95 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/utils/JsonMapperTests.java @@ -16,15 +16,13 @@ package org.springframework.cloud.function.utils; -import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.springframework.cloud.function.json.GsonMapper; import org.springframework.cloud.function.json.JacksonMapper; @@ -38,70 +36,68 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * */ -@RunWith(Parameterized.class) public class JsonMapperTests { - private JsonMapper mapper; - - public JsonMapperTests(JsonMapper mapper) { - this.mapper = mapper; + public static Stream params() { + return Stream.of(new GsonMapper(new Gson()), new JacksonMapper(new ObjectMapper())); } - @Parameters - public static List params() { - return Arrays.asList(new Object[] { new GsonMapper(new Gson()) }, - new Object[] { new JacksonMapper(new ObjectMapper()) }); - } - - @Test - public void vanillaArray() { + @ParameterizedTest + @MethodSource("params") + public void vanillaArray(JsonMapper mapper) { String json = "[{\"value\":\"foo\"},{\"value\":\"foo\"}]"; - List list = this.mapper.fromJson(json, + List list = mapper.fromJson(json, ResolvableType.forClassWithGenerics(List.class, Foo.class).getType()); assertThat(list).hasSize(2); assertThat(list.get(0).getValue()).isEqualTo("foo"); - assertThat(this.mapper.toString(list)).isEqualTo(json); + assertThat(mapper.toString(list)).isEqualTo(json); } - @Test - public void intArray() { - List list = this.mapper.fromJson("[123,456]", + @ParameterizedTest + @MethodSource("params") + public void intArray(JsonMapper mapper) { + List list = mapper.fromJson("[123,456]", ResolvableType.forClassWithGenerics(List.class, Integer.class).getType()); assertThat(list).hasSize(2); assertThat(list.get(0)).isEqualTo(123); } - @Test - public void emptyArray() { - List list = this.mapper.fromJson("[]", + @ParameterizedTest + @MethodSource("params") + public void emptyArray(JsonMapper mapper) { + List list = mapper.fromJson("[]", ResolvableType.forClassWithGenerics(List.class, Foo.class).getType()); assertThat(list).hasSize(0); } - @Test - public void vanillaObject() { + @ParameterizedTest + @MethodSource("params") + public void vanillaObject(JsonMapper mapper) { 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(this.mapper.toString(foo)).isEqualTo(json); + assertThat(mapper.toString(foo)).isEqualTo(json); } - @Test - public void stringRepresentingJson() { + @ParameterizedTest + @MethodSource("params") + public void stringRepresentingJson(JsonMapper mapper) { String json = "{\"value\":\"foo\"}"; - byte[] bytes = this.mapper.toJson(json); + byte[] bytes = mapper.toJson(json); assertThat(new String(bytes)).isEqualTo(json); } - @Test - public void intValue() { - int foo = this.mapper.fromJson("123", Integer.class); + @ParameterizedTest + @MethodSource("params") + public void intValue(JsonMapper mapper) { + int foo = mapper.fromJson("123", Integer.class); assertThat(foo).isEqualTo(123); } - @Test - public void empty() { - Foo foo = this.mapper.fromJson("{}", Foo.class); + @ParameterizedTest + @MethodSource("params") + public void empty(JsonMapper mapper) { + Foo foo = mapper.fromJson("{}", Foo.class); assertThat(foo.getValue()).isNull(); } diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java index bf7af7b0b..617e39206 100644 --- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java +++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class FunctionDeployerTests { - @Before + @BeforeEach public void before() { System.clearProperty("spring.cloud.function.definition"); } diff --git a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java index 2e84e86f1..201cca4ad 100644 --- a/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java +++ b/spring-cloud-function-kotlin/src/test/java/org/springframework/cloud/function/kotlin/ContextFunctionCatalogAutoConfigurationKotlinTests.java @@ -21,8 +21,8 @@ import java.util.function.Supplier; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; 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.Configuration; - import static org.assertj.core.api.Assertions.assertThat; /** @@ -46,7 +45,7 @@ public class ContextFunctionCatalogAutoConfigurationKotlinTests { private FunctionInspector inspector; - @After + @AfterEach public void close() { if (this.context != null) { this.context.close(); diff --git a/spring-cloud-function-samples/function-sample-aws-custom/src/test/java/com/example/LambdaApplicationTests.java b/spring-cloud-function-samples/function-sample-aws-custom/src/test/java/com/example/LambdaApplicationTests.java index eacfa6ef8..8e4bba7e5 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/src/test/java/com/example/LambdaApplicationTests.java +++ b/spring-cloud-function-samples/function-sample-aws-custom/src/test/java/com/example/LambdaApplicationTests.java @@ -1,12 +1,9 @@ package com.example; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @FunctionalSpringBootTest public class LambdaApplicationTests { diff --git a/spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java b/spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java index 440c6b565..289a8c9ff 100644 --- a/spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java +++ b/spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java @@ -16,7 +16,7 @@ package example; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Dave Syer diff --git a/spring-cloud-function-samples/function-sample-azure/src/test/java/example/MapTests.java b/spring-cloud-function-samples/function-sample-azure/src/test/java/example/MapTests.java index f932df4ce..42fb1c416 100644 --- a/spring-cloud-function-samples/function-sample-azure/src/test/java/example/MapTests.java +++ b/spring-cloud-function-samples/function-sample-azure/src/test/java/example/MapTests.java @@ -16,7 +16,7 @@ package example; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.cloud.function.adapter.azure.AzureSpringBootRequestHandler; diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java index 9fce270cf..7b007aa79 100644 --- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java +++ b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java @@ -16,21 +16,18 @@ package com.example; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.function.compile.test.lambda=com.example.SampleCompiledConsumerTests.Reference::set", "spring.cloud.function.compile.test.inputType=String", diff --git a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java index ecffad0bf..9f702be13 100644 --- a/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java +++ b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java @@ -16,21 +16,18 @@ package com.example; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.function.compile.test.lambda=f->f.map(s->s+\"!!!\")", "spring.cloud.function.compile.test.inputType=Flux", diff --git a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java index ff7eecee8..2ebd4f819 100644 --- a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java +++ b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java @@ -18,7 +18,7 @@ package com.example; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.web.client.TestRestTemplate; diff --git a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationMvcTests.java b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationMvcTests.java index a6f802e23..15c366478 100644 --- a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationMvcTests.java +++ b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationMvcTests.java @@ -18,8 +18,7 @@ package com.example; import java.net.URI; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class SampleApplicationMvcTests { diff --git a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java index a29af8a76..c610871cd 100644 --- a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java +++ b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java @@ -19,9 +19,8 @@ package com.example; import java.net.URI; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; 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.MediaType; import org.springframework.http.RequestEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.LinkedMultiValueMap; import static org.assertj.core.api.Assertions.assertThat; @@ -40,7 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * @author Oleg Zhurakousky */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class SampleApplicationTests { @@ -51,7 +48,7 @@ public class SampleApplicationTests { private TestRestTemplate rest = new TestRestTemplate(); - @Before + @BeforeEach public void before() { this.headers = new HttpHeaders(); this.headers.setContentType(MediaType.APPLICATION_JSON); diff --git a/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java b/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java index 1cf1559c9..f4304776a 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java +++ b/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java @@ -18,8 +18,7 @@ package example; import static org.junit.Assert.assertEquals; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class FunctionSampleSpringIntegrationApplicationTests { diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java index 51bb0f8ea..9248f1030 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java @@ -21,7 +21,7 @@ import java.util.List; import com.example.functions.CharCounter; import com.example.functions.Exclaimer; import com.example.functions.Greeter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationMvcTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationMvcTests.java index 26a57dd1c..b9eb7a8cb 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationMvcTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationMvcTests.java @@ -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.result.MockMvcResultMatchers.content; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; 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.MvcResult; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest @AutoConfigureMockMvc -@Ignore +@Disabled public class SampleApplicationMvcTests { @Autowired diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java index cceb069de..2e55283aa 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java @@ -22,15 +22,12 @@ import java.util.List; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import reactor.core.publisher.Flux; -@RunWith(SpringRunner.class) @SpringBootTest public class SampleApplicationTests { diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java index 5670ed43a..e0f7e6664 100644 --- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java +++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/WebTestClientTests.java @@ -1,12 +1,10 @@ package com.example; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -14,7 +12,6 @@ import reactor.core.publisher.Mono; import java.util.ArrayList; import java.util.List; -@RunWith(SpringRunner.class) @FunctionalSpringBootTest @AutoConfigureWebTestClient public class WebTestClientTests { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java index 07c4a2fce..e337cce82 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/flux/FluxRestApplicationTests.java @@ -24,10 +24,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -44,7 +43,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -62,7 +60,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) // @checkstyle:off @SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") // @checkstyle:on @@ -79,7 +76,7 @@ public class FluxRestApplicationTests { @Autowired private TestConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } @@ -100,7 +97,7 @@ public class FluxRestApplicationTests { } @Test - @Ignore("Fix error handling") + @Disabled("Fix error handling") public void errorJson() throws Exception { assertThat(this.rest .exchange(RequestEntity.get(new URI("/bang")) @@ -134,7 +131,7 @@ public class FluxRestApplicationTests { } @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 { ResponseEntity result = this.rest.exchange( RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/mvc/MvcRestApplicationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/mvc/MvcRestApplicationTests.java index 55baf1b37..8a8a00651 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/mvc/MvcRestApplicationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/mvc/MvcRestApplicationTests.java @@ -24,10 +24,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -43,7 +42,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -64,7 +62,6 @@ import static org.assertj.core.api.Assertions.assertThat; // @checkstyle:off @SpringBootTest(classes = TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") // @checkstyle:on -@RunWith(SpringRunner.class) public class MvcRestApplicationTests { private static final MediaType EVENT_STREAM = MediaType.valueOf("text/event-stream"); @@ -78,7 +75,7 @@ public class MvcRestApplicationTests { @Autowired private TestConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } @@ -99,7 +96,7 @@ public class MvcRestApplicationTests { } @Test - @Ignore("Fix error handling") + @Disabled("Fix error handling") public void errorJson() throws Exception { assertThat(this.rest .exchange(RequestEntity.get(new URI("/bang")) @@ -133,7 +130,7 @@ public class MvcRestApplicationTests { } @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 { ResponseEntity result = this.rest.exchange( RequestEntity.post(new URI("/updates")).body("one\ntwo"), String.class); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/scan/ComponentTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/scan/ComponentTests.java index 004aab86c..a96ee2dad 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/scan/ComponentTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/scan/ComponentTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.scan; import java.net.URI; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ComponentTests { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ExplicitNonFunctionalTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ExplicitNonFunctionalTests.java index 9365ed035..a25046754 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ExplicitNonFunctionalTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ExplicitNonFunctionalTests.java @@ -18,8 +18,7 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; 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.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest({ "spring.main.web-application-type=REACTIVE", "spring.functional.enabled=false" }) @AutoConfigureWebTestClient diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java index d1594e7a6..a75d0806d 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java @@ -20,10 +20,9 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; @@ -39,7 +38,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -48,7 +46,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * @author Oleg Zhurakousky */ -@RunWith(SpringRunner.class) @FunctionalSpringBootTest(classes = ApplicationConfiguration.class, webEnvironment = WebEnvironment.NONE, properties = { "spring.main.web-application-type=none", "spring.cloud.function.web.export.sink.url=http://localhost:${my.port}", @@ -67,7 +64,7 @@ public class FunctionalExporterTests { private static Map headers = new HashMap<>(); - @BeforeClass + @BeforeAll public static void init() throws Exception { headers.clear(); String port = "" + SocketUtils.findAvailableTcpPort(); @@ -80,7 +77,7 @@ public class FunctionalExporterTests { Thread.sleep(500L); } - @AfterClass + @AfterAll public static void close() { headers.clear(); System.clearProperty("server.port"); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalTests.java index d6c605839..00883f4c8 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalTests.java @@ -18,22 +18,19 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Dave Syer * */ -@RunWith(SpringRunner.class) // Only need web-application-type because MVC is on the classpath @FunctionalSpringBootTest("spring.main.web-application-type=reactive") @AutoConfigureWebTestClient diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java index 645adec33..d30b7df71 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputListTests.java @@ -20,22 +20,19 @@ import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Dave Syer * */ -@RunWith(SpringRunner.class) @FunctionalSpringBootTest("spring.main.web-application-type=reactive") @AutoConfigureWebTestClient public class FunctionalWithInputListTests { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java index 69c33009e..60c34f50f 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalWithInputSetTests.java @@ -20,15 +20,13 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import static org.assertj.core.api.Assertions.assertThat; @@ -37,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @FunctionalSpringBootTest("spring.main.web-application-type=reactive") @AutoConfigureWebTestClient public class FunctionalWithInputSetTests { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/HeadersToMessageTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/HeadersToMessageTests.java index 926fc426e..1d77b1417 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/HeadersToMessageTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/HeadersToMessageTests.java @@ -18,8 +18,7 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; 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.messaging.Message; import org.springframework.messaging.support.MessageBuilder; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) // Only need web-application-type because MVC is on the classpath @FunctionalSpringBootTest("spring.main.web-application-type=reactive") @AutoConfigureWebTestClient diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ImplicitNonFunctionalTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ImplicitNonFunctionalTests.java index 202c0dce4..28e067430 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ImplicitNonFunctionalTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/ImplicitNonFunctionalTests.java @@ -18,8 +18,7 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; 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.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest("spring.main.web-application-type=REACTIVE") @AutoConfigureWebTestClient @DirtiesContext diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/MoreThenOneFunctionRootMappingTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/MoreThenOneFunctionRootMappingTests.java index 14b14e4a7..1482024c5 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/MoreThenOneFunctionRootMappingTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/MoreThenOneFunctionRootMappingTests.java @@ -18,8 +18,7 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; 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.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) @SpringBootTest({ "spring.main.web-application-type=REACTIVE", "spring.functional.enabled=false", "spring.cloud.function.definition=uppercase|reverse" }) @@ -48,7 +45,7 @@ public class MoreThenOneFunctionRootMappingTests { private WebTestClient client; @Test - public void words() throws Exception { + public void words() { this.client.post().uri("/").body(Mono.just("star"), String.class).exchange() .expectStatus().isOk().expectBody(String.class).isEqualTo("RATS"); } @@ -59,7 +56,7 @@ public class MoreThenOneFunctionRootMappingTests { @Bean public Function uppercase() { - return v -> v.toUpperCase(); + return String::toUpperCase; } @Bean diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/PojoTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/PojoTests.java index ee9f16f2b..b622e8a0f 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/PojoTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/PojoTests.java @@ -18,22 +18,19 @@ package org.springframework.cloud.function.test; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.cloud.function.context.test.FunctionalSpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author Dave Syer * */ -@RunWith(SpringRunner.class) // Only need web-application-type because MVC is on the classpath @FunctionalSpringBootTest("spring.main.web-application-type=reactive") @AutoConfigureWebTestClient diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HeadersToMessageTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HeadersToMessageTests.java index b065076d7..8f72efed5 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HeadersToMessageTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HeadersToMessageTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux; import java.net.URI; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -36,7 +35,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -45,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.function.web.path=/functions", "spring.main.web-application-type=reactive" }) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpGetIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpGetIntegrationTests.java index 65b951c5f..f184f6585 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpGetIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpGetIntegrationTests.java @@ -27,9 +27,8 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; @@ -57,7 +55,6 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) public class HttpGetIntegrationTests { @@ -73,7 +70,7 @@ public class HttpGetIntegrationTests { @Autowired private ApplicationConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java index 02f88d286..01cbe48ae 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/HttpPostIntegrationTests.java @@ -26,10 +26,9 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -52,7 +51,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -63,7 +61,6 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) public class HttpPostIntegrationTests { @@ -79,7 +76,7 @@ public class HttpPostIntegrationTests { @Autowired private ApplicationConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } @@ -182,7 +179,7 @@ public class HttpPostIntegrationTests { } @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 { ResponseEntity result = this.rest.exchange( RequestEntity.post(new URI("/uppercase")) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/PrefixTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/PrefixTests.java index 55a7041b7..2f56b8a47 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/PrefixTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/PrefixTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux; import java.net.URI; import java.util.function.Supplier; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -44,7 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.main.web-application-type=reactive", "spring.cloud.function.web.path=/functions", "debug" }) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/SingletonTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/SingletonTests.java index e9ec552e8..1631c362f 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/SingletonTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/flux/SingletonTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.flux; import java.net.URI; import java.util.function.Supplier; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.beans.BeansException; @@ -41,7 +40,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +47,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) public class SingletonTests { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java index fb4614ad9..157471647 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerMVCTests.java @@ -19,9 +19,9 @@ package org.springframework.cloud.function.web.function; import java.net.URI; import java.util.function.Function; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -40,13 +40,13 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class FunctionEndpointInitializerMVCTests { - @Before + @BeforeEach public void init() throws Exception { String port = "" + SocketUtils.findAvailableTcpPort(); System.setProperty("server.port", port); } - @After + @AfterEach public void close() throws Exception { System.clearProperty("server.port"); } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java index 11a3d1f1b..cc6295ff0 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java @@ -20,9 +20,9 @@ import java.net.URI; import java.util.function.Function; import java.util.function.Supplier; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.web.client.TestRestTemplate; @@ -45,13 +45,13 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class FunctionEndpointInitializerTests { - @Before + @BeforeEach public void init() throws Exception { String port = "" + SocketUtils.findAvailableTcpPort(); System.setProperty("server.port", port); } - @After + @AfterEach public void close() throws Exception { System.clearProperty("server.port"); } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java index b971720f2..ac30ea91c 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/UserSubmittedTests.java @@ -19,9 +19,9 @@ package org.springframework.cloud.function.web.function; import java.net.URI; import java.util.function.Function; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -41,13 +41,13 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class UserSubmittedTests { - @Before + @BeforeEach public void init() throws Exception { String port = "" + SocketUtils.findAvailableTcpPort(); System.setProperty("server.port", port); } - @After + @AfterEach public void close() throws Exception { System.clearProperty("server.port"); } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/DefaultRouteTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/DefaultRouteTests.java index d039a19ae..aabae5e22 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/DefaultRouteTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/DefaultRouteTests.java @@ -19,9 +19,8 @@ package org.springframework.cloud.function.web.mvc; import java.net.URI; import java.util.function.Function; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -45,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "") @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) public class DefaultRouteTests { @@ -57,7 +54,7 @@ public class DefaultRouteTests { private TestRestTemplate rest; @Test - @Ignore("FIXME") + @Disabled("FIXME") public void explicit() throws Exception { ResponseEntity result = this.rest.exchange( RequestEntity.post(new URI("/uppercase")).body("foo"), String.class); @@ -66,7 +63,7 @@ public class DefaultRouteTests { } @Test - @Ignore("FIXME") + @Disabled("FIXME") public void implicit() throws Exception { ResponseEntity result = this.rest .exchange(RequestEntity.post(new URI("/")).body("foo"), String.class); diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HeadersToMessageTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HeadersToMessageTests.java index f252c5d0a..14c264aee 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HeadersToMessageTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HeadersToMessageTests.java @@ -21,8 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -38,7 +37,6 @@ import org.springframework.http.RequestEntity; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -46,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.main.web-application-type=servlet", "spring.cloud.function.web.path=/functions" }) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpGetIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpGetIntegrationTests.java index b59144c48..53a3de7b8 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpGetIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpGetIntegrationTests.java @@ -27,10 +27,9 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; @@ -58,7 +56,6 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) public class HttpGetIntegrationTests { @@ -74,7 +71,7 @@ public class HttpGetIntegrationTests { @Autowired private ApplicationConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } @@ -101,7 +98,7 @@ public class HttpGetIntegrationTests { } @Test - @Ignore("Fix error handling") + @Disabled("Fix error handling") public void errorJson() throws Exception { assertThat(this.rest .exchange(RequestEntity.get(new URI("/bang")) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java index 96707f60a..61e6dda65 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/HttpPostIntegrationTests.java @@ -26,10 +26,9 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -52,7 +51,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; @@ -62,7 +60,6 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=servlet") @ContextConfiguration(classes = { RestApplication.class, ApplicationConfiguration.class }) public class HttpPostIntegrationTests { @@ -78,13 +75,13 @@ public class HttpPostIntegrationTests { @Autowired private ApplicationConfiguration test; - @Before + @BeforeEach public void init() { this.test.list.clear(); } @Test - @Ignore + @Disabled public void qualifierFoos() throws Exception { ResponseEntity result = this.rest.exchange(RequestEntity .post(new URI("/foos")).contentType(MediaType.APPLICATION_JSON) @@ -177,7 +174,7 @@ public class HttpPostIntegrationTests { } @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 { ResponseEntity result = this.rest.exchange( RequestEntity.post(new URI("/uppercase")) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java index 40a87ff6b..26f4179c7 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/PrefixTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.mvc; import java.net.URI; import java.util.function.Supplier; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.WebEnvironment; 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.mvc.PrefixTests.TestConfiguration; import org.springframework.context.annotation.Bean; @@ -36,7 +34,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -44,16 +41,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.main.web-application-type=servlet", "spring.cloud.function.web.path=/functions" }) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) public class PrefixTests { - @LocalServerPort - private int port; - @Autowired private TestRestTemplate rest; diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java index b55c49257..9df178778 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java @@ -21,9 +21,8 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -53,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "spring.main.web-application-type=servlet", "spring.cloud.function.web.path=/functions", @@ -134,7 +131,7 @@ public class RoutingFunctionTests { @Test @DirtiesContext - @Ignore + @Disabled public void testFluxConsumer() throws Exception { ResponseEntity postForEntity = this.rest .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) @@ -148,7 +145,7 @@ public class RoutingFunctionTests { @Test @DirtiesContext - @Ignore + @Disabled public void testFunctionPojo() throws Exception { ResponseEntity postForEntity = this.rest .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) @@ -161,7 +158,7 @@ public class RoutingFunctionTests { @Test @DirtiesContext - @Ignore + @Disabled public void testConsumerMessage() throws Exception { ResponseEntity postForEntity = this.rest .exchange(RequestEntity.post(new URI("/functions/" + RoutingFunction.FUNCTION_NAME)) diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/SingletonTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/SingletonTests.java index 191a1388a..5636d5171 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/SingletonTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/SingletonTests.java @@ -19,8 +19,7 @@ package org.springframework.cloud.function.web.mvc; import java.net.URI; import java.util.function.Supplier; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; 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.WebEnvironment; 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.mvc.SingletonTests.TestConfiguration; import org.springframework.context.annotation.Bean; @@ -41,7 +39,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -49,14 +46,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @ContextConfiguration(classes = { RestApplication.class, TestConfiguration.class }) public class SingletonTests { - @LocalServerPort - private int port; - @Autowired private TestRestTemplate rest; diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java index f7709cbd5..65a5e5473 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java @@ -24,10 +24,9 @@ import java.util.function.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.context.annotation.Bean; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -51,7 +49,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = { RestConfiguration.class, ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = { "spring.cloud.function.web.export.sink.url=http://localhost:${server.port}", @@ -67,12 +64,12 @@ public class FunctionAutoConfigurationIntegrationTests { @Autowired private RestConfiguration app; - @BeforeClass + @BeforeAll public static void init() { System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); } - @AfterClass + @AfterAll public static void close() { System.clearProperty("server.port"); } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java index 82f25dd86..37879c361 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java @@ -22,11 +22,10 @@ import java.util.function.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.context.annotation.Bean; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -50,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = { RestConfiguration.class, ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = { @@ -66,18 +63,18 @@ public class FunctionAutoConfigurationWithRetriesIntegrationTests { @Autowired private RestConfiguration app; - @BeforeClass + @BeforeAll public static void init() { System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); } - @AfterClass + @AfterAll public static void close() { System.clearProperty("server.port"); } @Test - @Ignore + @Disabled public void copiesMessages() throws Exception { int count = 0; while (this.forwarder.isRunning() && count++ < 30) { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/SourceAutoConfigurationIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/SourceAutoConfigurationIntegrationTests.java index 314e14bd7..600bc728c 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/SourceAutoConfigurationIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/SourceAutoConfigurationIntegrationTests.java @@ -18,9 +18,8 @@ package org.springframework.cloud.function.web.source; import java.util.function.Supplier; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.context.annotation.Bean; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -38,19 +36,18 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) // @formatter:off @SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = "spring.cloud.function.web.export.sink.url=https://nosuchhost") // @formatter:on @ContextConfiguration(classes = { ApplicationConfiguration.class }) +@Disabled public class SourceAutoConfigurationIntegrationTests { @Autowired private SupplierExporter forwarder; @Test - @Ignore public void fails() throws Exception { int count = 0; while (this.forwarder.isRunning() && count++ < 1000) { diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java index 05084c9e2..c14098106 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java @@ -24,11 +24,10 @@ import java.util.function.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.source.WebAppIntegrationTests.ApplicationConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -50,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = { RestApplication.class, ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = { "spring.main.web-application-type=reactive", @@ -67,18 +64,18 @@ public class WebAppIntegrationTests { @Autowired private ApplicationConfiguration app; - @BeforeClass + @BeforeAll public static void init() { System.setProperty("server.port", "" + SocketUtils.findAvailableTcpPort()); } - @AfterClass + @AfterAll public static void close() { System.clearProperty("server.port"); } @Test - @Ignore + @Disabled public void posts() throws Exception { this.forwarder.start(); this.app.latch.await(10, TimeUnit.SECONDS);