Skip to content

Commit 2ac4bbd

Browse files
committed
Polishing.
Improved naming and formatting Original pull request #2068 See #1935
1 parent 2024731 commit 2ac4bbd

File tree

1 file changed

+19
-28
lines changed

1 file changed

+19
-28
lines changed

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlParametersFactoryTest.java renamed to spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlParametersFactoryUnitTests.java

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @author Chirag Tailor
4747
* @author Sergey Korotaev
4848
*/
49-
class SqlParametersFactoryTest {
49+
class SqlParametersFactoryUnitTests {
5050

5151
RelationalMappingContext context = new JdbcMappingContext();
5252
RelationResolver relationResolver = mock(RelationResolver.class);
@@ -88,8 +88,7 @@ public void considersConfiguredWriteConverterForIdValueObjectsWhichReferencedInO
8888
assertThat(sqlParameterSource.getValue("DUMMYENTITYROOT")).isEqualTo(rawId);
8989
}
9090

91-
@Test
92-
// DATAJDBC-146
91+
@Test // DATAJDBC-146
9392
void identifiersGetAddedAsParameters() {
9493

9594
long id = 4711L;
@@ -103,8 +102,7 @@ void identifiersGetAddedAsParameters() {
103102
assertThat(sqlParameterSource.getValue("reference")).isEqualTo(reference);
104103
}
105104

106-
@Test
107-
// DATAJDBC-146
105+
@Test // DATAJDBC-146
108106
void additionalIdentifierForIdDoesNotLeadToDuplicateParameters() {
109107

110108
long id = 4711L;
@@ -116,8 +114,7 @@ void additionalIdentifierForIdDoesNotLeadToDuplicateParameters() {
116114
assertThat(sqlParameterSource.getValue("id")).isEqualTo(id);
117115
}
118116

119-
@Test
120-
// DATAJDBC-235
117+
@Test // DATAJDBC-235
121118
void considersConfiguredWriteConverter() {
122119

123120
SqlParametersFactory sqlParametersFactory = createSqlParametersFactoryWithConverters(
@@ -131,8 +128,7 @@ void considersConfiguredWriteConverter() {
131128
assertThat(sqlParameterSource.getValue("flag")).isEqualTo("T");
132129
}
133130

134-
@Test
135-
// DATAJDBC-412
131+
@Test // DATAJDBC-412
136132
void considersConfiguredWriteConverterForIdValueObjects_onWrite() {
137133

138134
SqlParametersFactory sqlParametersFactory = createSqlParametersFactoryWithConverters(
@@ -149,8 +145,7 @@ void considersConfiguredWriteConverterForIdValueObjects_onWrite() {
149145
assertThat(sqlParameterSource.getValue("value")).isEqualTo(value);
150146
}
151147

152-
@Test
153-
// GH-1405
148+
@Test // GH-1405
154149
void parameterNamesGetSanitized() {
155150

156151
WithIllegalCharacters entity = new WithIllegalCharacters(23L, "aValue");
@@ -165,62 +160,58 @@ void parameterNamesGetSanitized() {
165160
assertThat(sqlParameterSource.getValue("val&ue")).isNull();
166161
}
167162

168-
@Test
169-
// GH-1935
163+
@Test // GH-1935
170164
void enumParameterIsNotNullReturnCorrectSqlTypeFromConverter() {
171165

172166
WithEnumEntity entity = new WithEnumEntity(23L, DummyEnum.ONE);
173167

174168
SqlParametersFactory sqlParametersFactory = createSqlParametersFactoryWithConverters(
175169
singletonList(WritingEnumConverter.INSTANCE));
176170

177-
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity,
178-
WithEnumEntity.class, Identifier.empty(), IdValueSource.PROVIDED);
171+
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity, WithEnumEntity.class,
172+
Identifier.empty(), IdValueSource.PROVIDED);
179173

180174
assertThat(sqlParameterSource.getValue("id")).isEqualTo(23L);
181175
assertThat(sqlParameterSource.getValue("dummy_enum")).isEqualTo(DummyEnum.ONE.name());
182176
assertThat(sqlParameterSource.getSqlType("dummy_enum")).isEqualTo(1111);
183177
}
184178

185-
@Test
186-
// GH-1935
179+
@Test // GH-1935
187180
void enumParameterIsNullReturnCorrectSqlTypeFromConverter() {
188181
WithEnumEntity entity = new WithEnumEntity(23L, null);
189182

190183
SqlParametersFactory sqlParametersFactory = createSqlParametersFactoryWithConverters(
191184
singletonList(WritingEnumConverter.INSTANCE));
192185

193-
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity,
194-
WithEnumEntity.class, Identifier.empty(), IdValueSource.PROVIDED);
186+
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity, WithEnumEntity.class,
187+
Identifier.empty(), IdValueSource.PROVIDED);
195188

196189
assertThat(sqlParameterSource.getValue("id")).isEqualTo(23L);
197190
assertThat(sqlParameterSource.getSqlType("dummy_enum")).isEqualTo(JDBCType.NULL.getVendorTypeNumber());
198191
assertThat(sqlParameterSource.getValue("dummy_enum")).isNull();
199192
}
200193

201-
@Test
202-
// GH-1935
194+
@Test // GH-1935
203195
void enumParameterIsNotNullReturnCorrectSqlTypeWithoutConverter() {
204196

205197
WithEnumEntity entity = new WithEnumEntity(23L, DummyEnum.ONE);
206198

207-
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity,
208-
WithEnumEntity.class, Identifier.empty(), IdValueSource.PROVIDED);
199+
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity, WithEnumEntity.class,
200+
Identifier.empty(), IdValueSource.PROVIDED);
209201

210202
assertThat(sqlParameterSource.getValue("id")).isEqualTo(23L);
211203
assertThat(sqlParameterSource.getValue("dummy_enum")).isEqualTo(DummyEnum.ONE.name());
212204
assertThat(sqlParameterSource.getSqlType("dummy_enum")).isEqualTo(12);
213205

214206
}
215207

216-
@Test
217-
// GH-1935
208+
@Test // GH-1935
218209
void enumParameterIsNullReturnCorrectSqlTypeWithoutConverter() {
219210

220211
WithEnumEntity entity = new WithEnumEntity(23L, null);
221212

222-
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity,
223-
WithEnumEntity.class, Identifier.empty(), IdValueSource.PROVIDED);
213+
SqlIdentifierParameterSource sqlParameterSource = sqlParametersFactory.forInsert(entity, WithEnumEntity.class,
214+
Identifier.empty(), IdValueSource.PROVIDED);
224215

225216
assertThat(sqlParameterSource.getValue("id")).isEqualTo(23L);
226217
assertThat(sqlParameterSource.getSqlType("dummy_enum")).isEqualTo(JDBCType.NULL.getVendorTypeNumber());
@@ -291,7 +282,7 @@ public int hashCode() {
291282
}
292283

293284
public String toString() {
294-
return "SqlParametersFactoryTest.IdValue(id=" + this.getId() + ")";
285+
return "SqlParametersFactoryUnitTests.IdValue(id=" + this.getId() + ")";
295286
}
296287
}
297288

0 commit comments

Comments
 (0)