Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rely on auto-boxing in tests

Browse Source
This commit is contained in:
Sam Brannen
2023-07-12 11:29:57 +02:00
parent 1edc0d8002
commit 68f2b0ca59
32 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
View File

@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
* @author Mingyuan Wu
*/
public abstract class AbstractDatabaseClientIntegrationTests {
abstract class AbstractDatabaseClientIntegrationTests {
private ConnectionFactory connectionFactory;
@@ -88,10 +88,8 @@ public abstract class AbstractDatabaseClientIntegrationTests {
.map(row -> row.get("id"))
.first()
.as(StepVerifier::create)
.assertNext(actual -> {
assertThat(actual).isInstanceOf(Number.class);
assertThat(((Number) actual).intValue()).isEqualTo(42055);
}).verifyComplete();
.assertNext(actual -> assertThat(actual).isInstanceOf(Number.class).isEqualTo(42055))
.verifyComplete();
}
@Test

6
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
View File

@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
* @author Christoph Strobl
*/
public abstract class AbstractTransactionalDatabaseClientIntegrationTests {
abstract class AbstractTransactionalDatabaseClientIntegrationTests {
private ConnectionFactory connectionFactory;
@@ -184,8 +184,8 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests {
}
private Condition<? super Object> numberOf(int expected) {
return new Condition<>(object -> object instanceof Number &&
((Number) object).intValue() == expected, "Number %d", expected);
return new Condition<>(object -> object instanceof Number num &&
num.intValue() == expected, "Number %d", expected);
}

13
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/H2DatabaseClientIntegrationTests.java
View File

@@ -26,12 +26,13 @@ import io.r2dbc.spi.ConnectionFactory;
*/
public class H2DatabaseClientIntegrationTests extends AbstractDatabaseClientIntegrationTests {
public static String CREATE_TABLE_LEGOSET = "CREATE TABLE legoset (\n" //
+ " id serial CONSTRAINT id PRIMARY KEY,\n" //
+ " version integer NULL,\n" //
+ " name varchar(255) NOT NULL,\n" //
+ " manual integer NULL\n" //
+ ");";
private static final String CREATE_TABLE_LEGOSET = """
CREATE TABLE legoset (
id serial CONSTRAINT id PRIMARY KEY,
version integer NULL,
name varchar(255) NOT NULL,
manual integer NULL
);""";
@Override
protected ConnectionFactory createConnectionFactory() {

13
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/H2TransactionalDatabaseClientIntegrationTests.java
View File

@@ -26,12 +26,13 @@ import io.r2dbc.spi.ConnectionFactory;
*/
public class H2TransactionalDatabaseClientIntegrationTests extends AbstractTransactionalDatabaseClientIntegrationTests {
public static String CREATE_TABLE_LEGOSET = "CREATE TABLE legoset (\n" //
+ " id integer CONSTRAINT id PRIMARY KEY,\n" //
+ " version integer NULL,\n" //
+ " name varchar(255) NOT NULL,\n" //
+ " manual integer NULL\n" //
+ ");";
private static final String CREATE_TABLE_LEGOSET = """
CREATE TABLE legoset (
id serial CONSTRAINT id PRIMARY KEY,
version integer NULL,
name varchar(255) NOT NULL,
manual integer NULL
);""";
@Override
protected ConnectionFactory createConnectionFactory() {