Skip to content

Commit 4841e52

Browse files
sbrannensbrannen
committed
Rename constants in JdbcClientIndexedParameterTests
1 parent f068609 commit 4841e52

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

‎spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/JdbcClientIndexedParameterTests.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
*/
5252
public class JdbcClientIndexedParameterTests {
5353

54-
private static final String SELECT_NAMED_PARAMETERS =
54+
private static final String SELECT_INDEXED_PARAMETERS =
5555
"select id, forename from custmr where id = ? and country = ?";
56+
5657
private static final String SELECT_NO_PARAMETERS =
5758
"select id, forename from custmr";
5859

59-
private static final String UPDATE_NAMED_PARAMETERS =
60+
private static final String UPDATE_INDEXED_PARAMETERS =
6061
"update seat_status set booking_id = null where performance_id = ? and price_band_id = ?";
6162

6263
private static final String INSERT_GENERATE_KEYS =
@@ -101,7 +102,7 @@ public void testQueryWithResultSetExtractor() throws SQLException {
101102

102103
params.add(new SqlParameterValue(Types.DECIMAL, 1));
103104
params.add("UK");
104-
Customer cust = client.sql(SELECT_NAMED_PARAMETERS).params(params).query(
105+
Customer cust = client.sql(SELECT_INDEXED_PARAMETERS).params(params).query(
105106
rs -> {
106107
rs.next();
107108
Customer cust1 = new Customer();
@@ -112,7 +113,7 @@ public void testQueryWithResultSetExtractor() throws SQLException {
112113

113114
assertThat(cust.getId()).as("Customer id was assigned correctly").isEqualTo(1);
114115
assertThat(cust.getForename()).as("Customer forename was assigned correctly").isEqualTo("rod");
115-
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS);
116+
verify(connection).prepareStatement(SELECT_INDEXED_PARAMETERS);
116117
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
117118
verify(preparedStatement).setString(2, "UK");
118119
verify(resultSet).close();
@@ -152,7 +153,7 @@ public void testQueryWithRowCallbackHandler() throws SQLException {
152153
params.add(new SqlParameterValue(Types.DECIMAL, 1));
153154
params.add("UK");
154155
final List<Customer> customers = new ArrayList<>();
155-
client.sql(SELECT_NAMED_PARAMETERS).params(params).query(rs -> {
156+
client.sql(SELECT_INDEXED_PARAMETERS).params(params).query(rs -> {
156157
Customer cust = new Customer();
157158
cust.setId(rs.getInt(COLUMN_NAMES[0]));
158159
cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -162,7 +163,7 @@ public void testQueryWithRowCallbackHandler() throws SQLException {
162163
assertThat(customers).hasSize(1);
163164
assertThat(customers.get(0).getId()).as("Customer id was assigned correctly").isEqualTo(1);
164165
assertThat(customers.get(0).getForename()).as("Customer forename was assigned correctly").isEqualTo("rod");
165-
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS);
166+
verify(connection).prepareStatement(SELECT_INDEXED_PARAMETERS);
166167
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
167168
verify(preparedStatement).setString(2, "UK");
168169
verify(resultSet).close();
@@ -201,7 +202,7 @@ public void testQueryWithRowMapper() throws SQLException {
201202

202203
params.add(new SqlParameterValue(Types.DECIMAL, 1));
203204
params.add("UK");
204-
List<Customer> customers = client.sql(SELECT_NAMED_PARAMETERS).params(params).query(
205+
List<Customer> customers = client.sql(SELECT_INDEXED_PARAMETERS).params(params).query(
205206
(rs, rownum) -> {
206207
Customer cust = new Customer();
207208
cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -213,7 +214,7 @@ public void testQueryWithRowMapper() throws SQLException {
213214
Customer cust = customers.get(0);
214215
assertThat(cust.getId()).as("Customer id was assigned correctly").isEqualTo(1);
215216
assertThat(cust.getForename()).as("Customer forename was assigned correctly").isEqualTo("rod");
216-
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS);
217+
verify(connection).prepareStatement(SELECT_INDEXED_PARAMETERS);
217218
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
218219
verify(preparedStatement).setString(2, "UK");
219220
verify(resultSet).close();
@@ -254,7 +255,7 @@ public void testQueryForObjectWithRowMapper() throws SQLException {
254255
params.add(new SqlParameterValue(Types.DECIMAL, 1));
255256
params.add("UK");
256257

257-
Customer cust = client.sql(SELECT_NAMED_PARAMETERS).params(params).query(
258+
Customer cust = client.sql(SELECT_INDEXED_PARAMETERS).params(params).query(
258259
(rs, rownum) -> {
259260
Customer cust1 = new Customer();
260261
cust1.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -264,7 +265,7 @@ public void testQueryForObjectWithRowMapper() throws SQLException {
264265

265266
assertThat(cust.getId()).as("Customer id was assigned correctly").isEqualTo(1);
266267
assertThat(cust.getForename()).as("Customer forename was assigned correctly").isEqualTo("rod");
267-
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS);
268+
verify(connection).prepareStatement(SELECT_INDEXED_PARAMETERS);
268269
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
269270
verify(preparedStatement).setString(2, "UK");
270271
verify(resultSet).close();
@@ -282,7 +283,7 @@ public void testQueryForStreamWithRowMapper() throws SQLException {
282283
params.add("UK");
283284
AtomicInteger count = new AtomicInteger();
284285

285-
try (Stream<Customer> s = client.sql(SELECT_NAMED_PARAMETERS).params(params).query(
286+
try (Stream<Customer> s = client.sql(SELECT_INDEXED_PARAMETERS).params(params).query(
286287
(rs, rownum) -> {
287288
Customer cust1 = new Customer();
288289
cust1.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -297,7 +298,7 @@ public void testQueryForStreamWithRowMapper() throws SQLException {
297298
}
298299

299300
assertThat(count.get()).isEqualTo(1);
300-
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS);
301+
verify(connection).prepareStatement(SELECT_INDEXED_PARAMETERS);
301302
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
302303
verify(preparedStatement).setString(2, "UK");
303304
verify(resultSet).close();
@@ -311,10 +312,10 @@ public void testUpdate() throws SQLException {
311312

312313
params.add(1);
313314
params.add(1);
314-
int rowsAffected = client.sql(UPDATE_NAMED_PARAMETERS).params(params).update();
315+
int rowsAffected = client.sql(UPDATE_INDEXED_PARAMETERS).params(params).update();
315316

316317
assertThat(rowsAffected).isEqualTo(1);
317-
verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS);
318+
verify(connection).prepareStatement(UPDATE_INDEXED_PARAMETERS);
318319
verify(preparedStatement).setObject(1, 1);
319320
verify(preparedStatement).setObject(2, 1);
320321
verify(preparedStatement).close();
@@ -327,10 +328,10 @@ public void testUpdateWithTypedParameters() throws SQLException {
327328

328329
params.add(new SqlParameterValue(Types.DECIMAL, 1));
329330
params.add(new SqlParameterValue(Types.INTEGER, 1));
330-
int rowsAffected = client.sql(UPDATE_NAMED_PARAMETERS).params(params).update();
331+
int rowsAffected = client.sql(UPDATE_INDEXED_PARAMETERS).params(params).update();
331332

332333
assertThat(rowsAffected).isEqualTo(1);
333-
verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS);
334+
verify(connection).prepareStatement(UPDATE_INDEXED_PARAMETERS);
334335
verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
335336
verify(preparedStatement).setObject(2, 1, Types.INTEGER);
336337
verify(preparedStatement).close();

0 commit comments

Comments
 (0)