From 2880a439899b17a167cfdc156cc8a1dcbd6da887 Mon Sep 17 00:00:00 2001 From: Bernd Date: Thu, 7 Mar 2019 23:42:36 +0100 Subject: [PATCH] Make everything private --- .../java/com/keylesspalace/tusky/TimelineDAOTest.kt | 2 +- .../com/keylesspalace/tusky/BottomSheetActivityTest.kt | 2 +- .../com/keylesspalace/tusky/ComposeActivityTest.kt | 10 +++++----- .../com/keylesspalace/tusky/FakeTuskyApplication.kt | 2 +- .../tusky/fragment/TimelineRepositoryTest.kt | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt b/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt index 51b50ba55..4edf759a7 100644 --- a/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt +++ b/app/src/androidTest/java/com/keylesspalace/tusky/TimelineDAOTest.kt @@ -182,7 +182,7 @@ class TimelineDAOTest { return Triple(status, author, reblogAuthor) } - fun createPlaceholder(serverId: String, timelineUserId: Long): TimelineStatusEntity { + private fun createPlaceholder(serverId: String, timelineUserId: Long): TimelineStatusEntity { return TimelineStatusEntity( serverId = serverId, url = null, diff --git a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt index e0a377d48..baa78b698 100644 --- a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt @@ -99,7 +99,7 @@ class BottomSheetActivityTest { } @RunWith(Parameterized::class) - class UrlMatchingTests(val url: String, val expectedResult: Boolean) { + class UrlMatchingTests(private val url: String, private val expectedResult: Boolean) { companion object { @Parameterized.Parameters(name = "match_{0}") @JvmStatic diff --git a/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt index 14c6ec785..12522908f 100644 --- a/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt @@ -54,10 +54,10 @@ import retrofit2.Response @RunWith(AndroidJUnit4::class) class ComposeActivityTest { - lateinit var activity: ComposeActivity - lateinit var accountManagerMock: AccountManager - lateinit var apiMock: MastodonApi - lateinit var themeUtilsMock: ThemeUtils + private lateinit var activity: ComposeActivity + private lateinit var accountManagerMock: AccountManager + private lateinit var apiMock: MastodonApi + private lateinit var themeUtilsMock: ThemeUtils private val account = AccountEntity( id = 1, @@ -259,7 +259,7 @@ class ComposeActivityTest { "Example instance for testing", "admin@example.token", "2.6.3", - HashMap(), + HashMap(), null, null, listOf("en"), diff --git a/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt b/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt index 6337228a2..30c40d5a3 100644 --- a/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt +++ b/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt @@ -6,7 +6,7 @@ package com.keylesspalace.tusky class FakeTuskyApplication : TuskyApplication() { - lateinit var locator: ServiceLocator + private lateinit var locator: ServiceLocator override fun initSecurityProvider() { // No-op diff --git a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt index c28dd15b5..68853de1b 100644 --- a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt @@ -39,13 +39,13 @@ class TimelineRepositoryTest { lateinit var mastodonApi: MastodonApi @Mock - lateinit var accountManager: AccountManager + private lateinit var accountManager: AccountManager - lateinit var gson: Gson + private lateinit var gson: Gson - lateinit var subject: TimelineRepository + private lateinit var subject: TimelineRepository - lateinit var testScheduler: TestScheduler + private lateinit var testScheduler: TestScheduler private val limit = 30