spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Polish TableMetaDataContextTests

Browse Source 
See gh-37014
This commit is contained in:
Sam Brannen
2026-09-07 10:48:19 +02:00
parent e06482ad51
commit 2028c54d01
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
+13 -14
View File
@@ -42,19 +42,19 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* Mock object based tests for TableMetaDataContext.
* Mock object based tests for {@link TableMetaDataContext}.
*
* @author Thomas Risberg
*/
class TableMetaDataContextTests {
private DataSource dataSource = mock();
private final DataSource dataSource = mock();
private Connection connection = mock();
private final Connection connection = mock();
private DatabaseMetaData databaseMetaData = mock();
private final DatabaseMetaData databaseMetaData = mock();
private TableMetaDataContext context = new TableMetaDataContext();
private final TableMetaDataContext context = new TableMetaDataContext();
@BeforeEach
@@ -141,7 +141,7 @@ class TableMetaDataContextTests {
given(databaseMetaData.getColumns(null, USER, TABLE, null)).willReturn(columnsResultSet);
MapSqlParameterSource map = new MapSqlParameterSource();
String[] keyCols = new String[] { "id" };
String[] keyCols = { "id" };
context.setTableName(TABLE);
context.processMetaData(dataSource, new ArrayList<>(), keyCols);
List<Object> values = context.matchInParameterValuesWithInsertColumns(map);
@@ -155,34 +155,32 @@ class TableMetaDataContextTests {
verify(columnsResultSet).close();
}
@Test
@Test // gh-37014
void overlappingDeclaredAndGeneratedKeyColumnsAreRejected() throws Exception {
initializeTwoColumnCustomersTable();
context.setTableName("customers");
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
.isThrownBy(() -> context.processMetaData(
dataSource, List.of("id", "name"), new String[] { "id" }))
.isThrownBy(() -> context.processMetaData(dataSource, List.of("id", "name"), new String[] { "id" }))
.withMessage("Declared columns [id] must not overlap with generated key columns");
}
@Test
@Test // gh-37014
void overlappingDeclaredAndGeneratedKeyColumnsAreRejectedRegardlessOfCase() throws Exception {
initializeTwoColumnCustomersTable();
context.setTableName("customers");
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
.isThrownBy(() -> context.processMetaData(
dataSource, List.of("ID", "name"), new String[] { "id" }))
.isThrownBy(() -> context.processMetaData(dataSource, List.of("ID", "name"), new String[] { "id" }))
.withMessage("Declared columns [ID] must not overlap with generated key columns");
}
@Test
@Test // gh-37014
void declaredColumnsWithoutOverlapAreUsedAsIs() throws Exception {
initializeTwoColumnCustomersTable();
MapSqlParameterSource map = new MapSqlParameterSource();
map.addValue("name", "Sven");
String[] keyCols = new String[] { "id" };
String[] keyCols = { "id" };
context.setTableName("customers");
context.processMetaData(dataSource, List.of("name"), keyCols);
List<Object> values = context.matchInParameterValuesWithInsertColumns(map);
@@ -192,6 +190,7 @@ class TableMetaDataContextTests {
assertThat(values).containsExactly("Sven");
}
private void initializeTwoColumnCustomersTable() throws Exception {
ResultSet metaDataResultSet = mock();
given(metaDataResultSet.next()).willReturn(true, false);