root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Improve test coverage of RdbmsOperation" 

See gh-28472
This commit is contained in:
Stephane Nicoll 2022-07-29 17:32:26 +02:00
parent 608be54a58
commit f9ee8a93ad
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,7 +31,6 @@ import org.springframework.jdbc.core.SqlOutParameter;
import org.springframework.jdbc.core.SqlParameter; import org.springframework.jdbc.core.SqlParameter;
import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.DriverManagerDataSource;
import static java.util.Map.entry;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@ -51,14 +50,6 @@ public class RdbmsOperationTests {
operation::compile); operation::compile);
} }
@Test
public void getSql() {
String sql = "select * from mytable";
operation.setDataSource(new DriverManagerDataSource());
operation.setSql(sql);
String strGotten = operation.getSql();
assertThat(strGotten.equals(sql));
}
@Test @Test
public void setTypeAfterCompile() { public void setTypeAfterCompile() {
operation.setDataSource(new DriverManagerDataSource()); operation.setDataSource(new DriverManagerDataSource());
@ -87,6 +78,7 @@ public class RdbmsOperationTests {
@Test @Test
public void tooFewMapParameters() { public void tooFewMapParameters() {
operation.setDataSource(new DriverManagerDataSource());
operation.setSql("select * from mytable"); operation.setSql("select * from mytable");
operation.setTypes(new int[] { Types.INTEGER }); operation.setTypes(new int[] { Types.INTEGER });
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
@ -94,31 +86,31 @@ public class RdbmsOperationTests {
} }
@Test @Test
public void operationConfiguredViaJdbcTemplateMustGetDataSource() throws Exception { public void operationConfiguredViaJdbcTemplateMustGetDataSource() {
operation.setSql("foo"); operation.setSql("foo");
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
operation.compile()) operation.compile())
.withMessageContaining("ataSource"); .withMessageContaining("'dataSource'");
} }
@Test @Test
public void tooManyParameters() { public void tooManyParameters() {
operation.setDataSource(new DriverManagerDataSource());
operation.setSql("select * from mytable"); operation.setSql("select * from mytable");
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
operation.validateParameters(new Object[] { 1, 2 })); operation.validateParameters(new Object[] { 1, 2 }));
} }
@Test @Test
public void tooManyMapParameters() { public void tooManyMapParameters() {
operation.setDataSource(new DriverManagerDataSource());
operation.setSql("select * from mytable"); operation.setSql("select * from mytable");
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
operation.validateNamedParameters(Map.ofEntries( operation.validateNamedParameters(Map.of("a", "b", "c", "d")));
entry("a", "b"),
entry("c", "d")
) ));
} }
@Test @Test
public void unspecifiedMapParameters() { public void unspecifiedMapParameters() {
operation.setDataSource(new DriverManagerDataSource());
operation.setSql("select * from mytable"); operation.setSql("select * from mytable");
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("col1", "value"); params.put("col1", "value");