ktlint manual changes

ursjoss · Jun 28, 2020 · dae436c · dae436c
1 parent 1d296e6
commit dae436c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,7 @@ end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = true
-max_line_length = 120
+max_line_length = 150
 tab_width = 4
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off

diff --git a/...e-jooq/src/test/kotlin/ch/difty/scipamato/core/persistence/paper/PaperRecordMapperTest.kt b/...e-jooq/src/test/kotlin/ch/difty/scipamato/core/persistence/paper/PaperRecordMapperTest.kt
@@ -5,8 +5,9 @@ package ch.difty.scipamato.core.persistence.paper
 import ch.difty.scipamato.core.db.tables.records.PaperRecord
 import ch.difty.scipamato.core.entity.Paper
 import ch.difty.scipamato.core.persistence.RecordMapperTest
-import io.mockk.*
-import org.amshove.kluent.*
+import io.mockk.every
+import org.amshove.kluent.shouldBeEmpty
+import org.amshove.kluent.shouldBeEqualTo
 import org.jooq.RecordMapper
 
 class PaperRecordMapperTest : RecordMapperTest<PaperRecord, Paper>() {

diff --git a/...src/test/kotlin/ch/difty/scipamato/core/persistence/search/SearchOrderRecordMapperTest.kt b/...src/test/kotlin/ch/difty/scipamato/core/persistence/search/SearchOrderRecordMapperTest.kt
@@ -3,8 +3,10 @@ package ch.difty.scipamato.core.persistence.search
 import ch.difty.scipamato.core.db.tables.records.SearchOrderRecord
 import ch.difty.scipamato.core.entity.search.SearchOrder
 import ch.difty.scipamato.core.persistence.RecordMapperTest
-import io.mockk.*
-import org.amshove.kluent.*
+import io.mockk.every
+import org.amshove.kluent.shouldBeEmpty
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
 import org.jooq.RecordMapper
 
 @Suppress("UsePropertyAccessSyntax")

diff --git a/core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/keyword/KeywordListPageTest.kt b/core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/keyword/KeywordListPageTest.kt
@@ -77,7 +77,11 @@ internal class KeywordListPageTest : BasePageTest<KeywordListPage>() {
         if (colIdxAsLink != null)
             tester.assertComponent("$b:body:rows:$rowIdx:cells:$colIdxAsLink:cell:link", Link::class.java)
         var colIdx = 1
-        for (value in values) tester.assertLabel(b + ":body:rows:" + rowIdx + ":cells:" + colIdx + ":cell" + if (colIdxAsLink != null && colIdx++ == colIdxAsLink) ":link:label" else "", value)
+        for (value in values)
+            tester.assertLabel(
+                "$b:body:rows:$rowIdx:cells:$colIdx:cell${if (colIdxAsLink != null && colIdx++ == colIdxAsLink) ":link:label" else ""}",
+                value
+            )
     }
 
     @Test

diff --git a/core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/user/UserListPageAsAdminTest.kt b/core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/user/UserListPageAsAdminTest.kt
@@ -90,7 +90,11 @@ internal class UserListPageAsAdminTest : BasePageTest<UserListPage>() {
                 "$b:body:rows:$rIdx:cells:$colIdxAsLink:cell:link",
                 Link::class.java
             )
-            for (value in values) tester.assertLabel(b + ":body:rows:" + rIdx + ":cells:" + colIdx + ":cell" + if (colIdxAsLink != null && colIdx++ == colIdxAsLink) ":link:label" else "", value)
+            for (value in values)
+                tester.assertLabel(
+                    "$b:body:rows:$rIdx:cells:$colIdx:cell${if (colIdxAsLink != null && colIdx++ == colIdxAsLink) ":link:label" else ""}",
+                    value
+                )
             rIdx++
         }
     }

diff --git a/detekt-config.yml b/detekt-config.yml
@@ -1,6 +1,6 @@
 style:
   MaxLineLength:
-    maxLineLength: 120
+    maxLineLength: 150
 
 complexity:
   LongParameterList:

diff --git a/public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/WicketTest.kt b/public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/WicketTest.kt
@@ -55,7 +55,9 @@ abstract class WicketTest {
 
     @BeforeEach
     fun setUp() {
-        application.setHeaderResponseDecorator { r: IHeaderResponse? -> ResourceAggregator(JavaScriptFilteredIntoFooterHeaderResponse(r, "footer-container")) }
+        application.setHeaderResponseDecorator { r: IHeaderResponse? ->
+            ResourceAggregator(JavaScriptFilteredIntoFooterHeaderResponse(r, "footer-container"))
+        }
         ReflectionTestUtils.setField(application, "applicationContext", applicationContextMock)
         tester = WicketTester(application)
         every { sessionFacadeMock.paperIdManager } returns itemNavigator