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

GH-1261 Fix assertioins to use AssertJ

Browse Source 
Resolves #1261
This commit is contained in:
Oleg Zhurakousky
2025-04-10 17:58:49 +02:00
parent 7ea40b0f5d
commit 0eb498ffbf
7 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ import com.amazonaws.services.lambda.runtime.events.SNSEvent;
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -65,7 +66,6 @@ import org.springframework.util.MimeType;
import org.springframework.util.StreamUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
/**
*
@@ -1506,7 +1506,7 @@ public class FunctionInvokerTests {
try {
invoker.handleRequest(targetStream, output, null);
fail();
Assertions.fail();
}
catch (Exception e) {
// TODO: handle exception

6
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/test/java/org/springframework/cloud/function/serverless/web/AsyncStartTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.function.serverless.web;
import jakarta.servlet.http.HttpServletRequest;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -25,7 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
/**
* @author Oleg Zhurakousky
@@ -55,7 +57,7 @@ public class AsyncStartTests {
ServerlessHttpServletResponse response = new ServerlessHttpServletResponse();
try {
mvc.service(request, response);
fail();
Assertions.fail();
}
catch (Exception e) {
assertThat(e).isInstanceOf(IllegalStateException.class);

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java
View File

@@ -166,6 +166,8 @@ public final class FunctionTypeUtils {
* @return instance of {@link Class} as raw representation of the provided {@link Type}
*/
public static Class<?> getRawType(Type type) {
// ((WildcardType) type).getUpperBounds();
// Class cazz = ResolvableType.forType(type).getRawClass();
if (type instanceof WildcardType) {
return Object.class;
}

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

@@ -43,7 +43,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -433,9 +433,13 @@ public class BeanFactoryAwareFunctionRegistryTests {
public void testReactiveFunctionWithImperativeInputAndOutputFail() {
FunctionCatalog catalog = this.configureCatalog();
Function<String, String> reverse = catalog.lookup("reverseFlux");
Assertions.assertThrows(ClassCastException.class, () -> {
try {
String result = reverse.apply("reverseFlux");
});
Assertions.fail();
}
catch (ClassCastException e) {
// ignore
}
}
@Test

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

@@ -41,7 +41,7 @@ import java.util.stream.IntStream;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.protobuf.StringValue;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -491,7 +491,8 @@ public class SimpleFunctionRegistryTests {
.build()
));
Assertions.assertIterableEquals(result.blockFirst(), Arrays.asList("item1", "item2"));
List<String> blockFirst = result.blockFirst();
Assertions.assertThatIterable(blockFirst).isEqualTo(Arrays.asList("item1", "item2"));
}
@SuppressWarnings({ "rawtypes", "unchecked" })

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

@@ -27,8 +27,8 @@ import java.util.function.Function;
import java.util.function.Supplier;
import com.google.gson.Gson;
import org.assertj.core.api.Assertions;
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;
@@ -116,14 +116,13 @@ public class ContextFunctionCatalogInitializerTests {
@Test
public void missingType() {
Assertions.assertThrows(BeanCreationException.class, () -> {
try {
create(MissingTypeConfiguration.class);
assertThat(this.context.getBean("function"))
.isInstanceOf(FunctionRegistration.class);
assertThat((Function<?, ?>) this.catalog.lookup(Function.class, "function"))
.isInstanceOf(Function.class);
// TODO: support for type inference from functional bean registrations
});
Assertions.fail();
}
catch (BeanCreationException e) {
// ignore, the test call must fail
}
}
@Test

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

@@ -21,8 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
@@ -43,7 +43,6 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
/**
*
@@ -83,7 +82,7 @@ public class RoutingFunctionTests {
assertThat(function).isNotNull();
try {
function.apply(message);
fail();
Assertions.fail();
}
catch (Exception e) {
// Good
@@ -207,7 +206,7 @@ public class RoutingFunctionTests {
.build();
try {
function.apply(message);
fail();
Assertions.fail();
}
catch (Exception e) {
assertThat(e.getMessage()).isEqualTo("EL1005E: Type cannot be found 'java.lang.Runtime'");