Enable ktlint class and function signature rules

Author: rvandermeulen

.editorconfig

@@ -7,10 +7,8 @@ insert_final_newline = true
 max_line_length = 120 # same as detekt.yml
 
 # rules we should look into enabling
-ktlint_standard_class-signature = disabled
 ktlint_standard_function-expression-body = disabled
 ktlint_standard_function-naming = disabled
-ktlint_standard_function-signature = disabled
 ktlint_standard_indent = disabled
 ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_no-empty-first-line-in-class-body = disabled

app/src/androidTest/java/org/mozilla/reference/browser/FirefoxTestRunner.kt

@@ -10,7 +10,11 @@ import androidx.test.runner.AndroidJUnitRunner
 
 class FirefoxTestRunner : AndroidJUnitRunner() {
 
-    override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
+    override fun newApplication(
+        cl: ClassLoader?,
+        className: String?,
+        context: Context?,
+    ): Application {
         return super.newApplication(cl, FirefoxTestApplication::class.java.name, context)
     }
 }

app/src/androidTest/java/org/mozilla/reference/browser/ext/UiDevice.kt

@@ -15,7 +15,10 @@ import org.mozilla.reference.browser.helpers.TestAssetHelper.waitingTime
  *
  * @throws AssertionError if no [UiObject2] matches the condition
  */
-fun UiDevice.waitAndInteract(condition: SearchCondition<UiObject2>, interaction: UiObject2.() -> Unit) {
+fun UiDevice.waitAndInteract(
+    condition: SearchCondition<UiObject2>,
+    interaction: UiObject2.() -> Unit,
+) {
     val obj = this.wait(condition, waitingTime)
     assertNotNull(obj)
     interaction.invoke(obj)

app/src/androidTest/java/org/mozilla/reference/browser/helpers/Assert.kt

@@ -13,7 +13,11 @@ import org.junit.Assert.assertEquals
  * pixel data are the same (within the provided delta): this is the same metrics that
  * [Bitmap.sameAs] uses.
  */
-fun assertEqualsWithDelta(expectedB: Bitmap, actualB: Bitmap, delta: Float) {
+fun assertEqualsWithDelta(
+    expectedB: Bitmap,
+    actualB: Bitmap,
+    delta: Float,
+) {
     assertEquals("widths should be equal", expectedB.width, actualB.width)
     assertEquals("heights should be equal", expectedB.height, actualB.height)
     assertEquals("config should be equal", expectedB.config, actualB.config)

app/src/androidTest/java/org/mozilla/reference/browser/helpers/Matchers.kt

@@ -36,7 +36,8 @@ fun isSelected(isSelected: Boolean): Matcher<View> = maybeInvertMatcher(espresso
  *
  * @param matcher The matcher that our view cousins will be checked against to
  */
-fun hasCousin(matcher: Matcher<View>): Matcher<View> = object : BaseMatcher<View>() {
+fun hasCousin(matcher: Matcher<View>): Matcher<View> =
+    object : BaseMatcher<View>() {
     override fun describeTo(description: Description?) {
         description?.apply {
             appendText("has cousin that matches: ")
@@ -54,15 +55,20 @@ fun hasCousin(matcher: Matcher<View>): Matcher<View> = object : BaseMatcher<View
             ?.count() == 1
     }
 
-    private fun matchChildren(matcher: Matcher<View>): (View?) -> Boolean = {
+    private fun matchChildren(matcher: Matcher<View>): (View?) -> Boolean =
+        {
         (it as? ViewGroup)
             ?.children
             ?.filter { v -> matcher.matches(v) }
             ?.count() == 1
     }
 }
 
-private fun maybeInvertMatcher(matcher: Matcher<View>, useUnmodifiedMatcher: Boolean): Matcher<View> = when {
+private fun maybeInvertMatcher(
+    matcher: Matcher<View>,
+    useUnmodifiedMatcher: Boolean,
+): Matcher<View> =
+    when {
     useUnmodifiedMatcher -> matcher
     else -> not(matcher)
 }

app/src/androidTest/java/org/mozilla/reference/browser/helpers/MockWebServer.kt

@@ -66,7 +66,10 @@ class AndroidAssetDispatcher : Dispatcher() {
 }
 
 @Throws(IOException::class)
-private fun fileToResponse(path: String, file: InputStream): MockResponse {
+private fun fileToResponse(
+    path: String,
+    file: InputStream,
+): MockResponse {
     return MockResponse()
         .setResponseCode(HTTP_OK)
         .setBody(fileToBytes(file)!!)

app/src/androidTest/java/org/mozilla/reference/browser/helpers/RetryTestRule.kt

@@ -11,9 +11,14 @@ import org.junit.runner.Description
 import org.junit.runners.model.Statement
 import java.lang.AssertionError
 
-class RetryTestRule(private val retryCount: Int = 5) : TestRule {
+class RetryTestRule(
+    private val retryCount: Int = 5,
+) : TestRule {
 
-    override fun apply(base: Statement, description: Description): Statement {
+    override fun apply(
+        base: Statement,
+        description: Description,
+    ): Statement {
         return statement {
             for (i in 1..retryCount) {
                 try {

app/src/androidTest/java/org/mozilla/reference/browser/helpers/TestAssetHelper.kt

@@ -16,7 +16,11 @@ object TestAssetHelper {
     val waitingTime: Long = TimeUnit.SECONDS.toMillis(15)
     val waitingTimeShort: Long = TimeUnit.SECONDS.toMillis(1)
 
-    data class TestAsset(val url: Uri, val content: String, val title: String)
+    data class TestAsset(
+        val url: Uri,
+        val content: String,
+        val title: String,
+    )
 
     /**
      * Hosts 3 simple websites, found at androidTest/assets/pages/generic[1|2|3].html
@@ -36,7 +40,10 @@ object TestAssetHelper {
         }
     }
 
-    fun getGenericAsset(server: MockWebServer, pageNum: Int): TestAsset {
+    fun getGenericAsset(
+        server: MockWebServer,
+        pageNum: Int,
+    ): TestAsset {
         val url = server.url("pages/generic$pageNum.html").toString().toUri()!!
         val content = "Page content: $pageNum"
         val title = "Test_Page_$pageNum"

app/src/androidTest/java/org/mozilla/reference/browser/helpers/TestHelper.kt

@@ -74,21 +74,27 @@ object TestHelper {
         return bitmap
     }
 
-    fun UiDevice.waitForObjects(obj: UiObject, waitingTime: Long = TestAssetHelper.waitingTime) {
+    fun UiDevice.waitForObjects(
+        obj: UiObject,
+        waitingTime: Long = TestAssetHelper.waitingTime,
+    ) {
         this.waitForIdle()
         Assert.assertNotNull(obj.waitForExists(waitingTime))
     }
 
-    fun itemWithResId(resourceId: String) =
-        mDevice.findObject(UiSelector().resourceId(resourceId))
+    fun itemWithResId(resourceId: String) = mDevice.findObject(UiSelector().resourceId(resourceId))
 
-    fun itemWithText(itemText: String) =
-        mDevice.findObject(UiSelector().text(itemText))
+    fun itemWithText(itemText: String) = mDevice.findObject(UiSelector().text(itemText))
 
-    fun itemWithResIdContainingText(resourceId: String, text: String) =
-        mDevice.findObject(UiSelector().resourceId(resourceId).textContains(text))
+    fun itemWithResIdContainingText(
+        resourceId: String,
+        text: String,
+    ) = mDevice.findObject(UiSelector().resourceId(resourceId).textContains(text))
 
-    fun assertUIObjectExists(vararg appItems: UiObject, exists: Boolean = true) {
+    fun assertUIObjectExists(
+        vararg appItems: UiObject,
+        exists: Boolean = true,
+    ) {
         if (exists) {
             for (appItem in appItems) {
                 assertTrue(appItem.waitForExists(waitingTime))

app/src/androidTest/java/org/mozilla/reference/browser/helpers/ext/String.kt

@@ -8,7 +8,8 @@ import android.net.Uri
 
 // Extension functions for the String class
 
-fun String?.toUri(): Uri? = if (this == null) {
+fun String?.toUri(): Uri? =
+    if (this == null) {
     null
 } else {
     Uri.parse(this)