From 8d33f77cec99ad0d4a36e07662d65d45be5726eb Mon Sep 17 00:00:00 2001
From: Gergely Hegedus <hegedusgergely@yahoo.com>
Date: Wed, 26 Jan 2022 22:33:40 +0200
Subject: [PATCH] Issue#13 Remove BaseUrlProvider

---
 .../test/showcase/TestShowcaseApplication.kt  |  5 ++--
 .../test/showcase/di/BaseUrlProvider.kt       |  9 -------
 .../test/showcase/di/BaseUrlProvider.kt       |  9 -------
 .../ReloadKoinModulesIfNecessaryTestRule.kt   | 24 +++++++------------
 4 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/main/java/org/fnives/test/showcase/di/BaseUrlProvider.kt
 delete mode 100644 app/src/sharedTest/java/org/fnives/test/showcase/di/BaseUrlProvider.kt

diff --git a/app/src/main/java/org/fnives/test/showcase/TestShowcaseApplication.kt b/app/src/main/java/org/fnives/test/showcase/TestShowcaseApplication.kt
index 60b05b4..5e63e64 100644
--- a/app/src/main/java/org/fnives/test/showcase/TestShowcaseApplication.kt
+++ b/app/src/main/java/org/fnives/test/showcase/TestShowcaseApplication.kt
@@ -1,8 +1,8 @@
 package org.fnives.test.showcase
 
 import android.app.Application
-import org.fnives.test.showcase.di.BaseUrlProvider
 import org.fnives.test.showcase.di.createAppModules
+import org.fnives.test.showcase.model.network.BaseUrl
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
@@ -10,9 +10,10 @@ class TestShowcaseApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        val baseUrl = BaseUrl(BuildConfig.BASE_URL)
         startKoin {
             androidContext(this@TestShowcaseApplication)
-            modules(createAppModules(BaseUrlProvider.get()))
+            modules(createAppModules(baseUrl))
         }
     }
 }
diff --git a/app/src/main/java/org/fnives/test/showcase/di/BaseUrlProvider.kt b/app/src/main/java/org/fnives/test/showcase/di/BaseUrlProvider.kt
deleted file mode 100644
index 9b5e5ba..0000000
--- a/app/src/main/java/org/fnives/test/showcase/di/BaseUrlProvider.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.fnives.test.showcase.di
-
-import org.fnives.test.showcase.BuildConfig
-import org.fnives.test.showcase.model.network.BaseUrl
-
-object BaseUrlProvider {
-
-    fun get() = BaseUrl(BuildConfig.BASE_URL)
-}
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/di/BaseUrlProvider.kt b/app/src/sharedTest/java/org/fnives/test/showcase/di/BaseUrlProvider.kt
deleted file mode 100644
index 4be8d81..0000000
--- a/app/src/sharedTest/java/org/fnives/test/showcase/di/BaseUrlProvider.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.fnives.test.showcase.di
-
-import org.fnives.test.showcase.model.network.BaseUrl
-import org.fnives.test.showcase.testutils.configuration.SpecificTestConfigurationsFactory
-
-object BaseUrlProvider {
-
-    fun get() = BaseUrl(SpecificTestConfigurationsFactory.createServerTypeConfiguration().url)
-}
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/ReloadKoinModulesIfNecessaryTestRule.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/ReloadKoinModulesIfNecessaryTestRule.kt
index 50b1427..b3d7c6b 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/ReloadKoinModulesIfNecessaryTestRule.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/ReloadKoinModulesIfNecessaryTestRule.kt
@@ -1,29 +1,23 @@
 package org.fnives.test.showcase.testutils
 
-import androidx.test.core.app.ApplicationProvider
-import org.fnives.test.showcase.TestShowcaseApplication
-import org.fnives.test.showcase.di.BaseUrlProvider
-import org.fnives.test.showcase.di.createAppModules
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.GlobalContext
-import org.koin.core.context.startKoin
 import org.koin.core.context.stopKoin
 
 class ReloadKoinModulesIfNecessaryTestRule : TestRule {
     override fun apply(base: Statement, description: Description): Statement =
         object : Statement() {
             override fun evaluate() {
-                if (GlobalContext.getOrNull() == null) {
-                    val application =
-                        ApplicationProvider.getApplicationContext<TestShowcaseApplication>()
-                    startKoin {
-                        androidContext(application)
-                        modules(createAppModules(BaseUrlProvider.get()))
-                    }
-                }
+                // TODO
+//                if (GlobalContext.getOrNull() == null) {
+//                    val application =
+//                        ApplicationProvider.getApplicationContext<TestShowcaseApplication>()
+//                    startKoin {
+//                        androidContext(application)
+//                        modules(createAppModules(BaseUrlProvider.get()))
+//                    }
+//                }
                 try {
                     base.evaluate()
                 } finally {