Convert from android library to kotlin library.

appunite · Mar 13, 2024 · af32a78 · af32a78
1 parent 74b7c06
commit af32a78
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 60 deletions.
diff --git a/app-shared-tests/build.gradle b/app-shared-tests/build.gradle
@@ -59,7 +59,7 @@ android {
 
 dependencies {
     implementation(project(":app"))
-    implementation(project(':mock-web-server-rule'))
+    implementation(project(':mock-web-server'))
 
     // Koin
     api(libs.bundles.koin)

diff --git a/app-shared-tests/src/main/java/com/appunite/loudius/AbsPullRequestsScreenTest.kt b/app-shared-tests/src/main/java/com/appunite/loudius/AbsPullRequestsScreenTest.kt
@@ -25,7 +25,6 @@ import com.appunite.loudius.ui.pullrequests.PullRequestsScreen
 import com.appunite.loudius.util.IntegrationTestRule
 import com.appunite.loudius.util.Register
 import com.appunite.loudius.util.waitUntilLoadingDoesNotExist
-import com.appunite.mockwebserverrule.MockWebServerRule
 import org.junit.Rule
 import org.junit.Test
 import org.koin.compose.KoinContext
@@ -38,7 +37,8 @@ abstract class AbsPullRequestsScreenTest {
     val integrationTestRule = IntegrationTestRule()
 
     @get:Rule(order = 1)
-    var mockWebServer: MockWebServerRule = MockWebServerRule()
+    var mockWebServer: com.appunite.mock_web_server.MockWebServerRule =
+        com.appunite.mock_web_server.MockWebServerRule()
 
     @get:Rule
     val analyticsRule = AnalyticsRule()

diff --git a/app-shared-tests/src/main/java/com/appunite/loudius/AbsReviewersScreenTest.kt b/app-shared-tests/src/main/java/com/appunite/loudius/AbsReviewersScreenTest.kt
@@ -26,7 +26,6 @@ import com.appunite.loudius.ui.reviewers.ReviewersScreen
 import com.appunite.loudius.util.IntegrationTestRule
 import com.appunite.loudius.util.Register
 import com.appunite.loudius.util.waitUntilLoadingDoesNotExist
-import com.appunite.mockwebserverrule.MockWebServerRule
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -40,7 +39,8 @@ abstract class AbsReviewersScreenTest {
     val integrationTestRule = IntegrationTestRule()
 
     @get:Rule(order = 1)
-    var mockWebServer: MockWebServerRule = MockWebServerRule()
+    var mockWebServer: com.appunite.mock_web_server.MockWebServerRule =
+        com.appunite.mock_web_server.MockWebServerRule()
 
     @get:Rule
     val analyticsRule = AnalyticsRule()

diff --git a/app-shared-tests/src/main/java/com/appunite/loudius/AbsWalkThroughAppTest.kt b/app-shared-tests/src/main/java/com/appunite/loudius/AbsWalkThroughAppTest.kt
@@ -25,14 +25,14 @@ import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.rule.IntentsRule
 import com.appunite.loudius.util.Register
-import com.appunite.mockwebserverrule.MockWebServerRule
 import org.junit.Before
 import org.junit.Rule
 
 abstract class AbsWalkThroughAppTest : UniversalWalkThroughAppTest() {
 
     @get:Rule(order = 1)
-    var mockWebServer: MockWebServerRule = MockWebServerRule()
+    var mockWebServer: com.appunite.mock_web_server.MockWebServerRule =
+        com.appunite.mock_web_server.MockWebServerRule()
 
     @get:Rule(order = 2)
     val intents = IntentsRule()

diff --git a/app-shared-tests/src/main/java/com/appunite/loudius/util/Register.kt b/app-shared-tests/src/main/java/com/appunite/loudius/util/Register.kt
@@ -16,27 +16,25 @@
 
 package com.appunite.loudius.util
 
-import com.appunite.mockwebserverrule.MockWebServerRule
-import com.appunite.mockwebserverrule.jsonResponse
-import com.appunite.mockwebserverrule.path
-import com.appunite.mockwebserverrule.queryParameter
-import com.appunite.mockwebserverrule.url
+import com.appunite.mock_web_server.path
+import com.appunite.mock_web_server.queryParameter
+import com.appunite.mock_web_server.url
 import strikt.api.expectThat
 import strikt.assertions.isEqualTo
 
 object Register {
 
-    fun user(mockWebServer: MockWebServerRule) {
+    fun user(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.path.isEqualTo("/user")
-            jsonResponse("""{"id": 1, "login": "user"}""")
+            com.appunite.mock_web_server.jsonResponse("""{"id": 1, "login": "user"}""")
         }
     }
 
-    fun accessToken(mockWebServer: MockWebServerRule) {
+    fun accessToken(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.path.isEqualTo("/login/oauth/access_token")
-            jsonResponse(
+            com.appunite.mock_web_server.jsonResponse(
                 """
                 {
                   "access_token": "example_access_token",
@@ -48,23 +46,23 @@ object Register {
         }
     }
 
-    fun reviews(mockWebServer: MockWebServerRule) {
+    fun reviews(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.and {
                 get("host") { host }.isEqualTo("api.github.com")
                 path.isEqualTo("/repos/exampleOwner/exampleRepo/pulls/1/reviews")
             }
-            jsonResponse("[]")
+            com.appunite.mock_web_server.jsonResponse("[]")
         }
     }
 
-    fun comment(mockWebServer: MockWebServerRule) {
+    fun comment(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.and {
                 get("host") { host }.isEqualTo("api.github.com")
                 path.isEqualTo("/repos/exampleOwner/exampleRepo/issues/1/comments")
             }
-            jsonResponse(
+            com.appunite.mock_web_server.jsonResponse(
                 """
                     {
                       "id": 1,
@@ -102,13 +100,13 @@ object Register {
         }
     }
 
-    fun requestedReviewers(mockWebServer: MockWebServerRule) {
+    fun requestedReviewers(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.and {
                 get("host") { host }.isEqualTo("api.github.com")
                 path.isEqualTo("/repos/exampleOwner/exampleRepo/pulls/1/requested_reviewers")
             }
-            jsonResponse(
+            com.appunite.mock_web_server.jsonResponse(
                 """
                         {
                             "users": [
@@ -140,7 +138,7 @@ object Register {
         }
     }
 
-    fun issues(mockWebServer: MockWebServerRule) {
+    fun issues(mockWebServer: com.appunite.mock_web_server.MockWebServerRule) {
         mockWebServer.register {
             expectThat(it).url.and {
                 get("host") { host }.isEqualTo("api.github.com")
@@ -150,7 +148,7 @@ object Register {
                 queryParameter("per_page").isEqualTo("100")
             }
 
-            jsonResponse(
+            com.appunite.mock_web_server.jsonResponse(
                 """
                         {
                             "total_count":1,

diff --git a/app/build.gradle b/app/build.gradle
@@ -105,7 +105,7 @@ android {
 
 dependencies {
     api project(':components')
-    implementation(project(':mock-web-server-rule'))
+    implementation(project(':mock-web-server'))
 
     // Desugaring for use of java.time in api lower then 26
     coreLibraryDesugaring(libs.desugar)

diff --git a/app/src/main/java/com/appunite/loudius/di/NetworkModule.kt b/app/src/main/java/com/appunite/loudius/di/NetworkModule.kt
@@ -20,7 +20,7 @@ import com.appunite.loudius.common.Constants
 import com.appunite.loudius.network.intercept.AuthFailureInterceptor
 import com.appunite.loudius.network.intercept.AuthInterceptor
 import com.appunite.loudius.network.utils.AuthFailureHandler
-import com.appunite.mockwebserverrule.TestInterceptor
+import com.appunite.mock_web_server.TestInterceptor
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ ktor = "2.3.7"
 ktx = "1.12.0"
 lifecycleKtx = "2.6.2"
 lottieCompose = "6.2.0"
-mockwebserver = "4.11.0"
+mockwebserver = "4.12.0"
 mockkAndroid = "1.13.5"
 okhttp3 = "4.12.0"
 robolectric = "4.10.3"

diff --git a/mock-web-server/.gitignore b/mock-web-server/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/mock-web-server/build.gradle.kts b/mock-web-server/build.gradle.kts
@@ -0,0 +1,23 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    id("java-library")
+    alias(libs.plugins.kotlin.jvm)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+dependencies {
+    implementation(libs.bundles.okhttp)
+    implementation(libs.bundles.mock)
+    implementation(libs.bundles.strikt)
+    implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
+
+    testImplementation(libs.junit)
+}
diff --git a/.../appunite/mockwebserverrule/Assertions.kt → ...om/appunite/mock_web_server/Assertions.kt b/.../appunite/mockwebserverrule/Assertions.kt → ...om/appunite/mock_web_server/Assertions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.appunite.mockwebserverrule
+package com.appunite.mock_web_server
 
 import okhttp3.Headers
 import okhttp3.HttpUrl
@@ -24,15 +24,19 @@ import okio.Buffer
 import strikt.api.Assertion
 import strikt.assertions.isNotNull
 
-inline val Assertion.Builder<Request>.url: Assertion.Builder<HttpUrl> get() = get(Request::url)
-inline val Assertion.Builder<Request>.method: Assertion.Builder<String> get() = get(Request::method)
+inline val Assertion.Builder<com.appunite.mock_web_server.Request>.url: Assertion.Builder<HttpUrl> get() = get(
+    com.appunite.mock_web_server.Request::url)
+inline val Assertion.Builder<com.appunite.mock_web_server.Request>.method: Assertion.Builder<String> get() = get(
+    com.appunite.mock_web_server.Request::method)
 
 @get:JvmName("requestBody")
-inline val Assertion.Builder<Request>.body: Assertion.Builder<Buffer> get() = get(Request::body)
+inline val Assertion.Builder<com.appunite.mock_web_server.Request>.body: Assertion.Builder<Buffer> get() = get(
+    com.appunite.mock_web_server.Request::body)
 inline val Assertion.Builder<Buffer>.utf8: Assertion.Builder<String> get() = get("utf8 string") { readUtf8() }
 
 @get:JvmName("requestHeaders")
-inline val Assertion.Builder<Request>.headers: Assertion.Builder<Headers> get() = get(Request::headers)
+inline val Assertion.Builder<com.appunite.mock_web_server.Request>.headers: Assertion.Builder<Headers> get() = get(
+    com.appunite.mock_web_server.Request::headers)
 inline val Assertion.Builder<Response>.code: Assertion.Builder<Int> get() = get("code") { code }
 
 @get:JvmName("responseBody")

diff --git a/...te/mockwebserverrule/MockWebServerRule.kt → ...nite/mock_web_server/MockWebServerRule.kt b/...te/mockwebserverrule/MockWebServerRule.kt → ...nite/mock_web_server/MockWebServerRule.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.appunite.mockwebserverrule
+package com.appunite.mock_web_server
 
-import android.util.Log
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -33,6 +33,7 @@ import org.junit.runner.Description
 import org.junit.runners.model.Statement
 
 private const val TAG = "MockWebServerRule"
+private val logger = KotlinLogging.logger {}
 
 class Request(
     val headers: Headers,
@@ -60,7 +61,9 @@ class MockWebServerRule : TestRule {
                 MockWebServer().use { server ->
                     server.dispatcher = dispatcher
                     TestInterceptor.testInterceptor = UrlOverrideInterceptor(server.url("/"))
-                    Log.v(TAG, "TestInterceptor installed")
+                    logger.info {
+                        TAG + "TestInterceptor installed"
+                    }
                     try {
                         base.evaluate()
                     } catch (e: Throwable) {
@@ -76,7 +79,9 @@ class MockWebServerRule : TestRule {
                             )
                         }
                     } finally {
-                        Log.v(TAG, "TestInterceptor uninstalled")
+                        logger.info {
+                            TAG + "TestInterceptor uninstalled"
+                        }
                         TestInterceptor.testInterceptor = null
                     }
                 }
@@ -137,7 +142,9 @@ private class MockDispatcher : Dispatcher() {
             return runMocks(mockRequest)
         } catch (e: Throwable) {
             errors.add(e)
-            Log.w(TAG, e.message!!)
+            logger.warn {
+                TAG + e.message!!
+            }
             return MockResponse().setResponseCode(404)
         }
     }

diff --git a/...nite/mockwebserverrule/TestInterceptor.kt → ...punite/mock_web_server/TestInterceptor.kt b/...nite/mockwebserverrule/TestInterceptor.kt → ...punite/mock_web_server/TestInterceptor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.appunite.mockwebserverrule
+package com.appunite.mock_web_server
 
 import okhttp3.Interceptor
 import okhttp3.Response

diff --git a/...ockwebserverrule/MockWebServerRuleTest.kt → .../mock_web_server/MockWebServerRuleTest.kt b/...ockwebserverrule/MockWebServerRuleTest.kt → .../mock_web_server/MockWebServerRuleTest.kt
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package com.appunite.mockwebserverrule
+package com.appunite.mock_web_server
 
-
-import android.util.Log
 import io.mockk.CapturingSlot
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
 import io.mockk.slot
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -33,7 +30,6 @@ import org.hamcrest.TypeSafeMatcher
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
-import org.junit.rules.TestWatcher
 import strikt.api.expectThat
 import strikt.assertions.contains
 import strikt.assertions.first
@@ -52,9 +48,6 @@ class MockWebServerRuleTest {
     @get:Rule(order = 0)
     val expectedException: ExpectedException = ExpectedException.none()
 
-    @get:Rule(order = 1)
-    val loggerMockRule: LoggerMockRule = LoggerMockRule()
-
     @get:Rule(order = 2)
     val mockWebServerRule: MockWebServerRule = MockWebServerRule()
 
@@ -214,7 +207,6 @@ class MockWebServerRuleTest {
         val slot = executeRequestAndGetMockedArgumentRequest {
             it.addHeader("Accept", "application/json")
         }
-
         expectThat(slot).captured.headers.header("Accept").isEqualTo("application/json")
     }
 
@@ -307,15 +299,3 @@ private fun <T> matcher(check: (T) -> Unit): Matcher<T> = object : TypeSafeMatch
         }
     }
 }
-
-class LoggerMockRule : TestWatcher() {
-    override fun starting(description: org.junit.runner.Description?) {
-        mockkStatic(Log::class)
-        every { Log.v(any(), any()) } returns 0
-        every { Log.v(any(), any(), any()) } returns 0
-        every { Log.w(any(), any<String>()) } returns 0
-        every { Log.w(any(), any<Throwable>()) } returns 0
-        every { Log.w(any(), any(), any()) } returns 0
-    }
-}
-
diff --git a/settings.gradle b/settings.gradle
@@ -22,4 +22,4 @@ include ':app'
 include ':custom-ktlint-rules'
 include ':components'
 include ':app-shared-tests'
-include ':mock-web-server-rule'
+include ':mock-web-server'