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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
This commit is contained in:
Juergen Hoeller
2023-09-13 17:28:54 +02:00
parent 5bcbcb3049 659500bc1f
commit 550f05c9dc
5 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,15 +66,17 @@ public class JdbcTemplateQueryTests {
@BeforeEach
public void setUp() throws Exception {
public void setup() throws Exception {
given(this.dataSource.getConnection()).willReturn(this.connection);
given(this.connection.createStatement()).willReturn(this.statement);
given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
given(this.statement.getConnection()).willReturn(this.connection);
given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
given(this.preparedStatement.getConnection()).willReturn(this.connection);
given(this.preparedStatement.executeQuery()).willReturn(this.resultSet);
given(this.resultSet.getMetaData()).willReturn(this.resultSetMetaData);
given(this.resultSetMetaData.getColumnCount()).willReturn(1);
given(this.resultSetMetaData.getColumnLabel(1)).willReturn("age");
given(this.connection.createStatement()).willReturn(this.statement);
given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
given(this.preparedStatement.executeQuery()).willReturn(this.resultSet);
given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
}
@@ -89,6 +91,7 @@ public class JdbcTemplateQueryTests {
assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -99,6 +102,7 @@ public class JdbcTemplateQueryTests {
assertThat(li).as("All rows returned").isEmpty();
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -111,6 +115,7 @@ public class JdbcTemplateQueryTests {
assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -123,6 +128,7 @@ public class JdbcTemplateQueryTests {
assertThat(li.get(0)).as("Element is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -134,6 +140,7 @@ public class JdbcTemplateQueryTests {
assertThat((Integer) map.get("age")).as("Wow is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -145,6 +152,7 @@ public class JdbcTemplateQueryTests {
this.template.queryForObject(sql, String.class));
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -156,6 +164,7 @@ public class JdbcTemplateQueryTests {
assertThat(o).as("Correct result type").isInstanceOf(Integer.class);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -173,6 +182,7 @@ public class JdbcTemplateQueryTests {
assertThat(count.get()).isEqualTo(1);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -183,6 +193,7 @@ public class JdbcTemplateQueryTests {
assertThat(this.template.queryForObject(sql, String.class)).isEqualTo("myvalue");
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -193,6 +204,7 @@ public class JdbcTemplateQueryTests {
assertThat(this.template.queryForObject(sql, BigInteger.class)).isEqualTo(new BigInteger("22"));
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -203,6 +215,7 @@ public class JdbcTemplateQueryTests {
assertThat(this.template.queryForObject(sql, BigDecimal.class)).isEqualTo(new BigDecimal("22.5"));
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -213,6 +226,7 @@ public class JdbcTemplateQueryTests {
assertThat(this.template.queryForObject(sql, Integer.class)).isEqualTo(Integer.valueOf(22));
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -224,6 +238,7 @@ public class JdbcTemplateQueryTests {
assertThat(this.template.queryForObject(sql, Integer.class)).isNull();
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -235,6 +250,7 @@ public class JdbcTemplateQueryTests {
assertThat(i).as("Return of an int").isEqualTo(22);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -246,6 +262,7 @@ public class JdbcTemplateQueryTests {
assertThat(i).as("Return of an int").isEqualTo(22);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -257,6 +274,7 @@ public class JdbcTemplateQueryTests {
assertThat(l).as("Return of a long").isEqualTo(87);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -268,6 +286,7 @@ public class JdbcTemplateQueryTests {
assertThat(l).as("Return of a long").isEqualTo(87);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
}
@Test
@@ -290,6 +309,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -301,6 +321,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -314,6 +335,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -327,6 +349,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -339,6 +362,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -351,6 +375,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -369,6 +394,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -381,6 +407,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -393,6 +420,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
@Test
@@ -405,6 +433,7 @@ public class JdbcTemplateQueryTests {
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();
verify(this.connection).close();
}
}

6
spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
View File

@@ -94,12 +94,12 @@ public class JdbcTemplateTests {
public void setup() throws Exception {
given(this.dataSource.getConnection()).willReturn(this.connection);
given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
given(this.connection.prepareCall(anyString())).willReturn(this.callableStatement);
given(this.statement.getConnection()).willReturn(this.connection);
given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
given(this.preparedStatement.executeQuery()).willReturn(this.resultSet);
given(this.preparedStatement.executeQuery(anyString())).willReturn(this.resultSet);
given(this.preparedStatement.getConnection()).willReturn(this.connection);
given(this.statement.getConnection()).willReturn(this.connection);
given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
given(this.connection.prepareCall(anyString())).willReturn(this.callableStatement);
given(this.callableStatement.getResultSet()).willReturn(this.resultSet);
}