Move all test utils to test package

COAND-852
Adyen · Jun 13, 2024 · 2ffd5b9 · 2ffd5b9
1 parent 75130ef
commit 2ffd5b9
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 43 deletions.
diff --git a/example-app/build.gradle b/example-app/build.gradle
@@ -42,7 +42,7 @@ android {
         versionCode version_code
         versionName version_name
 
-        testInstrumentationRunner 'com.adyen.checkout.HiltTestRunner'
+        testInstrumentationRunner 'com.adyen.checkout.test.HiltTestRunner'
     }
 
     testOptions {

diff --git a/...est/java/com/adyen/checkout/DropInTest.kt → ...a/com/adyen/checkout/dropin/DropInTest.kt b/...est/java/com/adyen/checkout/DropInTest.kt → ...a/com/adyen/checkout/dropin/DropInTest.kt
@@ -6,11 +6,11 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout
+package com.adyen.checkout.dropin
 
-import com.adyen.checkout.robot.onDropIn
-import com.adyen.checkout.robot.onMain
-import com.adyen.checkout.rule.CheckoutTestRule
+import com.adyen.checkout.test.robot.onDropIn
+import com.adyen.checkout.test.robot.onMain
+import com.adyen.checkout.test.rule.CheckoutTestRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Rule
 import org.junit.Test

diff --git a/...java/com/adyen/checkout/HiltTestRunner.kt → ...com/adyen/checkout/test/HiltTestRunner.kt b/...java/com/adyen/checkout/HiltTestRunner.kt → ...com/adyen/checkout/test/HiltTestRunner.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 19/4/2024.
  */
 
-package com.adyen.checkout
+package com.adyen.checkout.test
 
 import android.app.Application
 import android.content.Context

diff --git a/...om/adyen/checkout/di/FakeBaseUrlModule.kt → ...yen/checkout/test/di/FakeBaseUrlModule.kt b/...om/adyen/checkout/di/FakeBaseUrlModule.kt → ...yen/checkout/test/di/FakeBaseUrlModule.kt
@@ -6,11 +6,11 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.di
+package com.adyen.checkout.test.di
 
 import com.adyen.checkout.example.di.BaseUrl
 import com.adyen.checkout.example.di.NetworkModule
-import com.adyen.checkout.server.CheckoutMockWebServer
+import com.adyen.checkout.test.server.CheckoutMockWebServer
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.components.SingletonComponent

diff --git a/...en/checkout/di/FakeConfigurationModule.kt → ...eckout/test/di/FakeConfigurationModule.kt b/...en/checkout/di/FakeConfigurationModule.kt → ...eckout/test/di/FakeConfigurationModule.kt
@@ -6,11 +6,11 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.di
+package com.adyen.checkout.test.di
 
 import com.adyen.checkout.example.di.ConfigurationModule
 import com.adyen.checkout.example.ui.configuration.ConfigurationProvider
-import com.adyen.checkout.fake.FakeCheckoutConfigurationProvider
+import com.adyen.checkout.test.fake.FakeCheckoutConfigurationProvider
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.components.SingletonComponent

diff --git a/...fake/FakeCheckoutConfigurationProvider.kt → ...fake/FakeCheckoutConfigurationProvider.kt b/...fake/FakeCheckoutConfigurationProvider.kt → ...fake/FakeCheckoutConfigurationProvider.kt
@@ -6,13 +6,13 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.fake
+package com.adyen.checkout.test.fake
 
 import com.adyen.checkout.components.core.Amount
 import com.adyen.checkout.components.core.CheckoutConfiguration
 import com.adyen.checkout.core.Environment
 import com.adyen.checkout.example.ui.configuration.ConfigurationProvider
-import com.adyen.checkout.server.CheckoutMockWebServer
+import com.adyen.checkout.test.server.CheckoutMockWebServer
 import java.net.URL
 import java.util.Locale
 import javax.inject.Inject

diff --git a/...a/com/adyen/checkout/robot/DropInRobot.kt → .../adyen/checkout/test/robot/DropInRobot.kt b/...a/com/adyen/checkout/robot/DropInRobot.kt → .../adyen/checkout/test/robot/DropInRobot.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.robot
+package com.adyen.checkout.test.robot
 
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 

diff --git a/...ava/com/adyen/checkout/robot/MainRobot.kt → ...om/adyen/checkout/test/robot/MainRobot.kt b/...ava/com/adyen/checkout/robot/MainRobot.kt → ...om/adyen/checkout/test/robot/MainRobot.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.robot
+package com.adyen.checkout.test.robot
 
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 import com.adevinta.android.barista.interaction.BaristaCheckboxInteractions.check

diff --git a/...ava/com/adyen/checkout/robot/TestRobot.kt → ...om/adyen/checkout/test/robot/TestRobot.kt b/...ava/com/adyen/checkout/robot/TestRobot.kt → ...om/adyen/checkout/test/robot/TestRobot.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.robot
+package com.adyen.checkout.test.robot
 
 internal interface TestRobot {
 

diff --git a/...m/adyen/checkout/rule/CheckoutTestRule.kt → ...en/checkout/test/rule/CheckoutTestRule.kt b/...m/adyen/checkout/rule/CheckoutTestRule.kt → ...en/checkout/test/rule/CheckoutTestRule.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.rule
+package com.adyen.checkout.test.rule
 
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.adyen.checkout.example.ui.main.MainActivity
@@ -32,9 +32,9 @@ class CheckoutTestRule(
          * - Rules after ActivityScenarioRule will be executed after the activity is launched
          */
         RuleChain
-        .outerRule(hiltRule)
-        .around(MockServerRule())
-        .around(IdlingDispatcherRule())
-        .around(activityRule)
-        .apply(base, description)
+            .outerRule(hiltRule)
+            .around(MockServerRule())
+            .around(IdlingDispatcherRule())
+            .around(activityRule)
+            .apply(base, description)
 }
diff --git a/...yen/checkout/rule/IdlingDispatcherRule.kt → ...heckout/test/rule/IdlingDispatcherRule.kt b/...yen/checkout/rule/IdlingDispatcherRule.kt → ...heckout/test/rule/IdlingDispatcherRule.kt
@@ -6,11 +6,11 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.rule
+package com.adyen.checkout.test.rule
 
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.idling.CountingIdlingResource
-import com.adyen.checkout.util.IdlingResourceDispatcher
+import com.adyen.checkout.test.util.IdlingResourceDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import org.junit.rules.TestRule

diff --git a/...com/adyen/checkout/rule/MockServerRule.kt → ...dyen/checkout/test/rule/MockServerRule.kt b/...com/adyen/checkout/rule/MockServerRule.kt → ...dyen/checkout/test/rule/MockServerRule.kt
@@ -6,9 +6,9 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.rule
+package com.adyen.checkout.test.rule
 
-import com.adyen.checkout.server.CheckoutMockWebServer
+import com.adyen.checkout.test.server.CheckoutMockWebServer
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement

diff --git a/.../checkout/server/CheckoutMockWebServer.kt → ...kout/test/server/CheckoutMockWebServer.kt b/.../checkout/server/CheckoutMockWebServer.kt → ...kout/test/server/CheckoutMockWebServer.kt
@@ -3,10 +3,10 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by oscars on 5/6/2024.
+ * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server
+package com.adyen.checkout.test.server
 
 import com.adyen.checkout.core.AdyenLogLevel
 import com.adyen.checkout.core.internal.util.adyenLog

diff --git a/...out/server/DelegatingBackendDispatcher.kt → ...est/server/DelegatingBackendDispatcher.kt b/...out/server/DelegatingBackendDispatcher.kt → ...est/server/DelegatingBackendDispatcher.kt
@@ -3,16 +3,16 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by oscars on 5/6/2024.
+ * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server
+package com.adyen.checkout.test.server
 
 import com.adyen.checkout.core.AdyenLogLevel
 import com.adyen.checkout.core.internal.util.adyenLog
-import com.adyen.checkout.server.service.MockCheckoutService
-import com.adyen.checkout.server.service.MockPublicKeyService
-import com.adyen.checkout.server.service.MockSessionService
+import com.adyen.checkout.test.server.service.MockCheckoutService
+import com.adyen.checkout.test.server.service.MockPublicKeyService
+import com.adyen.checkout.test.server.service.MockSessionService
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest

diff --git a/...kout/server/service/MockBackendService.kt → ...test/server/service/MockBackendService.kt b/...kout/server/service/MockBackendService.kt → ...test/server/service/MockBackendService.kt
@@ -3,12 +3,12 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by oscars on 5/6/2024.
+ * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server.service
+package com.adyen.checkout.test.server.service
 
-import com.adyen.checkout.util.JsonFileReader
+import com.adyen.checkout.test.util.JsonFileReader
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 import java.net.HttpURLConnection.HTTP_OK

diff --git a/...out/server/service/MockCheckoutService.kt → ...est/server/service/MockCheckoutService.kt b/...out/server/service/MockCheckoutService.kt → ...est/server/service/MockCheckoutService.kt
@@ -3,10 +3,10 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by oscars on 5/6/2024.
+ * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server.service
+package com.adyen.checkout.test.server.service
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest

diff --git a/...ut/server/service/MockPublicKeyService.kt → ...st/server/service/MockPublicKeyService.kt b/...ut/server/service/MockPublicKeyService.kt → ...st/server/service/MockPublicKeyService.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server.service
+package com.adyen.checkout.test.server.service
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest

diff --git a/...kout/server/service/MockSessionService.kt → ...test/server/service/MockSessionService.kt b/...kout/server/service/MockSessionService.kt → ...test/server/service/MockSessionService.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.server.service
+package com.adyen.checkout.test.server.service
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest

diff --git a/...checkout/util/IdlingResourceDispatcher.kt → ...out/test/util/IdlingResourceDispatcher.kt b/...checkout/util/IdlingResourceDispatcher.kt → ...out/test/util/IdlingResourceDispatcher.kt
@@ -6,7 +6,7 @@
  * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.util
+package com.adyen.checkout.test.util
 
 import androidx.test.espresso.idling.CountingIdlingResource
 import kotlinx.coroutines.CoroutineDispatcher

diff --git a/...com/adyen/checkout/util/JsonFileReader.kt → ...dyen/checkout/test/util/JsonFileReader.kt b/...com/adyen/checkout/util/JsonFileReader.kt → ...dyen/checkout/test/util/JsonFileReader.kt
@@ -3,13 +3,12 @@
  *
  * This file is open source and available under the MIT license. See the LICENSE file for more info.
  *
- * Created by oscars on 5/6/2024.
+ * Created by oscars on 6/6/2024.
  */
 
-package com.adyen.checkout.util
+package com.adyen.checkout.test.util
 
 import androidx.test.platform.app.InstrumentationRegistry
-import dagger.hilt.android.testing.HiltTestApplication
 import java.io.InputStreamReader
 
 internal object JsonFileReader {