From 67ebe8de38fd5c28b9e950c655e6bffdb2bb76eb Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 11 Nov 2022 14:48:50 +0100 Subject: [PATCH] Fix spotless issues --- .../repository/fake/FakeAuthorsRepository.kt | 4 ++-- .../repository/fake/FakeNewsRepository.kt | 4 ++-- .../repository/fake/FakeTopicsRepository.kt | 4 ++-- .../main/java/JvmUnitTestFakeAssetManager.kt | 22 +++++++++---------- .../fake/FakeNiaNetworkDataSourceTest.kt | 4 ++++ 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt index 21edb4ffe..566214dd7 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt @@ -24,6 +24,8 @@ import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor +import java.io.InputStream +import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -31,8 +33,6 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import java.io.InputStream -import javax.inject.Inject /** * Fake implementation of the [AuthorsRepository] that returns hardcoded authors. diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt index 78b64d124..e9d965ae6 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt @@ -27,14 +27,14 @@ import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource +import java.io.InputStream +import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import java.io.InputStream -import javax.inject.Inject /** * Fake implementation of the [NewsRepository] that retrieves the news resources from a JSON String. diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt index bfb09439a..d8cdaa51a 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt @@ -24,6 +24,8 @@ import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic +import java.io.InputStream +import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -31,8 +33,6 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import java.io.InputStream -import javax.inject.Inject /** * Fake implementation of the [TopicsRepository] that retrieves the topics from a JSON String, and diff --git a/core/network/src/main/java/JvmUnitTestFakeAssetManager.kt b/core/network/src/main/java/JvmUnitTestFakeAssetManager.kt index d840def9f..e4b2c7faa 100644 --- a/core/network/src/main/java/JvmUnitTestFakeAssetManager.kt +++ b/core/network/src/main/java/JvmUnitTestFakeAssetManager.kt @@ -1,17 +1,17 @@ /* * Copyright 2022 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import androidx.annotation.VisibleForTesting @@ -34,10 +34,10 @@ internal object JvmUnitTestFakeAssetManager : FakeAssetManager { Missing Android resources properties file. Did you forget to enable the feature in the gradle build file? android.testOptions.unitTests.isIncludeAndroidResources = true - """.trimIndent() + """.trimIndent() } private val properties = Properties().apply { config.openStream().use(::load) } private val assets = File(properties["android_merged_assets"].toString()) override fun open(fileName: String): InputStream = File(assets, fileName).inputStream() -} \ No newline at end of file +} diff --git a/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt b/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt index 770788268..2147b8cc4 100644 --- a/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt +++ b/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt @@ -48,6 +48,7 @@ class FakeNiaNetworkDataSourceTest { @Test fun testDeserializationOfTopics() = runTest(testDispatcher) { assertEquals( + /* ktlint-disable max-line-length */ NetworkTopic( id = "1", name = "Headlines", @@ -56,6 +57,7 @@ class FakeNiaNetworkDataSourceTest { url = "", imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f" ), + /* ktlint-enable max-line-length */ subject.getTopics().first() ) } @@ -63,6 +65,7 @@ class FakeNiaNetworkDataSourceTest { @Test fun testDeserializationOfNewsResources() = runTest(testDispatcher) { assertEquals( + /* ktlint-disable max-line-length */ NetworkNewsResource( id = "125", title = "Android Basics with Compose", @@ -82,6 +85,7 @@ class FakeNiaNetworkDataSourceTest { type = Codelab, topics = listOf("2", "3", "10"), ), + /* ktlint-enable max-line-length */ subject.getNewsResources().find { it.id == "125" } ) }