From f5514cbd72a109443c4fa4d020b68d4f5edec371 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Tue, 1 Oct 2019 14:55:01 +0100
Subject: [PATCH] get instrumentation tests running successfully

---
 app/build.gradle                              | 27 ++++++++++++++++---
 app/lint-baseline.xml                         | 15 ++---------
 .../org/kiwix/kiwixmobile/BaseActivityTest.kt |  5 ++--
 .../org/kiwix/kiwixmobile/NetworkTest.java    |  4 +--
 .../{ => core}/di/components/TestComponent.kt |  5 ++--
 .../{ => core}/di/modules/TestJNIModule.java  |  2 +-
 .../di/modules/TestNetworkModule.kt           |  3 +--
 .../data/local/KiwixDatabaseTest.java         |  2 +-
 .../data/local/dao/BookDaoTest.java           |  2 +-
 .../language/LanguageActivityTest.java        |  2 +-
 .../zim_manager/ZimManageActivityTest.kt      |  1 +
 app/src/main/AndroidManifest.xml              |  2 +-
 core/build.gradle                             |  2 +-
 core/lint-baseline.xml                        |  2 +-
 .../core/ExampleInstrumentedTest.kt           | 24 -----------------
 .../core/utils/NetworkUtilsTest.kt            |  3 ++-
 custom/lint-baseline.xml                      |  4 +--
 custom/src/main/AndroidManifest.xml           |  2 +-
 18 files changed, 47 insertions(+), 60 deletions(-)
 rename app/src/androidTest/java/org/kiwix/kiwixmobile/{ => core}/di/components/TestComponent.kt (89%)
 rename app/src/androidTest/java/org/kiwix/kiwixmobile/{ => core}/di/modules/TestJNIModule.java (98%)
 rename app/src/androidTest/java/org/kiwix/kiwixmobile/{ => core}/di/modules/TestNetworkModule.kt (92%)
 delete mode 100644 core/src/androidTest/java/org/kiwix/kiwixmobile/core/ExampleInstrumentedTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index d49cfbc32..79b096b78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,6 @@ buildscript {
 
   dependencies {
     dependencies {
-
     }
   }
 }
@@ -25,8 +24,6 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'jacoco-android'
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
-
-
 def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev"
 
 ext {
@@ -148,6 +145,15 @@ android {
     }
   }
 
+  sourceSets {
+    test {
+      java.srcDirs += "$rootDir/core/src/testShared"
+    }
+
+    androidTest {
+      java.srcDirs += "$rootDir/core/src/testShared"
+    }
+  }
   compileOptions {
     encoding = "UTF-8"
     sourceCompatibility JavaVersion.VERSION_1_8
@@ -232,6 +238,9 @@ dependencies {
   androidTestCompileOnly(Libs.javax_annotation_api)
   implementation(Libs.dagger)
   kaptAndroidTest(Libs.dagger_compiler)
+  implementation(Libs.dagger_android)
+  kapt(Libs.dagger_compiler)
+  kapt(Libs.dagger_android_processor)
   androidTestImplementation(Libs.mockk_android)
   androidTestImplementation(Libs.uiautomator)
   androidTestImplementation(Libs.assertj_core)
@@ -240,4 +249,16 @@ dependencies {
     exclude module: 'stax-api'
     exclude module: 'xpp3'
   }
+
+  implementation(Libs.squidb)
+  implementation(Libs.squidb_annotations)
+  kapt(Libs.squidb_processor)
+
+  implementation(Libs.xfetch2)
+  implementation(Libs.xfetch2okhttp)
+
+  // RxJava
+  implementation(Libs.rxandroid)
+  implementation(Libs.rxjava)
+
 }
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 215bfe4b0..470a71779 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0" client="gradle" variant="debug" version="3.5.0">
+<issues format="5" by="lint 3.5.0" client="gradle" variant="all" version="3.5.0">
 
     <issue
         id="ObsoleteLintCustomCheck"
@@ -8,17 +8,6 @@
             file="..\..\..\.android\lint\customlint.jar"/>
     </issue>
 
-    <issue
-        id="MissingRegistered"
-        message="Class referenced in the manifest, `org.kiwix.kiwixmobile.zim_manager.ZimManageActivity`, was not found in the project or the libraries"
-        errorLine1="    &lt;activity"
-        errorLine2="    ^">
-        <location
-            file="src\main\AndroidManifest.xml"
-            line="143"
-            column="5"/>
-    </issue>
-
     <issue
         id="OldTargetApi"
         message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the android.os.Build.VERSION_CODES javadoc for details."
@@ -26,7 +15,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="build.gradle"
-            line="68"
+            line="63"
             column="5"/>
     </issue>
 
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/BaseActivityTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/BaseActivityTest.kt
index 4a56aea8f..05e811e4e 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/BaseActivityTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/BaseActivityTest.kt
@@ -9,7 +9,8 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import org.junit.Rule
 import org.junit.runner.RunWith
-import org.kiwix.kiwixmobile.di.components.DaggerTestComponent
+import org.kiwix.kiwixmobile.core.di.components.DaggerTestComponent
+import org.kiwix.kiwixmobile.core.di.components.TestComponent
 
 @RunWith(AndroidJUnit4::class)
 abstract class BaseActivityTest<T : Activity> {
@@ -36,7 +37,7 @@ abstract class BaseActivityTest<T : Activity> {
       }
     }
 
-  protected fun testComponent() = DaggerTestComponent.builder()
+  protected fun testComponent(): TestComponent = DaggerTestComponent.builder()
     .context(context)
     .build()
 }
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java
index 1536d69e6..eb1970bf3 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java
@@ -38,8 +38,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.core.KiwixApplication;
 import org.kiwix.kiwixmobile.core.data.ZimContentProvider;
-import org.kiwix.kiwixmobile.di.components.DaggerTestComponent;
-import org.kiwix.kiwixmobile.di.components.TestComponent;
+import org.kiwix.kiwixmobile.core.di.components.DaggerTestComponent;
+import org.kiwix.kiwixmobile.core.di.components.TestComponent;
 import org.kiwix.kiwixmobile.core.main.MainActivity;
 import org.kiwix.kiwixmobile.testutils.TestUtils;
 import org.kiwix.kiwixmobile.utils.KiwixIdlingResource;
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/components/TestComponent.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt
similarity index 89%
rename from app/src/androidTest/java/org/kiwix/kiwixmobile/di/components/TestComponent.kt
rename to app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt
index f665f282c..a40a2b5df 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/components/TestComponent.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.kiwix.kiwixmobile.di.components
+package org.kiwix.kiwixmobile.core.di.components
 
 import android.content.Context
 import dagger.BindsInstance
@@ -23,10 +23,9 @@ import dagger.Component
 import org.kiwix.kiwixmobile.NetworkTest
 import org.kiwix.kiwixmobile.ZimTest
 import org.kiwix.kiwixmobile.core.data.DataModule
-import org.kiwix.kiwixmobile.core.di.components.ApplicationComponent
 import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule
 import org.kiwix.kiwixmobile.core.di.modules.JNIModule
-import org.kiwix.kiwixmobile.di.modules.TestNetworkModule
+import org.kiwix.kiwixmobile.core.di.modules.TestNetworkModule
 import javax.inject.Singleton
 
 /**
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestJNIModule.java
similarity index 98%
rename from app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java
rename to app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestJNIModule.java
index 879a04d06..5d73ea3e2 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestJNIModule.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.kiwix.kiwixmobile.di.modules;
+package org.kiwix.kiwixmobile.core.di.modules;
 
 import dagger.Module;
 import dagger.Provides;
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestNetworkModule.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
similarity index 92%
rename from app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestNetworkModule.kt
rename to app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
index 74fb1bc54..a29cc9d7b 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/di/modules/TestNetworkModule.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
@@ -15,13 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.kiwix.kiwixmobile.di.modules
+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.kiwixmobile.core.di.modules.NetworkModule
 
 /**
  * Created by mhutti1 on 14/04/17.
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/KiwixDatabaseTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/KiwixDatabaseTest.java
index 99676a0ff..b331f47e9 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/KiwixDatabaseTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/KiwixDatabaseTest.java
@@ -35,7 +35,7 @@ import java.util.ArrayList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.core.data.local.KiwixDatabase;
-import org.kiwix.kiwixmobile.data.local.entity.Bookmark;
+import org.kiwix.kiwixmobile.core.data.local.entity.Bookmark;
 
 import static org.junit.Assert.assertArrayEquals;
 
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
index 468aff36c..c9c653129 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.core.data.local.KiwixDatabase;
 import org.kiwix.kiwixmobile.core.data.local.dao.BookDao;
-import org.kiwix.kiwixmobile.data.local.entity.BookDatabaseEntity;
+import org.kiwix.kiwixmobile.core.data.local.entity.BookDatabaseEntity;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageActivityTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageActivityTest.java
index 87d07417b..4ed073a22 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageActivityTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageActivityTest.java
@@ -32,7 +32,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity;
+import org.kiwix.kiwixmobile.core.zim_manager.ZimManageActivity;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
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 645beef31..0b752d6b5 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
@@ -13,6 +13,7 @@ import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity
 import org.kiwix.kiwixmobile.core.libraryNetworkEntity
 import org.kiwix.kiwixmobile.core.metaLinkNetworkEntity
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
+import org.kiwix.kiwixmobile.core.zim_manager.ZimManageActivity
 import java.util.concurrent.TimeUnit.SECONDS
 
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR2)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cce96824a..435150aa2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,7 +141,7 @@
       </intent-filter>
     </activity>
     <activity
-      android:name=".zim_manager.ZimManageActivity"
+      android:name=".core.zim_manager.ZimManageActivity"
       android:label="@string/choose_file"
       android:launchMode="singleTop">
       <!-- TODO -->
diff --git a/core/build.gradle b/core/build.gradle
index 3e18764f4..78b954e60 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -130,7 +130,7 @@ dependencies {
 
   // Get kiwixlib online if it is not populated locally
   if (!shouldUseLocalVersion()) {
-    implementation(Libs.kiwixlib)
+    api(Libs.kiwixlib)
   } else {
     implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
     implementation fileTree(include: ['*.aar'], dir: 'libs')
diff --git a/core/lint-baseline.xml b/core/lint-baseline.xml
index 4c5eef4f1..1b939ed45 100644
--- a/core/lint-baseline.xml
+++ b/core/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0" client="gradle" variant="debug" version="3.5.0">
+<issues format="5" by="lint 3.5.0" client="gradle" variant="all" version="3.5.0">
 
     <issue
         id="ObsoleteLintCustomCheck"
diff --git a/core/src/androidTest/java/org/kiwix/kiwixmobile/core/ExampleInstrumentedTest.kt b/core/src/androidTest/java/org/kiwix/kiwixmobile/core/ExampleInstrumentedTest.kt
deleted file mode 100644
index e635c2dc8..000000000
--- a/core/src/androidTest/java/org/kiwix/kiwixmobile/core/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.kiwix.kiwixmobile.core
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("org.kiwix.kiwixmobile.core.test", appContext.packageName)
-  }
-}
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt
index 933ef8c18..a70cc4546 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt
@@ -193,7 +193,8 @@ class NetworkUtilsTest {
     every { (context.getString(R.string.zim_no_vid)) } returns "No Videos"
     every { (context.getString(R.string.zim_simple)) } returns "Simple"
 
-    assertEquals("URL Parsing on empty string", "",
+    assertEquals(
+      "URL Parsing on empty string", "",
       NetworkUtils.parseURL(context, "")
     )
 
diff --git a/custom/lint-baseline.xml b/custom/lint-baseline.xml
index 384db6600..c09985245 100644
--- a/custom/lint-baseline.xml
+++ b/custom/lint-baseline.xml
@@ -10,7 +10,7 @@
 
     <issue
         id="MissingRegistered"
-        message="Class referenced in the manifest, `org.kiwix.kiwixmobile.zim_manager.ZimManageActivity`, was not found in the project or the libraries"
+        message="Class referenced in the manifest, `org.kiwix.kiwixmobile.core.zim_manager.ZimManageActivity`, was not found in the project or the libraries"
         errorLine1="    &lt;activity"
         errorLine2="    ^">
         <location
@@ -48,7 +48,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="build.gradle"
-            line="36"
+            line="38"
             column="5"/>
     </issue>
 
diff --git a/custom/src/main/AndroidManifest.xml b/custom/src/main/AndroidManifest.xml
index cce96824a..435150aa2 100644
--- a/custom/src/main/AndroidManifest.xml
+++ b/custom/src/main/AndroidManifest.xml
@@ -141,7 +141,7 @@
       </intent-filter>
     </activity>
     <activity
-      android:name=".zim_manager.ZimManageActivity"
+      android:name=".core.zim_manager.ZimManageActivity"
       android:label="@string/choose_file"
       android:launchMode="singleTop">
       <!-- TODO -->