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

Merge branch '6.0.x'

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

2
spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
View File

@@ -115,7 +115,7 @@ public class InitializeDatabaseIntegrationTests {
private void assertCorrectSetup(DataSource dataSource) {
JdbcTemplate jt = new JdbcTemplate(dataSource);
assertThat(jt.queryForObject("select count(*) from T_TEST", Integer.class).intValue()).isEqualTo(1);
assertThat(jt.queryForObject("select count(*) from T_TEST", Integer.class)).isEqualTo(1);
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
View File

@@ -172,7 +172,7 @@ class JdbcNamespaceIntegrationTests {
}
private void assertNumRowsInTestTable(JdbcTemplate template, int count) {
assertThat(template.queryForObject("select count(*) from T_TEST", Integer.class).intValue()).isEqualTo(count);
assertThat(template.queryForObject("select count(*) from T_TEST", Integer.class)).isEqualTo(count);
}
private void assertCorrectSetup(String file, String... dataSources) {

20
spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
View File

@@ -85,8 +85,8 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getObject(1)).willReturn(11, 12);
List<Map<String, Object>> li = this.template.queryForList(sql);
assertThat(li).as("All rows returned").hasSize(2);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(1).get("age")).intValue()).as("Second row is Integer").isEqualTo(12);
assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12);
verify(this.resultSet).close();
verify(this.statement).close();
}
@@ -108,7 +108,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getObject(1)).willReturn(11);
List<Map<String, Object>> li = this.template.queryForList(sql);
assertThat(li).as("All rows returned").hasSize(1);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
}
@@ -120,7 +120,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getInt(1)).willReturn(11);
List<Integer> li = this.template.queryForList(sql, Integer.class);
assertThat(li).as("All rows returned").hasSize(1);
assertThat(li.get(0).intValue()).as("Element is Integer").isEqualTo(11);
assertThat(li.get(0)).as("Element is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
}
@@ -131,7 +131,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.next()).willReturn(true, false);
given(this.resultSet.getObject(1)).willReturn(11);
Map<String, Object> map = this.template.queryForMap(sql);
assertThat(((Integer) map.get("age")).intValue()).as("Wow is Integer").isEqualTo(11);
assertThat((Integer) map.get("age")).as("Wow is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
}
@@ -285,8 +285,8 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getObject(1)).willReturn(11, 12);
List<Map<String, Object>> li = this.template.queryForList(sql, 3);
assertThat(li).as("All rows returned").hasSize(2);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(1).get("age")).intValue()).as("Second row is Integer").isEqualTo(12);
assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12);
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
@@ -310,7 +310,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getObject(1)).willReturn(11);
List<Map<String, Object>> li = this.template.queryForList(sql, 3);
assertThat(li).as("All rows returned").hasSize(1);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11);
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
@@ -323,7 +323,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.getInt(1)).willReturn(11);
List<Integer> li = this.template.queryForList(sql, Integer.class, 3);
assertThat(li).as("All rows returned").hasSize(1);
assertThat(li.get(0).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(li.get(0)).as("First row is Integer").isEqualTo(11);
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
@@ -335,7 +335,7 @@ public class JdbcTemplateQueryTests {
given(this.resultSet.next()).willReturn(true, false);
given(this.resultSet.getObject(1)).willReturn(11);
Map<String, Object> map = this.template.queryForMap(sql, 3);
assertThat(((Integer) map.get("age")).intValue()).as("Row is Integer").isEqualTo(11);
assertThat(((Integer) map.get("age"))).as("Row is Integer").isEqualTo(11);
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();

10
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
View File

@@ -90,8 +90,8 @@ public class NamedParameterQueryTests {
"SELECT AGE FROM CUSTMR WHERE ID < :id", params);
assertThat(li.size()).as("All rows returned").isEqualTo(2);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(((Integer) li.get(1).get("age")).intValue()).as("Second row is Integer").isEqualTo(12);
assertThat(li.get(0).get("age")).as("First row is Integer").isEqualTo(11);
assertThat(li.get(1).get("age")).as("Second row is Integer").isEqualTo(12);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
@@ -123,7 +123,7 @@ public class NamedParameterQueryTests {
"SELECT AGE FROM CUSTMR WHERE ID < :id", params);
assertThat(li.size()).as("All rows returned").isEqualTo(1);
assertThat(((Integer) li.get(0).get("age")).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(li.get(0).get("age")).as("First row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
}
@@ -141,7 +141,7 @@ public class NamedParameterQueryTests {
params, Integer.class);
assertThat(li.size()).as("All rows returned").isEqualTo(1);
assertThat(li.get(0).intValue()).as("First row is Integer").isEqualTo(11);
assertThat(li.get(0)).as("First row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
}
@@ -156,7 +156,7 @@ public class NamedParameterQueryTests {
params.addValue("id", 3);
Map<String, Object> map = template.queryForMap("SELECT AGE FROM CUSTMR WHERE ID < :id", params);
assertThat(((Integer) map.get("age")).intValue()).as("Row is Integer").isEqualTo(11);
assertThat(map.get("age")).as("Row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
View File

@@ -173,7 +173,7 @@ public class EmbeddedDatabaseBuilderTests {
}
private void assertNumRowsInTestTable(JdbcTemplate template, int count) {
assertThat(template.queryForObject("select count(*) from T_TEST", Integer.class).intValue()).isEqualTo(count);
assertThat(template.queryForObject("select count(*) from T_TEST", Integer.class)).isEqualTo(count);
}
private void assertDatabaseCreated(EmbeddedDatabase db) {

8
spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.jdbc.object;
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.Types;
import java.util.HashMap;
import java.util.Map;
import javax.sql.DataSource;
@@ -60,12 +59,9 @@ public class GenericStoredProcedureTests {
given(connection.prepareCall("{call " + "add_invoice" + "(?, ?, ?)}")).willReturn(callableStatement);
StoredProcedure adder = (StoredProcedure) bf.getBean("genericProcedure");
Map<String, Object> in = new HashMap<>(2);
in.put("amount", 1106);
in.put("custid", 3);
Map<String, Object> in = Map.of("amount", 1106, "custid", 3);
Map<String, Object> out = adder.execute(in);
Integer id = (Integer) out.get("newid");
assertThat(id.intValue()).isEqualTo(4);
assertThat(out.get("newid")).isEqualTo(4);
verify(callableStatement).setObject(1, 1106, Types.INTEGER);
verify(callableStatement).setObject(2, 3, Types.INTEGER);

2
spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
View File

@@ -221,7 +221,7 @@ public class SqlUpdateTests {
assertThat(rowsAffected).isEqualTo(1);
assertThat(generatedKeyHolder.getKeyList()).hasSize(1);
assertThat(generatedKeyHolder.getKey().intValue()).isEqualTo(11);
assertThat(generatedKeyHolder.getKey()).isEqualTo(11);
verify(preparedStatement).setString(1, "rod");
verify(resultSet).close();
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
View File

@@ -325,7 +325,7 @@ public class StoredProcedureTests {
assertThat(m2.get("eggs")).isEqualTo("Eggs");
Number n = (Number) res.get("#update-count-1");
assertThat(n.intValue()).as("wrong update count").isEqualTo(0);
assertThat(n).as("wrong update count").isEqualTo(0);
verify(resultSet1).close();
verify(resultSet2).close();
}