Skip to content

Commit

Permalink
Update to Spring Boot 3.3.0-M1
Browse files Browse the repository at this point in the history
This commit updates the spring-boot-dependencies version to `3.3.0-M1`.

This update also transitively updates the AssertJ core library to
version `3.25.1` which introduces a deprecation for
`AbstractAssert#toList`. As such, these deprecated usages are replaced
in several tests with `AbstractAssert#asInstanceOf`.

Resolves #10
  • Loading branch information
onobc authored Feb 5, 2024
1 parent c22404c commit de65597
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 21 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
springBootVersion = '3.2.2'
springBootVersion = '3.3.0-M1'
springCloudVersion = '2023.0.0'
springCloudAwsVersion = '3.0.4'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@
package org.springframework.cloud.fn.aggregator;

import java.time.Duration;
import java.util.List;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
Expand Down Expand Up @@ -60,11 +60,8 @@ public void test() {

output.as(StepVerifier::create)
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(1)
.element(0)
.isEqualTo("foo"))
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsExactly("foo"))
.thenCancel()
.verify(Duration.ofSeconds(10));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.time.Duration;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
Expand Down Expand Up @@ -57,9 +58,8 @@ public void test() {
output.log("DefaultAggregatorTests:output")
.as(StepVerifier::create)
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.asList()
.hasSize(2)
.contains("1", "2"))
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsExactlyInAnyOrder("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(30));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2022 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,6 +19,7 @@
import java.time.Duration;
import java.util.List;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
Expand Down Expand Up @@ -57,9 +58,8 @@ public void test() {
output.as(StepVerifier::create)
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsExactlyInAnyOrder("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(10));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 the original author or authors.
* Copyright 2020-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,8 +19,8 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.time.Duration;
import java.util.List;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
Expand Down Expand Up @@ -70,10 +70,8 @@ public void test() {

output.as(StepVerifier::create)
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsExactlyInAnyOrder("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(10));

Expand Down

0 comments on commit de65597

Please sign in to comment.