Skip to content

Commit 9315210

Browse files
committed
ktlint round 2
1 parent a68fb0b commit 9315210

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

src/test/kotlin/examples/kotlin/mybatis3/general/GeneralKotlinTest.kt

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,16 @@ class GeneralKotlinTest {
309309
map(addressId).toProperty("addressId")
310310
}
311311

312-
val expected = "insert into Person (id, first_name, last_name, birth_date, employed, occupation, address_id) " +
313-
"values " +
314-
"(#{record.id,jdbcType=INTEGER}, #{record.firstName,jdbcType=VARCHAR}, " +
315-
"#{record.lastName,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}, " +
316-
"#{record.birthDate,jdbcType=DATE}, " +
317-
"#{record.employed,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}, " +
318-
"#{record.occupation,jdbcType=VARCHAR}, #{record.addressId,jdbcType=INTEGER})"
312+
val expected =
313+
"insert into Person (id, first_name, last_name, birth_date, employed, occupation, address_id) " +
314+
"values " +
315+
"(#{record.id,jdbcType=INTEGER}, #{record.firstName,jdbcType=VARCHAR}, " +
316+
"#{record.lastName,jdbcType=VARCHAR," +
317+
"typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}, " +
318+
"#{record.birthDate,jdbcType=DATE}, " +
319+
"#{record.employed,jdbcType=VARCHAR," +
320+
"typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}, " +
321+
"#{record.occupation,jdbcType=VARCHAR}, #{record.addressId,jdbcType=INTEGER})"
319322

320323
assertThat(insertStatement.insertStatement).isEqualTo(expected)
321324

@@ -348,16 +351,20 @@ class GeneralKotlinTest {
348351
" values" +
349352
" (#{records[0].id,jdbcType=INTEGER}," +
350353
" #{records[0].firstName,jdbcType=VARCHAR}," +
351-
" #{records[0].lastName,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
354+
" #{records[0].lastName,jdbcType=VARCHAR," +
355+
"typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
352356
" #{records[0].birthDate,jdbcType=DATE}," +
353-
" #{records[0].employed,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
357+
" #{records[0].employed,jdbcType=VARCHAR," +
358+
"typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
354359
" #{records[0].occupation,jdbcType=VARCHAR}," +
355360
" #{records[0].addressId,jdbcType=INTEGER})" +
356361
", (#{records[1].id,jdbcType=INTEGER}," +
357362
" #{records[1].firstName,jdbcType=VARCHAR}," +
358-
" #{records[1].lastName,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
363+
" #{records[1].lastName,jdbcType=VARCHAR," +
364+
"typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
359365
" #{records[1].birthDate,jdbcType=DATE}," +
360-
" #{records[1].employed,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
366+
" #{records[1].employed,jdbcType=VARCHAR," +
367+
"typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
361368
" #{records[1].occupation,jdbcType=VARCHAR}," +
362369
" #{records[1].addressId,jdbcType=INTEGER})"
363370

src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapperTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ class JoinMapperTest {
232232
}
233233

234234
@Test
235+
@Suppress("LongMethod")
235236
fun testFullJoinWithSubQuery() {
236237
newSession().use { session ->
237238
val mapper = session.getMapper(JoinMapper::class.java)

src/test/kotlin/examples/kotlin/spring/canonical/CanonicalSpringKotlinTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@ class CanonicalSpringKotlinTest {
332332
assertThat(insertStatement.insertStatement).isEqualTo(
333333
"insert into Person (id, first_name, last_name, birth_date, employed, occupation, address_id) " +
334334
"values (:records[0].id, :records[0].firstName, :records[0].lastNameAsString, " +
335-
":records[0].birthDate, :records[0].employedAsString, :records[0].occupation, :records[0].addressId), " +
335+
":records[0].birthDate, :records[0].employedAsString, " +
336+
":records[0].occupation, :records[0].addressId), " +
336337
"(:records[1].id, :records[1].firstName, :records[1].lastNameAsString, " +
337338
":records[1].birthDate, :records[1].employedAsString, :records[1].occupation, :records[1].addressId)"
338339
)

0 commit comments

Comments
 (0)