upgrade ktlint plugin to 12.0.3 (#4169)
There are some new rules, I think they mostly make sense, except for the max line length which I had to disable because we are over it in a lot of places. --------- Co-authored-by: Goooler <wangzongler@gmail.com>
This commit is contained in:
Konrad Pozniak
GitHub
parent
33cd6fdb98
commit
5192fb08a5
215 changed files with 2813 additions and 1177 deletions
|
|
@ -24,6 +24,8 @@ import io.reactivex.rxjava3.android.plugins.RxAndroidPlugins
|
|||
import io.reactivex.rxjava3.core.Single
|
||||
import io.reactivex.rxjava3.plugins.RxJavaPlugins
|
||||
import io.reactivex.rxjava3.schedulers.TestScheduler
|
||||
import java.util.Date
|
||||
import java.util.concurrent.TimeUnit
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
|
|
@ -34,8 +36,6 @@ import org.mockito.ArgumentMatchers.anyBoolean
|
|||
import org.mockito.Mockito.eq
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import java.util.Date
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class BottomSheetActivityTest {
|
||||
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@ import com.keylesspalace.tusky.entity.Poll
|
|||
import com.keylesspalace.tusky.entity.PollOption
|
||||
import com.keylesspalace.tusky.entity.Status
|
||||
import com.keylesspalace.tusky.network.FilterModel
|
||||
import java.time.Instant
|
||||
import java.util.Date
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.kotlin.mock
|
||||
import org.robolectric.annotation.Config
|
||||
import java.time.Instant
|
||||
import java.util.Date
|
||||
|
||||
@Config(sdk = [28])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import com.keylesspalace.tusky.db.AccountEntity
|
|||
import com.keylesspalace.tusky.entity.Account
|
||||
import com.keylesspalace.tusky.entity.Notification
|
||||
import com.keylesspalace.tusky.entity.TimelineAccount
|
||||
import java.util.Date
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNotNull
|
||||
import org.junit.Before
|
||||
|
|
@ -27,7 +28,6 @@ import org.robolectric.Robolectric
|
|||
import org.robolectric.Shadows.shadowOf
|
||||
import org.robolectric.android.util.concurrent.BackgroundExecutor.runInBackground
|
||||
import org.robolectric.annotation.Config
|
||||
import java.util.Date
|
||||
|
||||
@Config(sdk = [28])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import com.keylesspalace.tusky.entity.InstanceConfiguration
|
|||
import com.keylesspalace.tusky.entity.InstanceV1
|
||||
import com.keylesspalace.tusky.entity.StatusConfiguration
|
||||
import com.keylesspalace.tusky.network.MastodonApi
|
||||
import java.util.Locale
|
||||
import okhttp3.ResponseBody
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
import org.junit.Assert.assertEquals
|
||||
|
|
@ -55,7 +56,6 @@ import org.robolectric.annotation.Config
|
|||
import org.robolectric.fakes.RoboMenuItem
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Response
|
||||
import java.util.Locale
|
||||
|
||||
/**
|
||||
* Created by charlag on 3/7/18.
|
||||
|
|
@ -548,7 +548,7 @@ class ComposeActivityTest {
|
|||
instanceResponseCallback = { getSampleFriendicaInstance() }
|
||||
setupActivity()
|
||||
shadowOf(getMainLooper()).idle()
|
||||
assertEquals(friendicaMaximum, activity.maximumTootCharacters)
|
||||
assertEquals(FRIENDICA_MAXIMUM, activity.maximumTootCharacters)
|
||||
}
|
||||
|
||||
private fun clickUp() {
|
||||
|
|
@ -585,7 +585,7 @@ class ComposeActivityTest {
|
|||
),
|
||||
Instance.Configuration.MediaAttachments(0, 0, 0, 0, 0),
|
||||
Instance.Configuration.Polls(0, 0, 0, 0),
|
||||
Instance.Configuration.Translation(false),
|
||||
Instance.Configuration.Translation(false)
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -620,7 +620,7 @@ class ComposeActivityTest {
|
|||
}
|
||||
|
||||
companion object {
|
||||
private const val friendicaMaximum = 200000
|
||||
private const val FRIENDICA_MAXIMUM = 200000
|
||||
|
||||
// https://github.com/tuskyapp/Tusky/issues/4100
|
||||
private val sampleFriendicaResponse = """{
|
||||
|
|
@ -642,7 +642,7 @@ class ComposeActivityTest {
|
|||
],
|
||||
"configuration": {
|
||||
"statuses": {
|
||||
"max_characters": $friendicaMaximum
|
||||
"max_characters": $FRIENDICA_MAXIMUM
|
||||
},
|
||||
"media_attachments": {
|
||||
"supported_mime_types": {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import com.keylesspalace.tusky.db.AccountManager
|
|||
import com.keylesspalace.tusky.db.AppDatabase
|
||||
import com.keylesspalace.tusky.db.Converters
|
||||
import com.keylesspalace.tusky.db.TimelineStatusWithAccount
|
||||
import java.io.IOException
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
|
|
@ -35,7 +36,6 @@ import org.robolectric.Shadows.shadowOf
|
|||
import org.robolectric.annotation.Config
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Response
|
||||
import java.io.IOException
|
||||
|
||||
@Config(sdk = [28])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import com.keylesspalace.tusky.components.timeline.viewmodel.TimelineViewModel
|
|||
import com.keylesspalace.tusky.db.AccountEntity
|
||||
import com.keylesspalace.tusky.db.AccountManager
|
||||
import com.keylesspalace.tusky.viewdata.StatusViewData
|
||||
import java.io.IOException
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import okhttp3.Headers
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
|
|
@ -28,7 +29,6 @@ import org.mockito.kotlin.verify
|
|||
import org.robolectric.annotation.Config
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Response
|
||||
import java.io.IOException
|
||||
|
||||
@Config(sdk = [29])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
@ -389,7 +389,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("4"),
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("3")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -400,11 +400,11 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
listOf(
|
||||
mockStatus("3"),
|
||||
mockStatus("2"),
|
||||
mockStatus("1"),
|
||||
mockStatus("1")
|
||||
),
|
||||
Headers.headersOf(
|
||||
"Link",
|
||||
"<https://mastodon.example/api/v1/trends/statuses?offset=5>; rel=\"next\"",
|
||||
"<https://mastodon.example/api/v1/trends/statuses?offset=5>; rel=\"next\""
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import com.keylesspalace.tusky.entity.StatusContext
|
|||
import com.keylesspalace.tusky.network.FilterModel
|
||||
import com.keylesspalace.tusky.network.MastodonApi
|
||||
import com.keylesspalace.tusky.usecase.TimelineCases
|
||||
import java.io.IOException
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.junit.After
|
||||
|
|
@ -32,7 +33,6 @@ import org.mockito.kotlin.mock
|
|||
import org.mockito.kotlin.stub
|
||||
import org.robolectric.Shadows.shadowOf
|
||||
import org.robolectric.annotation.Config
|
||||
import java.io.IOException
|
||||
|
||||
@Config(sdk = [28])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import com.keylesspalace.tusky.appstore.EventHub
|
|||
import com.keylesspalace.tusky.appstore.StatusChangedEvent
|
||||
import com.keylesspalace.tusky.entity.Status
|
||||
import com.keylesspalace.tusky.network.MastodonApi
|
||||
import java.util.Date
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
import org.junit.Assert.assertEquals
|
||||
|
|
@ -19,7 +20,6 @@ import org.mockito.kotlin.stub
|
|||
import org.robolectric.annotation.Config
|
||||
import retrofit2.HttpException
|
||||
import retrofit2.Response
|
||||
import java.util.Date
|
||||
|
||||
@Config(sdk = [28])
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
package com.keylesspalace.tusky.util
|
||||
|
||||
import java.time.Instant
|
||||
import java.util.*
|
||||
import org.junit.AfterClass
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.BeforeClass
|
||||
import org.junit.Test
|
||||
import java.time.Instant
|
||||
import java.util.*
|
||||
|
||||
class AbsoluteTimeFormatterTest {
|
||||
companion object {
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ package com.keylesspalace.tusky.util
|
|||
|
||||
import app.cash.turbine.test
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import kotlin.time.Duration.Companion.milliseconds
|
||||
import kotlin.time.ExperimentalTime
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.flow
|
||||
import kotlinx.coroutines.test.advanceUntilIdle
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Test
|
||||
import kotlin.time.Duration.Companion.milliseconds
|
||||
import kotlin.time.ExperimentalTime
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
|
||||
class FlowExtensionsTest {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
package com.keylesspalace.tusky.util
|
||||
|
||||
import java.util.Locale
|
||||
import kotlin.math.pow
|
||||
import org.junit.AfterClass
|
||||
import org.junit.Assert
|
||||
import org.junit.BeforeClass
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.Parameterized
|
||||
import java.util.Locale
|
||||
import kotlin.math.pow
|
||||
|
||||
@RunWith(Parameterized::class)
|
||||
class NumberUtilsTest(private val input: Long, private val want: String) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue