From 381e2bd9d81737a2b5de4a111ed23b8251aebb01 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 16 Oct 2019 14:27:37 +0100
Subject: [PATCH] Fix ktlint error around sourceset shared across modules

---
 .travis.yml                                    |  2 +-
 app/build.gradle                               |  3 ++-
 .../org/kiwix/kiwixmobile/KiwixMockServer.kt   |  2 +-
 .../core/di/modules/TestNetworkModule.kt       |  2 +-
 .../zim_manager/ZimManageActivityTest.kt       |  8 ++++----
 .../viewmodel/LanguageViewModelTest.kt         |  8 ++++----
 .../viewmodel/SaveLanguagesAndFinishTest.kt    |  4 ++--
 .../language/viewmodel/StateTest.kt            |  2 +-
 .../zim_manager/ZimManageViewModelTest.kt      | 18 +++++++++---------
 .../main/kotlin/plugin/AllProjectConfigurer.kt |  2 +-
 .../InstantExecutorExtension.kt                |  2 +-
 .../kiwix/sharedFunctions}/TestConstants.kt    |  2 +-
 .../sharedFunctions}/TestModelFunctions.kt     |  2 +-
 .../sharedFunctions}/TestUtilitiyFunctions.kt  |  2 +-
 .../kiwixmobile/core/StorageObserverTest.kt    |  8 ++++----
 .../core/utils/files/FileSearchTest.kt         |  4 ++--
 .../core/zim_manager/LanguageTest.kt           |  2 +-
 17 files changed, 37 insertions(+), 36 deletions(-)
 rename core/src/{testShared/org/kiwix/kiwixmobile/core => sharedTestFunctions/java/org/kiwix/sharedFunctions}/InstantExecutorExtension.kt (97%)
 rename core/src/{testShared/org/kiwix/kiwixmobile/core => sharedTestFunctions/java/org/kiwix/sharedFunctions}/TestConstants.kt (95%)
 rename core/src/{testShared/org/kiwix/kiwixmobile/core => sharedTestFunctions/java/org/kiwix/sharedFunctions}/TestModelFunctions.kt (99%)
 rename core/src/{testShared/org/kiwix/kiwixmobile/core => sharedTestFunctions/java/org/kiwix/sharedFunctions}/TestUtilitiyFunctions.kt (97%)

diff --git a/.travis.yml b/.travis.yml
index 2305ea9ff..209e8814f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ before_script:
   - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew createDebugCoverageReport lint jacocoTestReport app:assembleRelease
+  - ./gradlew createDebugCoverageReport ktlintCheck lint jacocoTestReport app:assembleRelease
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/app/build.gradle b/app/build.gradle
index 5e57c622d..af3a54086 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,9 +92,10 @@ android {
           variant.versionCode
     }
   }
+
   sourceSets {
     androidTest {
-      java.srcDirs += "$rootDir/core/src/testShared"
+      java.srcDirs += "$rootDir/core/src/sharedTestFunctions/java"
     }
   }
 }
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
index e20614f21..b0c3b455c 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
@@ -22,7 +22,7 @@ import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
-import org.kiwix.kiwixmobile.core.TEST_PORT
+import org.kiwix.sharedFunctions.TEST_PORT
 import org.simpleframework.xml.core.Persister
 import java.io.StringWriter
 import java.util.Stack
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
index c69be62bf..262af5ada 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
@@ -19,8 +19,8 @@ package org.kiwix.kiwixmobile.core.di.modules
 
 import dagger.Module
 import okhttp3.OkHttpClient
-import org.kiwix.kiwixmobile.core.MOCK_BASE_URL
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService
+import org.kiwix.sharedFunctions.MOCK_BASE_URL
 
 /**
  * Created by mhutti1 on 14/04/17.
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
index 2bada33c8..691e75f1c 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
@@ -23,14 +23,14 @@ import androidx.test.filters.SdkSuppress
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
-import org.kiwix.kiwixmobile.core.CoreApp
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.libraryNetworkEntity
-import org.kiwix.kiwixmobile.core.metaLinkNetworkEntity
 import org.kiwix.kiwixmobile.KiwixMockServer
+import org.kiwix.kiwixmobile.core.CoreApp
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService.LIBRARY_NETWORK_PATH
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.libraryNetworkEntity
+import org.kiwix.sharedFunctions.metaLinkNetworkEntity
 import java.util.concurrent.TimeUnit.SECONDS
 
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR2)
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
index 9aa21100b..a48ae132d 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
@@ -30,11 +30,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.api.extension.ExtendWith
-import org.kiwix.kiwixmobile.core.InstantExecutorExtension
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
-import org.kiwix.kiwixmobile.core.language
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.zim_manager.Language
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem
 import org.kiwix.kiwixmobile.language.viewmodel.Action.Filter
@@ -44,6 +40,10 @@ import org.kiwix.kiwixmobile.language.viewmodel.Action.UpdateLanguages
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
 import org.kiwix.kiwixmobile.language.viewmodel.State.Loading
 import org.kiwix.kiwixmobile.language.viewmodel.State.Saving
+import org.kiwix.sharedFunctions.InstantExecutorExtension
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
+import org.kiwix.sharedFunctions.language
 
 fun languageItem(language: Language = language()) =
   LanguageListItem.LanguageItem(language)
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
index cb2ef206d..8fa93152a 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
@@ -24,9 +24,9 @@ import io.mockk.verify
 import io.reactivex.schedulers.Schedulers
 import org.junit.jupiter.api.Test
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.zim_manager.Language
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 
 class SaveLanguagesAndFinishTest {
 
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
index 3178ef6f0..abb258569 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
@@ -21,10 +21,10 @@ package org.kiwix.kiwixmobile.language.viewmodel
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.language
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.HeaderItem
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.LanguageItem
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
+import org.kiwix.sharedFunctions.language
 
 class StateTest {
   @Nested
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
index 44eac875b..5a3e7e3f7 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
@@ -35,24 +35,15 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.api.extension.ExtendWith
-import org.kiwix.kiwixmobile.core.InstantExecutorExtension
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.StorageObserver
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.bookOnDisk
 import org.kiwix.kiwixmobile.core.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.core.dao.NewBookDao
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
 import org.kiwix.kiwixmobile.core.data.DataSource
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService
-import org.kiwix.kiwixmobile.core.downloadItem
-import org.kiwix.kiwixmobile.core.downloadModel
 import org.kiwix.kiwixmobile.core.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
-import org.kiwix.kiwixmobile.core.language
-import org.kiwix.kiwixmobile.core.libraryNetworkEntity
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.utils.BookUtils
 import org.kiwix.kiwixmobile.core.zim_manager.Language
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
@@ -64,6 +55,15 @@ import org.kiwix.kiwixmobile.zim_manager.NetworkState.CONNECTED
 import org.kiwix.kiwixmobile.zim_manager.NetworkState.NOT_CONNECTED
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.FileSelectListState
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem
+import org.kiwix.sharedFunctions.InstantExecutorExtension
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.bookOnDisk
+import org.kiwix.sharedFunctions.downloadItem
+import org.kiwix.sharedFunctions.downloadModel
+import org.kiwix.sharedFunctions.language
+import org.kiwix.sharedFunctions.libraryNetworkEntity
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.util.Locale
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.util.concurrent.TimeUnit.SECONDS
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 469245adc..42a6fee01 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -119,7 +119,7 @@ class AllProjectConfigurer {
         exclude("META-INF/ASL2.0")
       }
       sourceSets {
-        getByName("test").java.srcDir("${target.rootDir}/core/src/testShared")
+        getByName("test").java.srcDir("${target.rootDir}/core/src/sharedTestFunctions/java")
       }
     }
   }
diff --git a/core/src/testShared/org/kiwix/kiwixmobile/core/InstantExecutorExtension.kt b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/InstantExecutorExtension.kt
similarity index 97%
rename from core/src/testShared/org/kiwix/kiwixmobile/core/InstantExecutorExtension.kt
rename to core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/InstantExecutorExtension.kt
index 7c6ac2d4b..9de5ba0ab 100644
--- a/core/src/testShared/org/kiwix/kiwixmobile/core/InstantExecutorExtension.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/InstantExecutorExtension.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions
 
 import androidx.arch.core.executor.ArchTaskExecutor
 import androidx.arch.core.executor.TaskExecutor
diff --git a/core/src/testShared/org/kiwix/kiwixmobile/core/TestConstants.kt b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestConstants.kt
similarity index 95%
rename from core/src/testShared/org/kiwix/kiwixmobile/core/TestConstants.kt
rename to core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestConstants.kt
index 85d445ac5..e3f015164 100644
--- a/core/src/testShared/org/kiwix/kiwixmobile/core/TestConstants.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestConstants.kt
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions
 
 const val TEST_PORT = 8080
 const val MOCK_BASE_URL = "http://localhost:$TEST_PORT/"
diff --git a/core/src/testShared/org/kiwix/kiwixmobile/core/TestModelFunctions.kt b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestModelFunctions.kt
similarity index 99%
rename from core/src/testShared/org/kiwix/kiwixmobile/core/TestModelFunctions.kt
rename to core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestModelFunctions.kt
index a59bd9c99..6c997d949 100644
--- a/core/src/testShared/org/kiwix/kiwixmobile/core/TestModelFunctions.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestModelFunctions.kt
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions
 
 import com.tonyodev.fetch2.Error
 import com.tonyodev.fetch2.Status
diff --git a/core/src/testShared/org/kiwix/kiwixmobile/core/TestUtilitiyFunctions.kt b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestUtilitiyFunctions.kt
similarity index 97%
rename from core/src/testShared/org/kiwix/kiwixmobile/core/TestUtilitiyFunctions.kt
rename to core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestUtilitiyFunctions.kt
index a22b4d0aa..ba753baf9 100644
--- a/core/src/testShared/org/kiwix/kiwixmobile/core/TestUtilitiyFunctions.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestUtilitiyFunctions.kt
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions
 
 import io.reactivex.Scheduler
 import io.reactivex.android.plugins.RxAndroidPlugins
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
index 4850aa837..8e1a95e04 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
@@ -27,16 +27,16 @@ import io.reactivex.schedulers.Schedulers
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.bookOnDisk
 import org.kiwix.kiwixmobile.core.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.core.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Factory
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.core.utils.files.FileSearch
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.bookOnDisk
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.io.File
 
 class StorageObserverTest {
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt
index 2d14860c9..0ddc09124 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.io.File
 
 class FileSearchTest {
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
index 734e2090a..b3b0fd747 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
@@ -40,7 +40,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.language
+import org.kiwix.sharedFunctions.language
 
 class LanguageTest {