テストコード更新

Author: koji-1009

studyplus-android-sdk2/build.gradle

@@ -79,6 +79,7 @@ dependencies {
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
 
     testImplementation 'junit:junit:4.12'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
 
 apply from: 'build.publish.gradle'

studyplus-android-sdk2/src/test/java/jp/studyplus/android/sdk/ApiUnitTest.kt

@@ -2,22 +2,25 @@ package jp.studyplus.android.sdk
 
 import jp.studyplus.android.sdk.internal.api.MockApiClient
 import jp.studyplus.android.sdk.record.StudyRecordBuilder
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 class ApiUnitTest {
 
     @Test
     fun mockApi() {
         val record = StudyRecordBuilder().build()
-        MockApiClient.apiClient.postStudyRecords(null, record)
-                .test()
-                .assertNoErrors()
-                .assertValue {
-                    it.recordId?.let {
-                        it == 9999L
-                    } ?: run {
-                        false
-                    }
-                }
+        runBlocking {
+            try {
+                val deferred = MockApiClient.apiClient.postStudyRecords(null, record)
+                val result = deferred.await()
+
+                assertEquals(result.recordId, 9999L)
+            } catch (t: Throwable) {
+                assertNull(t)
+            }
+        }
     }
 }

studyplus-android-sdk2/src/test/java/jp/studyplus/android/sdk/internal/api/MockApiClient.kt

@@ -1,13 +1,10 @@
 package jp.studyplus.android.sdk.internal.api
 
 import android.content.Context
-import io.reactivex.Observable
-import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
 import jp.studyplus.android.sdk.record.StudyRecord
 import retrofit2.mock.MockRetrofit
 
-internal class MockApiClient
-constructor(retrofit: MockRetrofit) {
+internal class MockApiClient constructor(retrofit: MockRetrofit) {
 
     companion object {
         val apiClient by lazy { MockApiClient(MockApiManager.retrofit) }
@@ -19,7 +16,6 @@ constructor(retrofit: MockRetrofit) {
         apiService = MockApiService(delegate)
     }
 
-    fun postStudyRecords(context: Context?, studyRecord: StudyRecord): Observable<PostStudyRecordsResponse> {
-        return apiService.postStudyRecords("", studyRecord)
-    }
+    fun postStudyRecords(context: Context?, studyRecord: StudyRecord) =
+            apiService.postStudyRecords("", studyRecord)
 }

studyplus-android-sdk2/src/test/java/jp/studyplus/android/sdk/internal/api/MockApiService.kt

@@ -1,12 +1,12 @@
 package jp.studyplus.android.sdk.internal.api
 
-import io.reactivex.Observable
 import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
 import jp.studyplus.android.sdk.record.StudyRecord
+import kotlinx.coroutines.Deferred
 import retrofit2.mock.BehaviorDelegate
 
 internal class MockApiService(private val delegate: BehaviorDelegate<ApiService>) : ApiService {
-    override fun postStudyRecords(oauth: String, studyRecord: StudyRecord): Observable<PostStudyRecordsResponse> {
+    override fun postStudyRecords(oauth: String, studyRecord: StudyRecord): Deferred<PostStudyRecordsResponse> {
         return delegate.returningResponse(PostStudyRecordsResponse(9999)).postStudyRecords(oauth, studyRecord)
     }
 }