From b132d1c615d0c10ba66f4c6948e964150974a152 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Fri, 18 Oct 2019 14:17:02 +0100
Subject: [PATCH] correct injection and mockk usage

---
 .../zim_manager/fileselect_view/effects/DeleteFiles.kt       | 5 ++---
 .../kiwixmobile/language/adapter/LanguageDelegateTest.kt     | 4 ++--
 .../language/viewmodel/SaveLanguagesAndFinishTest.kt         | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index f6ad7a216..0ac58f9dc 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -20,7 +20,6 @@ package org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects
 
 import android.app.Activity
 import org.kiwix.kiwixmobile.R
-import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.dao.NewBookDao
 import org.kiwix.kiwixmobile.core.extensions.toast
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
@@ -28,7 +27,7 @@ import org.kiwix.kiwixmobile.core.utils.DialogShower
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteZim
 import org.kiwix.kiwixmobile.core.utils.files.FileUtils
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
-import org.kiwix.kiwixmobile.kiwixActivityComponent
+import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
 import javax.inject.Inject
 
 class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
@@ -39,7 +38,7 @@ class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
   @Inject lateinit var zimReaderContainer: ZimReaderContainer
 
   override fun invokeWith(activity: Activity) {
-    (activity as BaseActivity).kiwixActivityComponent.inject(this)
+    (activity as ZimManageActivity).cachedComponent.inject(this)
     booksOnDiskListItem.forEach {
       dialogShower.show(DeleteZim(it), {
         if (deleteSpecificZimFile(it)) {
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
index 0bec3566c..b2cb7c44c 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegateTest.kt
@@ -47,7 +47,7 @@ class LanguageDelegateTest {
     fun `creates HeaderViewHolder`() {
       val parent = mockk<ViewGroup>()
       mockkObject(ViewGroupExtensions)
-      every { parent.inflate(R.layout.header_date, false) } returns mockk(relaxed = true)
+      every { parent.inflate(R.layout.header_date, false) } returns mockk()
       assertThat(HeaderDelegate().createViewHolder(parent))
         .isInstanceOf(HeaderViewHolder::class.java)
     }
@@ -64,7 +64,7 @@ class LanguageDelegateTest {
     fun `creates LanguageViewHolder`() {
       val parent = mockk<ViewGroup>()
       mockkObject(ViewGroupExtensions)
-      every { parent.inflate(R.layout.item_language, false) } returns mockk(relaxed = true)
+      every { parent.inflate(R.layout.item_language, false) } returns mockk()
       val clickAction = mockk<(LanguageItem) -> Unit>()
       assertThat(LanguageItemDelegate(clickAction).createViewHolder(parent))
         .isInstanceOf(LanguageViewHolder::class.java)
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 8fa93152a..8c432260b 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
@@ -33,8 +33,8 @@ class SaveLanguagesAndFinishTest {
   @Test
   fun `invoke saves and finishes`() {
     setScheduler(Schedulers.trampoline())
-    val languageDao = mockk<NewLanguagesDao>(relaxUnitFun = true)
-    val activity = mockk<Activity>(relaxUnitFun = true)
+    val languageDao = mockk<NewLanguagesDao>()
+    val activity = mockk<Activity>()
     val languages = listOf<Language>()
     SaveLanguagesAndFinish(languages, languageDao).invokeWith(activity)
     verify {