Merge remote-tracking branch 'origin/master' into development

Author: haroldadmin

.github/workflows/gradle.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -13,5 +13,5 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Build with Gradle
-      run: ./gradlew build
+    - name: Build and Test
+      run: ./gradlew clean test

src/test/kotlin/com/haroldadmin/cnradapter/ErrorExtractionTest.kt

@@ -3,18 +3,17 @@ package com.haroldadmin.cnradapter
 import io.kotlintest.matchers.types.shouldBeSameInstanceAs
 import io.kotlintest.matchers.types.shouldBeTypeOf
 import io.kotlintest.shouldBe
+import io.kotlintest.specs.AnnotationSpec
 import okhttp3.Headers
 import okhttp3.ResponseBody
 import retrofit2.HttpException
 import retrofit2.Response
 import okhttp3.ResponseBody.Companion.toResponseBody
-import org.junit.Test
 import retrofit2.Converter
-import retrofit2.http.Header
 import java.io.IOException
 import java.lang.Exception
 
-internal class ErrorExtractionTest {
+internal class ErrorExtractionTest: AnnotationSpec() {
 
     private val errorConverter = Converter<ResponseBody, String> { responseBody -> responseBody.toString() }
 
@@ -48,9 +47,14 @@ internal class ErrorExtractionTest {
 
     private class CustomException: Exception()
 
-    @Test(expected = CustomException::class)
+    @Test
     fun `extract error from an unknown exception test`() {
         val exception = CustomException()
-        exception.extractNetworkResponse<String, String>(errorConverter)
+        val response = exception.extractNetworkResponse<String, String>(errorConverter)
+        with(response) {
+            shouldBeTypeOf<NetworkResponse.UnknownError>()
+            this as NetworkResponse.UnknownError
+            this.error shouldBe exception
+        }
     }
 }

src/test/kotlin/com/haroldadmin/cnradapter/MoshiApplicationTest.kt

@@ -6,11 +6,11 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import io.kotlintest.matchers.string.shouldContain
 import io.kotlintest.matchers.types.shouldBeInstanceOf
+import io.kotlintest.specs.AnnotationSpec
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Test
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
@@ -74,7 +74,7 @@ internal class TestApplication(
 
 }
 
-internal class MoshiApplicationTest {
+internal class MoshiApplicationTest: AnnotationSpec() {
 
     private val moshi = Moshi.Builder()
         .add(KotlinJsonAdapterFactory())

src/test/kotlin/com/haroldadmin/cnradapter/NetworkResponseCallTest.kt

@@ -6,16 +6,23 @@ import com.haroldadmin.cnradapter.NetworkResponseCall
 import io.kotlintest.matchers.types.shouldBeTypeOf
 import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
 import io.kotlintest.shouldBe
+import io.kotlintest.specs.AnnotationSpec
 import okhttp3.ResponseBody
 import okhttp3.ResponseBody.Companion.toResponseBody
-import org.junit.Test
 import retrofit2.*
 import java.io.IOException
 
-internal class NetworkResponseCallTest {
+internal class NetworkResponseCallTest: AnnotationSpec() {
     private val errorConverter = Converter<ResponseBody, String> { it.string() }
-    private val backingCall = CompletableCall<String>()
-    private val networkResponseCall = NetworkResponseCall<String, String>(backingCall, errorConverter)
+
+    private lateinit var backingCall: CompletableCall<String>
+    private lateinit var networkResponseCall: NetworkResponseCall<String, String>
+
+    @Before
+    fun setup() {
+        backingCall = CompletableCall<String>()
+        networkResponseCall = NetworkResponseCall<String, String>(backingCall, errorConverter)
+    }
 
     @Test(expected = UnsupportedOperationException::class)
     fun `should throw an error when invoking 'execute'`() {

src/test/kotlin/com/haroldadmin/cnradapter/SuspendTest.kt

@@ -3,18 +3,16 @@ package com.haroldadmin.cnradapter
 import io.kotlintest.matchers.types.shouldBeTypeOf
 import io.kotlintest.shouldBe
 import io.kotlintest.shouldNotBe
+import io.kotlintest.specs.AnnotationSpec
 import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.SocketPolicy
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
 import retrofit2.Retrofit
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
-class SuspendTest {
+internal class SuspendTest: AnnotationSpec() {
 
     private lateinit var server: MockWebServer
     private lateinit var executor: ExecutorService
@@ -71,7 +69,7 @@ class SuspendTest {
             shouldBeTypeOf<NetworkResponse.ServerError<String>>()
             this as NetworkResponse.ServerError
             code shouldBe responseCode
-            body shouldBe null
+            body.isNullOrBlank() shouldBe true
             headers!!["TEST"] shouldBe "test"
         }
     }
@@ -83,6 +81,24 @@ class SuspendTest {
         response.shouldBeTypeOf<NetworkResponse.NetworkError>()
     }
 
+    // Ignore this test because someone else wants to work on solving this issue:
+    // https://github.com/haroldadmin/NetworkResponseAdapter/issues/9
+    @Test
+    @Ignore
+    fun `successful response with empty body`() {
+        val successResponseCode = 204
+        server.enqueue(MockResponse().apply {
+            setResponseCode(successResponseCode)
+        })
+        val response = runBlocking { service.getTextSuspend() }
+
+        with(response) {
+            shouldBeTypeOf<NetworkResponse.Success<String>>()
+            this as NetworkResponse.Success
+            body shouldBe null
+        }
+    }
+
     @After
     fun cleanup() {
         server.close()