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

Replace assertThat(x.get(i)). with assertThat(x).element(i).

Browse Source 
Search for   : assertThat\((.+)\.get\((\d+)\)\)\.
Replace with : assertThat($1).element($2).

Closes gh-31759
This commit is contained in:
Yanming Zhou
2023-12-06 14:25:18 +08:00
committed by Brian Clozel
parent 785ad399e9
commit 59815cefce
94 changed files with 549 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,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)).as("Element is Integer").isEqualTo(11);
assertThat(li).element(0).as("Element is Integer").isEqualTo(11);
verify(this.resultSet).close();
verify(this.statement).close();
verify(this.connection).close();
@@ -345,7 +345,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)).as("First row is Integer").isEqualTo(11);
assertThat(li).element(0).as("First row is Integer").isEqualTo(11);
verify(this.preparedStatement).setObject(1, 3);
verify(this.resultSet).close();
verify(this.preparedStatement).close();

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

@@ -138,7 +138,7 @@ public class NamedParameterQueryTests {
params, Integer.class);
assertThat(li.size()).as("All rows returned").isEqualTo(1);
assertThat(li.get(0)).as("First row is Integer").isEqualTo(11);
assertThat(li).element(0).as("First row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
}

30
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
View File

@@ -42,24 +42,24 @@ public class NamedParameterUtilsTests {
String sql = "xxx :a yyyy :b :c :a zzzzz";
ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(NamedParameterUtils.substituteNamedParameters(psql, null)).isEqualTo("xxx ? yyyy ? ? ? zzzzz");
assertThat(psql.getParameterNames().get(0)).isEqualTo("a");
assertThat(psql.getParameterNames().get(2)).isEqualTo("c");
assertThat(psql.getParameterNames().get(3)).isEqualTo("a");
assertThat(psql.getParameterNames()).element(0).isEqualTo("a");
assertThat(psql.getParameterNames()).element(2).isEqualTo("c");
assertThat(psql.getParameterNames()).element(3).isEqualTo("a");
assertThat(psql.getTotalParameterCount()).isEqualTo(4);
assertThat(psql.getNamedParameterCount()).isEqualTo(3);
String sql2 = "xxx &a yyyy ? zzzzz";
ParsedSql psql2 = NamedParameterUtils.parseSqlStatement(sql2);
assertThat(NamedParameterUtils.substituteNamedParameters(psql2, null)).isEqualTo("xxx ? yyyy ? zzzzz");
assertThat(psql2.getParameterNames().get(0)).isEqualTo("a");
assertThat(psql2.getParameterNames()).element(0).isEqualTo("a");
assertThat(psql2.getTotalParameterCount()).isEqualTo(2);
assertThat(psql2.getNamedParameterCount()).isEqualTo(1);
String sql3 = "xxx &ä+:ö" + '\t' + ":ü%10 yyyy ? zzzzz";
ParsedSql psql3 = NamedParameterUtils.parseSqlStatement(sql3);
assertThat(psql3.getParameterNames().get(0)).isEqualTo("ä");
assertThat(psql3.getParameterNames().get(1)).isEqualTo("ö");
assertThat(psql3.getParameterNames().get(2)).isEqualTo("ü");
assertThat(psql3.getParameterNames()).element(0).isEqualTo("ä");
assertThat(psql3.getParameterNames()).element(1).isEqualTo("ö");
assertThat(psql3.getParameterNames()).element(2).isEqualTo("ü");
}
@Test
@@ -225,8 +225,8 @@ public class NamedParameterUtilsTests {
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames()).hasSize(2);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1");
assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2");
assertThat(parsedSql.getParameterNames()).element(0).isEqualTo("p1");
assertThat(parsedSql.getParameterNames()).element(1).isEqualTo("p2");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
assertThat(finalSql).isEqualTo(expectedSql);
}
@@ -238,8 +238,8 @@ public class NamedParameterUtilsTests {
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames()).hasSize(2);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1");
assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2");
assertThat(parsedSql.getParameterNames()).element(0).isEqualTo("p1");
assertThat(parsedSql.getParameterNames()).element(1).isEqualTo("p2");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
assertThat(finalSql).isEqualTo(expectedSql);
}
@@ -269,7 +269,7 @@ public class NamedParameterUtilsTests {
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames()).hasSize(1);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p");
assertThat(parsedSql.getParameterNames()).element(0).isEqualTo("p");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
assertThat(finalSql).isEqualTo(expectedSql);
}
@@ -300,7 +300,7 @@ public class NamedParameterUtilsTests {
String sql = "SELECT ':foo'':doo', :xxx FROM DUAL";
ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(psql.getTotalParameterCount()).isEqualTo(1);
assertThat(psql.getParameterNames().get(0)).isEqualTo("xxx");
assertThat(psql.getParameterNames()).element(0).isEqualTo("xxx");
}
@Test
@@ -308,7 +308,7 @@ public class NamedParameterUtilsTests {
String sql = "SELECT /*:doo*/':foo', :xxx FROM DUAL";
ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(psql.getTotalParameterCount()).isEqualTo(1);
assertThat(psql.getParameterNames().get(0)).isEqualTo("xxx");
assertThat(psql.getParameterNames()).element(0).isEqualTo("xxx");
}
@Test
@@ -316,7 +316,7 @@ public class NamedParameterUtilsTests {
String sql2 = "SELECT ':foo'/*:doo*/, :xxx FROM DUAL";
ParsedSql psql2 = NamedParameterUtils.parseSqlStatement(sql2);
assertThat(psql2.getTotalParameterCount()).isEqualTo(1);
assertThat(psql2.getParameterNames().get(0)).isEqualTo("xxx");
assertThat(psql2.getParameterNames()).element(0).isEqualTo("xxx");
}
@Test // gh-27716

4
spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/JdbcClientQueryTests.java
View File

@@ -150,7 +150,7 @@ public class JdbcClientQueryTests {
.query().singleColumn();
assertThat(li.size()).as("All rows returned").isEqualTo(1);
assertThat(li.get(0)).as("First row is Integer").isEqualTo(11);
assertThat(li).element(0).as("First row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
verify(resultSet).close();
@@ -335,7 +335,7 @@ public class JdbcClientQueryTests {
.query().singleColumn();
assertThat(li.size()).as("All rows returned").isEqualTo(1);
assertThat(li.get(0)).as("First row is Integer").isEqualTo(11);
assertThat(li).element(0).as("First row is Integer").isEqualTo(11);
verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
verify(preparedStatement).setObject(1, 3);
verify(resultSet).close();

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

@@ -363,8 +363,8 @@ public class StoredProcedureTests {
assertThat(res.size()).as("incorrect number of returns").isEqualTo(1);
List<String> rs1 = (List<String>) res.get("rs");
assertThat(rs1).hasSize(2);
assertThat(rs1.get(0)).isEqualTo("Foo");
assertThat(rs1.get(1)).isEqualTo("Bar");
assertThat(rs1).element(0).isEqualTo("Foo");
assertThat(rs1).element(1).isEqualTo("Bar");
verify(resultSet).close();
}