Clean up kotlin code

* static imports * less nullable types * format
2025-12-07 09:38:52 -06:00 · 2021-01-18 16:11:52 +01:00
parent 9d0fbb9ea9
commit dedeb13f46
106 changed files with 982 additions and 1287 deletions
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt
@@ -38,19 +38,13 @@ import org.mockito.Mockito.mock

@Module
 class TestModule {
-    @Provides fun ListHabitsBehavior() = mock(ListHabitsBehavior::class.java)
+    @Provides fun listHabitsBehavior(): ListHabitsBehavior = mock(ListHabitsBehavior::class.java)
 }

@ActivityScope
@Component(
-    modules = arrayOf(
-        ActivityContextModule::class,
-        HabitsActivityModule::class,
-        ListHabitsModule::class,
-        HabitModule::class,
-        TestModule::class
-    ),
-    dependencies = arrayOf(HabitsApplicationComponent::class)
+    modules = [ActivityContextModule::class, HabitsActivityModule::class, ListHabitsModule::class, HabitModule::class, TestModule::class],
+    dependencies = [HabitsApplicationComponent::class]
 )
 interface HabitsActivityTestComponent {
    fun getCheckmarkPanelViewFactory(): CheckmarkPanelViewFactory
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
@@ -25,7 +25,8 @@ import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers
-import org.hamcrest.CoreMatchers
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.endsWith
 import org.hamcrest.Matcher
 import org.isoron.uhabits.BaseUserInterfaceTest
 import org.isoron.uhabits.R
@@ -56,12 +57,12 @@ object ListHabitsSteps {

    private fun clickTextInsideOverflowMenu(id: Int) {
        Espresso.onView(
-            CoreMatchers.allOf(
+            allOf(
                ViewMatchers.withContentDescription("More options"),
                ViewMatchers.withParent(
                    ViewMatchers.withParent(
                        ViewMatchers.withClassName(
-                            CoreMatchers.endsWith("Toolbar")
+                            endsWith("Toolbar")
                        )
                    )
                )
@@ -107,9 +108,9 @@ object ListHabitsSteps {
    fun longPressCheckmarks(habit: String?, count: Int) {
        CommonSteps.scrollToText(habit)
        Espresso.onView(
-            CoreMatchers.allOf(
+            allOf(
                ViewMatchers.hasDescendant(ViewMatchers.withText(habit)),
-                ViewMatchers.withClassName(CoreMatchers.endsWith("HabitCardView"))
+                ViewMatchers.withClassName(endsWith("HabitCardView"))
            )
        ).perform(
            longClickDescendantWithClass(CheckmarkButtonView::class.java, count)
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.kt
@@ -28,8 +28,8 @@ import org.isoron.uhabits.BaseUserInterfaceTest
 object WidgetSteps {
    @Throws(Exception::class)
    fun clickCheckmarkWidget() {
-        val view_id = "org.isoron.uhabits:id/imageView"
-        BaseUserInterfaceTest.device.findObject(UiSelector().resourceId(view_id)).click()
+        val viewId = "org.isoron.uhabits:id/imageView"
+        BaseUserInterfaceTest.device.findObject(UiSelector().resourceId(viewId)).click()
    }

    @Throws(Exception::class)
@@ -66,7 +66,7 @@ object WidgetSteps {
            BaseUserInterfaceTest.device.findObject(UiSelector().description("Apps")).click()
            BaseUserInterfaceTest.device.findObject(UiSelector().description("Widgets")).click()
        } else {
-            val list_id = "com.android.launcher3:id/widgets_list_view"
+            val listId = "com.android.launcher3:id/widgets_list_view"
            BaseUserInterfaceTest.device.pressHome()
            BaseUserInterfaceTest.device.waitForIdle()
            BaseUserInterfaceTest.device.drag(w / 2, h / 2, w / 2, h / 2, 8)
@@ -76,10 +76,10 @@ object WidgetSteps {
            }
            button.click()
            if (VERSION.SDK_INT >= 28) {
-                UiScrollable(UiSelector().resourceId(list_id))
+                UiScrollable(UiSelector().resourceId(listId))
                    .scrollForward()
            }
-            UiScrollable(UiSelector().resourceId(list_id))
+            UiScrollable(UiSelector().resourceId(listId))
                .scrollIntoView(UiSelector().text("Checkmark"))
        }
    }
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
@@ -34,11 +34,12 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

+private const val PATH = "habits/list/CheckmarkPanelView"
+
@RunWith(AndroidJUnit4::class)
@MediumTest
 class EntryPanelViewTest : BaseViewTest() {

-    private val PATH = "habits/list/CheckmarkPanelView"
    private lateinit var view: CheckmarkPanelView

    @Before
@@ -75,27 +76,6 @@ class EntryPanelViewTest : BaseViewTest() {
        assertRenders(view, "$PATH/render.png")
    }

-//    // Flaky test
-//    @Test
-//    fun testRender_withDifferentColor() {
-//        view.color = PaletteUtils.getAndroidTestColor(1)
-//        assertRenders(view, "$PATH/render_different_color.png")
-//    }
-
-//    // Flaky test
-//    @Test
-//    fun testRender_Reversed() {
-//        prefs.isCheckmarkSequenceReversed = true
-//        assertRenders(view, "$PATH/render_reversed.png")
-//    }
-
-//    // Flaky test
-//    @Test
-//    fun testRender_withOffset() {
-//        view.dataOffset = 3
-//        assertRenders(view, "$PATH/render_offset.png")
-//    }
-
    @Test
    fun testToggle() {
        val timestamps = mutableListOf<Timestamp>()
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
@@ -56,7 +56,7 @@ class HabitCardViewTest : BaseViewTest() {
        view = component.getHabitCardViewFactory().create().apply {
            habit = habit1
            values = entries
-            score = habit1.scores.get(today).value
+            score = habit1.scores[today].value
            isSelected = false
            buttonCount = 5
        }
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
@@ -73,27 +73,6 @@ class NumberPanelViewTest : BaseViewTest() {
        assertRenders(view, "$PATH/render.png")
    }

-//    // Flaky test
-//    @Test
-//    fun testRender_withDifferentColor() {
-//        view.color = PaletteUtils.getAndroidTestColor(1)
-//        assertRenders(view, "$PATH/render_different_color.png")
-//    }
-
-//    // Flaky test
-//    @Test
-//    fun testRender_Reversed() {
-//        prefs.isCheckmarkSequenceReversed = true
-//        assertRenders(view, "$PATH/render_reversed.png")
-//    }
-
-//    // Flaky test
-//    @Test
-//    fun testRender_withOffset() {
-//        view.dataOffset = 3
-//        assertRenders(view, "$PATH/render_offset.png")
-//    }
-
    @Test
    fun testEdit() {
        val timestamps = mutableListOf<Timestamp>()
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt
@@ -103,9 +103,8 @@ class IntentSchedulerTest : BaseAndroidTest() {
        assertNull(ReminderReceiver.lastReceivedIntent)

        setSystemTime("America/Chicago", 2020, JUNE, 2, 22, 46)
-        val intent = ReminderReceiver.lastReceivedIntent
-        assertNotNull(intent)
-        assertThat(parseId(intent?.data!!), equalTo(habit.id))
+        val intent = ReminderReceiver.lastReceivedIntent!!
+        assertThat(parseId(intent.data!!), equalTo(habit.id))
    }

    @Test
@@ -123,7 +122,6 @@ class IntentSchedulerTest : BaseAndroidTest() {
        assertNull(WidgetReceiver.lastReceivedIntent)

        setSystemTime("America/Chicago", 2020, JUNE, 2, 22, 46)
-        val intent = WidgetReceiver.lastReceivedIntent
-        assertNotNull(intent)
+        WidgetReceiver.lastReceivedIntent!!
    }
 }
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
@@ -68,13 +68,6 @@ public class CheckmarkWidgetViewTest extends BaseViewTest
        assertRenders(view, PATH + "checked.png");
    }

-//    @Test
-//    public void testRender_implicitlyChecked() throws IOException
-//    {
-//        view.setCheckmarkValue(Checkmark.YES_AUTO);
-//        view.refresh();
-//        assertRenders(view, PATH + "implicitly_checked.png");
-//    }

    @Test
    public void testRender_largeSize() throws IOException
@@ -83,11 +76,4 @@ public class CheckmarkWidgetViewTest extends BaseViewTest
        assertRenders(view, PATH + "large_size.png");
    }

-//    @Test
-//    public void testRender_unchecked() throws IOException
-//    {
-//        view.setCheckmarkValue(Checkmark.NO);
-//        view.refresh();
-//        assertRenders(view, PATH + "unchecked.png");
-//    }
 }