From e904be79fccc1eb0f68916d180161c4b2b9f8046 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 09:06:56 +0900 Subject: [PATCH 1/6] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/multim/TestUtil.kt | 19 +++++++++++++------ .../multim/{ => misskey}/v12/api/ApTest.kt | 3 +-- .../{ => misskey}/v12/api/MiauthTest.kt | 2 +- .../multim/{ => misskey}/v12/api/NotesTest.kt | 4 +--- .../v12/common}/api/MisskeyAccountApiTest.kt | 6 +++--- .../v12/common/api/MisskeyStatusApiTest.kt | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) rename impl/misskey/src/test/kotlin/dev/usbharu/multim/{ => misskey}/v12/api/ApTest.kt (97%) rename impl/misskey/src/test/kotlin/dev/usbharu/multim/{ => misskey}/v12/api/MiauthTest.kt (93%) rename impl/misskey/src/test/kotlin/dev/usbharu/multim/{ => misskey}/v12/api/NotesTest.kt (99%) rename impl/misskey/src/test/kotlin/dev/usbharu/multim/{ => misskey/v12/common}/api/MisskeyAccountApiTest.kt (98%) rename impl/misskey/src/test/kotlin/dev/usbharu/multim/{ => misskey}/v12/common/api/MisskeyStatusApiTest.kt (97%) diff --git a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt index b550214..a5b9d5f 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt @@ -1,9 +1,7 @@ package dev.usbharu.multim -import com.github.michaelbull.result.Err -import com.github.michaelbull.result.Ok -import com.github.michaelbull.result.Result -import com.github.michaelbull.result.getError +import com.github.michaelbull.result.* +import dev.usbharu.multim.error.MultiMResult import io.ktor.client.* import io.ktor.client.engine.mock.* import io.ktor.client.plugins.contentnegotiation.* @@ -12,8 +10,8 @@ import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject -import org.assertj.core.api.Fail.fail import org.junit.jupiter.api.Assertions.assertInstanceOf +import org.junit.jupiter.api.fail object TestUtil { @@ -67,7 +65,7 @@ object TestUtil { respond(respond, status, headers) } else { fail("Not authed") - respondBadRequest() +// respondBadRequest() } } } @@ -81,4 +79,13 @@ object TestUtil { assertInstanceOf(Err::class.java, result, "resultの型がErrではない") assertInstanceOf(R::class.java, result.getError(), "Errorの型が違う") } + + fun MultiMResult.failOnError(): T { + val get = this.get() + if (get != null) { + return get + } + val error = this.getError()!! + fail("Return Error", error.throwable) + } } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt similarity index 97% rename from impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt index fb73d20..2f9a43d 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/ApTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt @@ -1,13 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class, ExperimentalCoroutinesApi::class) -package dev.usbharu.multim.v12.api +package dev.usbharu.multim.misskey.v12.api import MisskeyTestUtil.createFakeNoteToString import MisskeyTestUtil.createMockHttpClient import MisskeyTestUtil.json import com.github.michaelbull.result.get import dev.usbharu.multim.api.createHttpClient -import dev.usbharu.multim.misskey.v12.api.Ap import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.ApShowRequest import dev.usbharu.multim.misskey.v12.model.ApShowResponse diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MiauthTest.kt similarity index 93% rename from impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MiauthTest.kt index 8404e97..2a49a9a 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/MiauthTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MiauthTest.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.v12.api +package dev.usbharu.multim.misskey.v12.api import kotlinx.coroutines.* import kotlinx.coroutines.test.runTest diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt similarity index 99% rename from impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt index c055102..367c553 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/api/NotesTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt @@ -1,14 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.multim.v12.api +package dev.usbharu.multim.misskey.v12.api import MisskeyTestUtil.createFakeNote import MisskeyTestUtil.createMockHttpClient import MisskeyTestUtil.json import com.github.michaelbull.result.* import dev.usbharu.multim.api.createHttpClient -import dev.usbharu.multim.misskey.v12.api.Drive -import dev.usbharu.multim.misskey.v12.api.Notes import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.* import dev.usbharu.multim.model.SingleTokenAuth diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/api/MisskeyAccountApiTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApiTest.kt similarity index 98% rename from impl/misskey/src/test/kotlin/dev/usbharu/multim/api/MisskeyAccountApiTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApiTest.kt index f03fee5..7ae35c9 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/api/MisskeyAccountApiTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApiTest.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.api +package dev.usbharu.multim.misskey.v12.common.api import com.github.michaelbull.result.get import com.github.michaelbull.result.getError @@ -6,13 +6,13 @@ import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import dev.usbharu.multim.Logger import dev.usbharu.multim.MultiM +import dev.usbharu.multim.api.AccountApi +import dev.usbharu.multim.api.AccountApiTest import dev.usbharu.multim.error.MultiMHttpError import dev.usbharu.multim.error.MultiMResult import dev.usbharu.multim.misskey.v12.api.MisskeyApis import dev.usbharu.multim.misskey.v12.common.MisskeyAccount import dev.usbharu.multim.misskey.v12.common.MisskeyAvatar -import dev.usbharu.multim.misskey.v12.common.api.MisskeyAccountApi -import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.model.SingleTokenAuth import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt similarity index 97% rename from impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt rename to impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt index 248dbbd..934405a 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/v12/common/api/MisskeyStatusApiTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt @@ -1,4 +1,4 @@ -package dev.usbharu.multim.v12.common.api +package dev.usbharu.multim.misskey.v12.common.api import MisskeyTestUtil import com.github.michaelbull.result.get From 952cbbf4fba594ab9b135e2a65fba1df3dce17dd Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 09:46:43 +0900 Subject: [PATCH 2/6] =?UTF-8?q?test:=20=E3=81=8A=E3=81=8B=E3=81=97?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/usbharu/multim/api/ApiClient.kt | 2 +- .../kotlin/dev/usbharu/multim/TestUtil.kt | 2 +- .../usbharu/multim/misskey/v12/api/ApTest.kt | 9 +- .../multim/misskey/v12/api/MetaTest.kt | 4 +- .../multim/misskey/v12/api/NotesTest.kt | 177 +++++++++--------- .../multim/misskey/v12/api/TimelineTest.kt | 11 +- 6 files changed, 104 insertions(+), 101 deletions(-) diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/ApiClient.kt b/core/src/main/kotlin/dev/usbharu/multim/api/ApiClient.kt index e57c060..e866b3f 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/ApiClient.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/ApiClient.kt @@ -66,7 +66,7 @@ abstract class ApiClient(var baseUrl: String, val client: HttpClient) { } catch (e: ServerResponseException) { return Err(HttpClientServerError(e)) } - Logger.warn(post.bodyAsText()) +// Logger.warn(post.bodyAsText()) return runCatching { post.body() }.fold( onSuccess = { Ok(it) }, onFailure = { diff --git a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt index a5b9d5f..4f66c3d 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt @@ -86,6 +86,6 @@ object TestUtil { return get } val error = this.getError()!! - fail("Return Error", error.throwable) + fail("Return Error ${error.message}", error.throwable) } } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt index 2f9a43d..36ff675 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt @@ -6,6 +6,7 @@ import MisskeyTestUtil.createFakeNoteToString import MisskeyTestUtil.createMockHttpClient import MisskeyTestUtil.json import com.github.michaelbull.result.get +import dev.usbharu.multim.TestUtil.failOnError import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.ApShowRequest @@ -48,7 +49,7 @@ class ApTest { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth("aaaaaaaa"), "https://localhost", createMockHttpClient(typeUser) ) - val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/IN7OFhht")).get() + val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/IN7OFhht")).failOnError() assertEquals(json.decodeFromString(typeUser), show) } @@ -65,7 +66,7 @@ class ApTest { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth("W7Xw8F"), "https://localhost", createMockHttpClient(typeNote) ) - val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/C56WI")).get() + val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/C56WI")).failOnError() assertEquals(json.decodeFromString(typeNote), show) } } @@ -82,7 +83,7 @@ class ApTestE2E { // @Test fun show_showUserRequest_respondTypeUser() = runBlocking { val show = - Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin")) + Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin")).failOnError() delay(1000) assertInstanceOf(ApShowResponse.TypeUser::class.java, show) } @@ -91,7 +92,7 @@ class ApTestE2E { // @Test fun show_showNoteRequest_respondTypeNote() = runBlocking { val show = - Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin/109739544444885718")) + Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin/109739544444885718")).failOnError() delay(1000) assertInstanceOf(ApShowResponse.TypeNote::class.java, show) } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt index e097ee5..9c81ced 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt @@ -1,6 +1,7 @@ package dev.usbharu.multim.misskey.v12.api import MisskeyTestUtil.assertIsOk +import dev.usbharu.multim.TestUtil.failOnError import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.MetaRequest @@ -23,8 +24,7 @@ class MetaTestE2E { @Test fun meta() = runTest { - val meta = Meta(misskeyApiClient).meta(MetaRequest()) + val meta = Meta(misskeyApiClient).meta(MetaRequest()).failOnError() println(meta) - assertIsOk(meta) } } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt index 367c553..13a897c 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt @@ -1,4 +1,5 @@ @file:OptIn(ExperimentalCoroutinesApi::class) +@file:Suppress("SpellCheckingInspection") package dev.usbharu.multim.misskey.v12.api @@ -6,7 +7,8 @@ import MisskeyTestUtil.createFakeNote import MisskeyTestUtil.createMockHttpClient import MisskeyTestUtil.json import com.github.michaelbull.result.* -import dev.usbharu.multim.api.createHttpClient +import dev.usbharu.multim.MultiM +import dev.usbharu.multim.TestUtil.failOnError import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.* import dev.usbharu.multim.model.SingleTokenAuth @@ -41,7 +43,7 @@ class NotesTest { ) ) val globalTimeline = - notes.globalTimeline(globalTimelineRequest = NotesGlobalTimelineRequest()).get() + notes.globalTimeline(globalTimelineRequest = NotesGlobalTimelineRequest()).failOnError() assertEquals(expectNoteArray, globalTimeline) } @@ -54,7 +56,7 @@ class NotesTest { createMockHttpClient(content = json.encodeToString(expectNoteArray)) ) ) - val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()).get() + val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()).failOnError() assertEquals(expectNoteArray, hybridTimeline) } @@ -70,7 +72,7 @@ class NotesTest { ) ) ) - val localTimeline = notes.localTimeline(NotesLocalTimelineRequest()).get() + val localTimeline = notes.localTimeline(NotesLocalTimelineRequest()).failOnError() assertEquals(expectNoteArray, localTimeline) } @@ -87,7 +89,7 @@ class NotesTest { ) ) ) - val note = notes.show(NotesShowRequest("mLvakn")).get() + val note = notes.show(NotesShowRequest("mLvakn")).failOnError() assertEquals(expectedNote, note) } @@ -101,8 +103,8 @@ class NotesTest { createMockHttpClient(content = json.encodeToString(NotesCreateResponse(note))) ) ) - val create = notes.create(NotesCreateRequest(text = "gold")).get() - assertEquals(note, create?.createdNote) + val create = notes.create(NotesCreateRequest(text = "gold")).failOnError() + assertEquals(note, create.createdNote) } @Test @@ -119,7 +121,7 @@ class NotesTest { } - val expectNoteArray = listOf( + private val expectNoteArray = listOf( createFakeNote( "4wT4lSP", "p9hdK", @@ -185,35 +187,35 @@ class NotesTest { class NotesTestE2E { - val client = MisskeyApiClient( + private val client = MisskeyApiClient( SingleTokenAuth(System.getProperty("multim_misskey_token")), System.getProperty("multim_misskey_instance"), - createHttpClient() + MultiM.httpClientWithJson.config {} ) - val notes = Notes(client) - val drive = Drive(client) + private val notes = Notes(client) + private val drive = Drive(client) @Test fun globalTimeline() = runTest { - val globalTimeline = notes.globalTimeline(NotesGlobalTimelineRequest()).get() + val globalTimeline = notes.globalTimeline(NotesGlobalTimelineRequest()).failOnError() println(globalTimeline) } @Test fun hybridTimeline() = runTest { - val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()).get() + val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()).failOnError() println(hybridTimeline) } @Test fun localTimeline() = runTest { - val localTimeline = notes.localTimeline(NotesLocalTimelineRequest()).get() + val localTimeline = notes.localTimeline(NotesLocalTimelineRequest()).failOnError() println(localTimeline) } @Test fun show() = runTest { - val show = notes.show(NotesShowRequest("9ack8wxw3c")).get() + val show = notes.show(NotesShowRequest("9ack8wxw3c")).failOnError() println(show) } @@ -224,8 +226,8 @@ class NotesTestE2E { visibility = NotesCreateRequest.Visibility.HOME, text = "このノートはMultim のテストで作成されました。${this@NotesTestE2E::class} create Test" ) - ).get() - println(created?.createdNote) + ).failOnError() + println(created.createdNote) } @Test @@ -241,9 +243,9 @@ class NotesTestE2E { text = "このノートはMultiMのテストで作成され、ファイル添付のテストで使用されます。", fileIds = setOf(driveFile.id) ) - ).get() + ).failOnError() - assertEquals(driveFile, createdNote?.createdNote?.files?.firstOrNull()) + assertEquals(driveFile, createdNote.createdNote.files?.firstOrNull()) } @Test @@ -254,8 +256,8 @@ class NotesTestE2E { text = "このノートはMultiMのテストで作成され、投票付きノートの作成で使用されます。 ${this@NotesTestE2E::class} create note with poll", poll = poll ) - ).get() - assertEquals(poll.choices.map { it }, create?.createdNote?.poll?.choices?.map { it.text }); + ).failOnError() + assertEquals(poll.choices.map { it }, create.createdNote.poll?.choices?.map { it.text }) } @Test @@ -278,25 +280,25 @@ class NotesTestE2E { @Test fun featured() = runTest { - val featured = notes.featured() + val featured = notes.featured().failOnError() println(featured) } @Test fun children() = runTest { - val children = notes.children(NotesChildrenRequest("9ad7btwst8")) + val children = notes.children(NotesChildrenRequest("9ad7btwst8")).failOnError() println(children) } @Test fun conversation() = runTest { - val conversation = notes.conversation(NotesConversationRequest("9ad7btwst8")) + val conversation = notes.conversation(NotesConversationRequest("9ad7btwst8")).failOnError() println(conversation) } @Test fun state() = runTest { - val state = notes.state(NotesStateRequest("9ad7btwst8")) + val state = notes.state(NotesStateRequest("9ad7btwst8")).failOnError() println(state) } @@ -304,11 +306,12 @@ class NotesTestE2E { fun favoritesCreate() = runTest { val create = notes.create(NotesCreateRequest(text = "このノートはMultim のテストで作成され、お気に入り登録のテストで使用されます。 ${this@NotesTestE2E::class} favorites create test")) - .get() - create?.createdNote?.id?.let { NotesFavoritesCreateRequest(it) } - ?.let { notes.Favorites().create(it) } - assertTrue(create?.createdNote?.id?.let { NotesStateRequest(it) } - ?.let { notes.state(it).get()?.isFavorited } == true) + .failOnError() + NotesFavoritesCreateRequest(create.createdNote.id) + .let { notes.Favorites().create(it) } + assertTrue( + NotesStateRequest(create.createdNote.id) + .let { notes.state(it).failOnError().isFavorited }) //todo ネストがやばいことになってるのでnullが返ってきた時点で失敗にする } @@ -322,10 +325,10 @@ class NotesTestE2E { is Err -> fail(result.error.message, result.error._throwable) } notes.Favorites().create(NotesFavoritesCreateRequest(create.createdNote.id)) - assertTrue(notes.state(NotesStateRequest(create.createdNote.id)).get()?.isFavorited == true) + assertTrue(notes.state(NotesStateRequest(create.createdNote.id)).failOnError().isFavorited) notes.Favorites().delete(NotesFavoritesDeleteRequest(create.createdNote.id)) assertFalse( - notes.state(NotesStateRequest(create.createdNote.id)).get()?.isFavorited == true + notes.state(NotesStateRequest(create.createdNote.id)).failOnError().isFavorited ) } @@ -345,12 +348,12 @@ class NotesTestE2E { fun renotes() = runTest { val create = notes.create(NotesCreateRequest(text = "このノートはMultim のテストで作成され、リノートのテストで使用されます。 ${this@NotesTestE2E::class} renotes test")) - .get() + .failOnError() val notesCreateResponse = - notes.create(NotesCreateRequest(renoteId = create?.createdNote?.id)).get() - val renotes = create?.createdNote?.id?.let { NotesRenoteRequest(it) } - ?.let { notes.renotes(it) }?.get() - assertEquals(listOf(notesCreateResponse?.createdNote), renotes) + notes.create(NotesCreateRequest(renoteId = create.createdNote.id)).failOnError() + val renotes = NotesRenoteRequest(create.createdNote.id) + .let { notes.renotes(it) }.failOnError() + assertEquals(listOf(notesCreateResponse.createdNote), renotes) println(renotes) } @@ -358,24 +361,24 @@ class NotesTestE2E { fun replies() = runTest { val root = notes.create(NotesCreateRequest(text = "このノートはMultim のテストで作成され、返信取得のテストで使用されます。 ${this@NotesTestE2E::class} replies test")) - .get() + .failOnError() val reply1 = notes.create( NotesCreateRequest( text = "返信1 このノートはMultimのテストで作成され、返信取得のテストで使用されます。 ${this@NotesTestE2E::class} replies test", - replyId = root?.createdNote?.id + replyId = root.createdNote.id ) - ).get() + ).failOnError() val reply2 = notes.create( NotesCreateRequest( text = "返信2 このノートはMultimのテストで作成され、返信取得のテストで使用されます。 ${this@NotesTestE2E::class} replies test", - replyId = root?.createdNote?.id + replyId = root.createdNote.id ) - ).get() - val replies = root?.createdNote?.id?.let { NotesRepliesRequest(it) } - ?.let { notes.replies(it) }?.get() + ).failOnError() + val replies = root.createdNote.id.let { NotesRepliesRequest(it) } + .let { notes.replies(it) }.failOnError() assertEquals( - listOf(reply1?.createdNote, reply2?.createdNote).sortedBy { note -> note?.id }, - replies?.sortedBy { note -> note.id }) + listOf(reply1.createdNote, reply2.createdNote).sortedBy { note -> note.id }, + replies.sortedBy { note -> note.id }) } @Test @@ -383,10 +386,10 @@ class NotesTestE2E { val tag = UUID.randomUUID().toString() val tagedNote = notes.create(NotesCreateRequest(text = "#$tag このノートはMultimのテストで作成され、タグ検索のテストで使用されます。 ${this@NotesTestE2E::class} search by tag test")) - .get() - val searchByTag = notes.searchByTag(NotesSearchByTagRequest(tag)).get() + .failOnError() + val searchByTag = notes.searchByTag(NotesSearchByTagRequest(tag)).failOnError() org.assertj.core.api.Assertions.assertThat(searchByTag)?.isNotEmpty - assertTrue(searchByTag?.contains(tagedNote?.createdNote) == true) + assertTrue(searchByTag.contains(tagedNote.createdNote)) println(searchByTag) } @@ -394,35 +397,35 @@ class NotesTestE2E { fun threadMutingCreate() = runTest { val create = notes.create(NotesCreateRequest(text = "このノートはMultimのテストで作成され、スレッドミュートのテストで使用されます。 ${this@NotesTestE2E::class} thread mute create test")) - .get() - assertFalse(create?.createdNote?.id?.let { NotesStateRequest(it) } - ?.let { notes.state(it).get()?.isMutedThread } == true) - create?.createdNote?.id?.let { NotesThreadMutingCreateRequest(it) } - ?.let { notes.ThreadMuting().create(it) } - assertTrue(create?.createdNote?.id?.let { NotesStateRequest(it) } - ?.let { notes.state(it).get()?.isMutedThread } == true) + .failOnError() + assertFalse( + NotesStateRequest(create.createdNote.id) + .let { notes.state(it).failOnError().isMutedThread }) + NotesThreadMutingCreateRequest(create.createdNote.id) + .let { notes.ThreadMuting().create(it) } + assertTrue( + NotesStateRequest(create.createdNote.id) + .let { notes.state(it).failOnError().isMutedThread }) } @Test fun threadMutingDelete() = runTest { val create = notes.create(NotesCreateRequest(text = "このノートはMultimのテストで作成され、スレッドミュート解除のテストで使用されます。 ${this@NotesTestE2E::class} thread mute delete test")) - .get() - create?.createdNote?.id?.let { NotesStateRequest(it) }?.let { - notes.state(it).get()?.isMutedThread?.let { - assertFalse( - it - ) - } - } - create?.createdNote?.id?.let { NotesThreadMutingCreateRequest(it) } - ?.let { notes.ThreadMuting().create(it) } - assertTrue(create?.createdNote?.id?.let { NotesStateRequest(it) } - ?.let { notes.state(it).get()?.isMutedThread } == true) - create?.createdNote?.id?.let { NotesThreadMutingDeleteRequest(it) } - ?.let { notes.ThreadMuting().delete(it) } - assertFalse(create?.createdNote?.id?.let { NotesStateRequest(it) } - ?.let { notes.state(it).get()?.isMutedThread } == true) + .failOnError() + assertFalse( + notes.state(NotesStateRequest(create.createdNote.id)).failOnError().isMutedThread + ) + NotesThreadMutingCreateRequest(create.createdNote.id) + .let { notes.ThreadMuting().create(it) } + assertTrue( + NotesStateRequest(create.createdNote.id) + .let { notes.state(it).failOnError().isMutedThread }) + NotesThreadMutingDeleteRequest(create.createdNote.id) + .let { notes.ThreadMuting().delete(it) } + assertFalse( + NotesStateRequest(create.createdNote.id) + .let { notes.state(it).failOnError().isMutedThread }) } @Test @@ -436,18 +439,16 @@ class NotesTestE2E { fun unrenote() = runBlocking { val create = notes.create(NotesCreateRequest(text = "このノートはMultimのテストで作成され、リノート取り消しのテストで使用されます。 ${this@NotesTestE2E::class} unrenote test")) - .get() + .failOnError() delay(1000) - val renoted = notes.create(NotesCreateRequest(renoteId = create?.createdNote?.id)).get() + val renoted = notes.create(NotesCreateRequest(renoteId = create.createdNote.id)).failOnError() delay(1000) - create?.createdNote?.id?.let { NotesUnrenoteRequest(it) }?.let { notes.unrenote(it) } + NotesUnrenoteRequest(create.createdNote.id).let { notes.unrenote(it) } delay(1000) assertThrows { - renoted?.createdNote?.id?.let { - NotesShowRequest( - it - ) - }?.let { notes.show(it) } + NotesShowRequest( + renoted.createdNote.id + ).let { notes.show(it) } } } @@ -462,22 +463,22 @@ class NotesTestE2E { @Test fun watchingCreate() = runTest { val noteId = "9bk3hn1qd0" - val state = notes.state(NotesStateRequest(noteId)).get() - if (state?.isWatching == true) { + val state = notes.state(NotesStateRequest(noteId)).failOnError() + if (state.isWatching) { notes.Watching().delete(NotesWatchingDeleteRequest(noteId)) } - notes.Watching().create(NotesWatchingCreateRequest(noteId)).get() - assertTrue(notes.state(NotesStateRequest(noteId)).get()?.isWatching == true) + notes.Watching().create(NotesWatchingCreateRequest(noteId)).failOnError() + assertTrue(notes.state(NotesStateRequest(noteId)).failOnError().isWatching) } @Test fun watchingDelete() = runTest { val noteId = "9bk3hn1qd0" - val state = notes.state(NotesStateRequest(noteId)).get() - if (state?.isWatching == false) { + val state = notes.state(NotesStateRequest(noteId)).failOnError() + if (!state.isWatching) { notes.Watching().create(NotesWatchingCreateRequest(noteId)) } notes.Watching().delete(NotesWatchingDeleteRequest(noteId)) - assertFalse(notes.state(NotesStateRequest(noteId)).get()?.isWatching == true) + assertFalse(notes.state(NotesStateRequest(noteId)).failOnError().isWatching) } } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt index 65fc9b3..22656a9 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt @@ -1,6 +1,7 @@ package dev.usbharu.multim.misskey.v12.api import com.github.michaelbull.result.get +import dev.usbharu.multim.TestUtil.failOnError import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.NotesCreateRequest @@ -50,11 +51,11 @@ class TimelineTestE2E { delay(1000) repeat(10) { notes.create(NotesCreateRequest(text = "このノートはMultiMのテストで作成され、Streaming APIのテストで使用されます。#$uuid ")) - .get()?.createdNote?.let { it1 -> - createdNotes.add( - it1 - ) - } + .failOnError().createdNote.let { it1 -> + createdNotes.add( + it1 + ) + } } delay(2000) timeline.disconnectChannel(DisconnectRequest(DisconnectRequest.Body(uuid))) From c229092e09b36b4c5d9d96e401bfe22409522973 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 09:51:10 +0900 Subject: [PATCH 3/6] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AEID=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt index 13a897c..4a1a6e1 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt @@ -215,7 +215,7 @@ class NotesTestE2E { @Test fun show() = runTest { - val show = notes.show(NotesShowRequest("9ack8wxw3c")).failOnError() + val show = notes.show(NotesShowRequest("9bk3hn1qd0")).failOnError() println(show) } @@ -292,13 +292,13 @@ class NotesTestE2E { @Test fun conversation() = runTest { - val conversation = notes.conversation(NotesConversationRequest("9ad7btwst8")).failOnError() + val conversation = notes.conversation(NotesConversationRequest("9bk3hn1qd0")).failOnError() println(conversation) } @Test fun state() = runTest { - val state = notes.state(NotesStateRequest("9ad7btwst8")).failOnError() + val state = notes.state(NotesStateRequest("9bk3hn1qd0")).failOnError() println(state) } From 9a0c0f3dda43de859d9d03630150f826bb6e6715 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:02:38 +0900 Subject: [PATCH 4/6] =?UTF-8?q?test:=20=E9=9D=9E=E6=8E=A8=E5=A5=A8API?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E3=81=86=E3=81=AE=E3=82=92=E8=BE=9E=E3=82=81?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt | 7 +++---- .../kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt | 5 ++--- .../dev/usbharu/multim/misskey/v12/api/TimelineTest.kt | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt index 36ff675..e4360f0 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt @@ -5,9 +5,8 @@ package dev.usbharu.multim.misskey.v12.api import MisskeyTestUtil.createFakeNoteToString import MisskeyTestUtil.createMockHttpClient import MisskeyTestUtil.json -import com.github.michaelbull.result.get +import dev.usbharu.multim.MultiM import dev.usbharu.multim.TestUtil.failOnError -import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.ApShowRequest import dev.usbharu.multim.misskey.v12.model.ApShowResponse @@ -28,7 +27,7 @@ class ApTest { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth(System.getProperty("multim_misskey_token")), System.getProperty("multim_misskey_instance"), - createHttpClient() + MultiM.httpClientWithJson.config {} ) @Test @@ -76,7 +75,7 @@ class ApTestE2E { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth(System.getProperty("multim_misskey_token")), System.getProperty("multim_misskey_instance"), - createHttpClient() + MultiM.httpClientWithJson.config {} ) @RepeatedIfExceptionsTest(repeats = 4) diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt index 9c81ced..94eb826 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/MetaTest.kt @@ -1,8 +1,7 @@ package dev.usbharu.multim.misskey.v12.api -import MisskeyTestUtil.assertIsOk +import dev.usbharu.multim.MultiM import dev.usbharu.multim.TestUtil.failOnError -import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.MetaRequest import dev.usbharu.multim.model.SingleTokenAuth @@ -19,7 +18,7 @@ class MetaTestE2E { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth(System.getProperty("multim_misskey_token")), System.getProperty("multim_misskey_instance"), - createHttpClient() + MultiM.httpClientWithJson.config {} ) @Test diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt index 22656a9..1430341 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/TimelineTest.kt @@ -1,8 +1,7 @@ package dev.usbharu.multim.misskey.v12.api -import com.github.michaelbull.result.get +import dev.usbharu.multim.MultiM import dev.usbharu.multim.TestUtil.failOnError -import dev.usbharu.multim.api.createHttpClient import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient import dev.usbharu.multim.misskey.v12.model.NotesCreateRequest import dev.usbharu.multim.misskey.v12.model.StreamRequest.ConnectRequest @@ -26,7 +25,7 @@ class TimelineTestE2E { val client = MisskeyApiClient( SingleTokenAuth(System.getProperty("multim_misskey_token")), System.getProperty("multim_misskey_instance"), - createHttpClient() + MultiM.httpClientWithJson.config {} ) val timeline = Timeline(client) val notes = Notes(client) From d683668aeb7039248334c3215748cd4a10bcfcfe Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:06:45 +0900 Subject: [PATCH 5/6] =?UTF-8?q?test:=20NotImpl=E7=B3=BB=E3=81=AEAPI?= =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/dev/usbharu/multim/Logger.kt | 50 +++++--- .../kotlin/dev/usbharu/multim/TestUtil.kt | 10 ++ .../multim/api/NotImplAccountApiTest.kt | 73 ++++++++++++ .../usbharu/multim/api/NotImplEmojiApiTest.kt | 27 +++++ .../dev/usbharu/multim/api/NotImplIApiTest.kt | 22 ++++ .../multim/api/NotImplStatusApiTest.kt | 110 ++++++++++++++++++ .../multim/api/NotImplTimelineApiTest.kt | 34 ++++++ 7 files changed, 311 insertions(+), 15 deletions(-) create mode 100644 core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt create mode 100644 core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt create mode 100644 core/src/test/kotlin/dev/usbharu/multim/api/NotImplIApiTest.kt create mode 100644 core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt create mode 100644 core/src/test/kotlin/dev/usbharu/multim/api/NotImplTimelineApiTest.kt diff --git a/core/src/main/kotlin/dev/usbharu/multim/Logger.kt b/core/src/main/kotlin/dev/usbharu/multim/Logger.kt index 36df0a6..df8cb7d 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/Logger.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/Logger.kt @@ -7,13 +7,17 @@ import dev.usbharu.multim.error.ThrowableError object Logger { const val nullString = "null" - fun info(tag: String? = null, message: String? = null) = + fun info(tag: String? = null, message: String? = null) { Napier.i(message ?: nullString, null, tag) + } - fun info(message: String? = null) = Napier.i(message ?: nullString) + fun info(message: String? = null) { + Napier.i(message ?: nullString) + } - fun info(tag: String? = null, message: String? = null, throwable: Throwable? = null) = + fun info(tag: String? = null, message: String? = null, throwable: Throwable? = null) { Napier.i(message ?: nullString, throwable, tag) + } fun info(tag: String? = null, message: String? = null, error: Error) { message?.let { Napier.i(it, null, tag) } @@ -24,13 +28,17 @@ object Logger { } } - fun debug(tag: String? = null, message: String? = null) = + fun debug(tag: String? = null, message: String? = null) { Napier.d(message ?: nullString, null, tag) + } - fun debug(message: String? = null) = Napier.d(message ?: nullString) + fun debug(message: String? = null) { + Napier.d(message ?: nullString) + } - fun debug(tag: String? = null, message: String? = null, throwable: Throwable? = null) = + fun debug(tag: String? = null, message: String? = null, throwable: Throwable? = null) { Napier.d(message ?: nullString, throwable, tag) + } fun debug(tag: String? = null, message: String? = null, error: Error) { message?.let { Napier.d(it, null, tag) } @@ -41,13 +49,17 @@ object Logger { } } - fun error(tag: String? = null, message: String? = null) = + fun error(tag: String? = null, message: String? = null) { Napier.e(message ?: nullString, null, tag) + } - fun error(message: String? = null) = Napier.e(message ?: nullString) + fun error(message: String? = null) { + Napier.e(message ?: nullString) + } - fun error(tag: String? = null, message: String? = null, throwable: Throwable? = null) = + fun error(tag: String? = null, message: String? = null, throwable: Throwable? = null) { Napier.e(message ?: nullString, throwable, tag) + } fun error(tag: String? = null, message: String? = null, error: Error) { message?.let { Napier.e(it, null, tag) } @@ -58,13 +70,17 @@ object Logger { } } - fun warn(tag: String? = null, message: String? = null) = + fun warn(tag: String? = null, message: String? = null) { Napier.w(message ?: nullString, null, tag) + } - fun warn(message: String? = null) = Napier.w(message ?: nullString) + fun warn(message: String? = null) { + Napier.w(message ?: nullString) + } - fun warn(tag: String? = null, message: String? = null, throwable: Throwable? = null) = + fun warn(tag: String? = null, message: String? = null, throwable: Throwable? = null) { Napier.w(message ?: nullString, throwable, tag) + } fun warn(tag: String? = null, message: String? = null, error: Error) { message?.let { Napier.w(it, null, tag) } @@ -75,13 +91,17 @@ object Logger { } } - fun trace(tag: String? = null, message: String? = null) = + fun trace(tag: String? = null, message: String? = null) { Napier.v(message ?: nullString, null, tag) + } - fun trace(message: String? = null) = Napier.v(message ?: nullString) + fun trace(message: String? = null) { + Napier.v(message ?: nullString) + } - fun trace(tag: String? = null, message: String? = null, throwable: Throwable? = null) = + fun trace(tag: String? = null, message: String? = null, throwable: Throwable? = null) { Napier.v(message ?: nullString, throwable, tag) + } fun trace(tag: String? = null, message: String? = null, error: Error) { message?.let { Napier.v(it, null, tag) } diff --git a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt index 4f66c3d..a14a041 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt @@ -1,6 +1,7 @@ package dev.usbharu.multim import com.github.michaelbull.result.* +import dev.usbharu.multim.error.ErrorType import dev.usbharu.multim.error.MultiMResult import io.ktor.client.* import io.ktor.client.engine.mock.* @@ -88,4 +89,13 @@ object TestUtil { val error = this.getError()!! fail("Return Error ${error.message}", error.throwable) } + + fun MultiMResult<*>.failOnSuccess(){ + this.onSuccess { fail("成功してはいけない") } + this.onFailure { + if (it.errorType != ErrorType.NOT_IMPL) { + fail("エラータイプが未実装ではない") + } + } + } } diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt new file mode 100644 index 0000000..62c28ab --- /dev/null +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt @@ -0,0 +1,73 @@ +package dev.usbharu.multim.api + +import com.github.michaelbull.result.onFailure +import com.github.michaelbull.result.onSuccess +import dev.usbharu.multim.TestUtil.failOnSuccess +import dev.usbharu.multim.error.ErrorType +import dev.usbharu.multim.error.MultiMResult +import dev.usbharu.multim.model.Account +import dev.usbharu.multim.model.Avatar +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.fail + +@OptIn(ExperimentalCoroutinesApi::class) +class NotImplAccountApiTest { + val avatar = object : Avatar("") {} + + val account = object : Account("", "", false, avatar) { + override val cacheKey: String + get() = TODO("Not yet implemented") + + } + @Test + fun userTimeline() = runTest { + @Suppress("DEPRECATION") + NotImplAccountApi.userTimeline(account).failOnSuccess() + } + + @Test + fun follow() = runTest { + NotImplAccountApi.follow(account).failOnSuccess() + } + + @Test + fun unfollow() = runTest { + NotImplAccountApi.unfollow(account).failOnSuccess() + } + + @Test + fun profile() = runTest { + NotImplAccountApi.profile(account).failOnSuccess() + } + + + @Test + fun statuses() = runTest { + NotImplAccountApi.statuses(account).failOnSuccess() + } + + + @Test + fun relationships() = runTest { + NotImplAccountApi.relationships(account,account).failOnSuccess() + } + + + @Test + fun requestCancel() = runTest { + NotImplAccountApi.requestCancel(account).failOnSuccess() + } + + + @Test + fun requestAccept() = runTest { + NotImplAccountApi.requestAccept(account).failOnSuccess() + } + + @Test + fun requestReject() = runTest { + NotImplAccountApi.requestReject(account).failOnSuccess() + } +} diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt new file mode 100644 index 0000000..958e35e --- /dev/null +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt @@ -0,0 +1,27 @@ +package dev.usbharu.multim.api + +import com.github.michaelbull.result.onFailure +import com.github.michaelbull.result.onSuccess +import dev.usbharu.multim.TestUtil.failOnSuccess +import dev.usbharu.multim.error.ErrorType +import dev.usbharu.multim.error.MultiMResult +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Assertions.* + +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.fail + +@OptIn(ExperimentalCoroutinesApi::class) +class NotImplEmojiApiTest { + + @Test + fun get() = runTest { + NotImplEmojiApi.get("dgeB0b").failOnSuccess() + } + + @Test + fun findByName() = runTest { + NotImplEmojiApi.findByName("KR4y61").failOnSuccess() + } +} diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplIApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplIApiTest.kt new file mode 100644 index 0000000..8b3e775 --- /dev/null +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplIApiTest.kt @@ -0,0 +1,22 @@ +package dev.usbharu.multim.api + +import dev.usbharu.multim.TestUtil.failOnSuccess +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Assertions.* + +import org.junit.jupiter.api.Test + +@OptIn(ExperimentalCoroutinesApi::class) +class NotImplIApiTest { + + @Test + fun profile() = runTest { + NotImplIApi.profile().failOnSuccess() + } + + @Test + fun statuses() = runTest { + NotImplIApi.statuses().failOnSuccess() + } +} diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt new file mode 100644 index 0000000..758d131 --- /dev/null +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt @@ -0,0 +1,110 @@ +package dev.usbharu.multim.api + +import dev.usbharu.multim.TestUtil.failOnSuccess +import dev.usbharu.multim.model.* +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Assertions.* + +import org.junit.jupiter.api.Test + +@OptIn(ExperimentalCoroutinesApi::class) +class NotImplStatusApiTest { + + val avatar = object : Avatar(""){} + private val account = object : Account("","",false,avatar){ + override val cacheKey: String + get() = TODO("Not yet implemented") + } + private val content = object : Content("F6k"){} + private val statusId = object : StatusId(){ + override fun equals(other: Any?): Boolean { + TODO("Not yet implemented") + } + + override fun hashCode(): Int { + TODO("Not yet implemented") + } + + override fun getUrl(): String { + TODO("Not yet implemented") + } + + override val cacheKey: String + get() = TODO("Not yet implemented") + } + private val statusForPost = object : StatusForPost(account,content) { + + } + private val reaction = object : Reaction("",""){} + + @Test + fun post() = runTest { + NotImplStatusApi.post(statusForPost).failOnSuccess() + } + + @Test + fun delete() = runTest { + NotImplStatusApi.delete(statusId).failOnSuccess() + } + + @Test + fun findById() = runTest { + NotImplStatusApi.findById(statusId).failOnSuccess() + } + + @Test + fun addReaction() = runTest { + NotImplStatusApi.addReaction(statusId,reaction).failOnSuccess() + } + + @Test + fun removeReaction() = runTest { + NotImplStatusApi.removeReaction(statusId,reaction).failOnSuccess() + } + + @Test + fun reactions() = runTest { + NotImplStatusApi.reactions(statusId).failOnSuccess() + } + + @Test + fun replies() = runTest { + NotImplStatusApi.replies(statusId).failOnSuccess() + } + + @Test + fun repost() = runTest { + NotImplStatusApi.repost(statusId).failOnSuccess() + } + + @Test + fun unRepost() = runTest { + NotImplStatusApi.unRepost(statusId).failOnSuccess() + } + + @Test + fun replyTo() = runTest { + NotImplStatusApi.replyTo(statusId,statusForPost).failOnSuccess() + } + + @Test + fun addToBookmarks() = runTest { + NotImplStatusApi.addToBookmarks(statusId).failOnSuccess() + } + + @Test + fun removeFromBookmarks() = runTest { + NotImplStatusApi.removeFromBookmarks(statusId).failOnSuccess() + } + + @Test + fun getPreviousAndNext() = runTest { + NotImplStatusApi.getPreviousAndNext(statusId).failOnSuccess() + } + + @Test + fun availableReactions() = runTest { + NotImplStatusApi.availableReactions().failOnSuccess() + } +} diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplTimelineApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplTimelineApiTest.kt new file mode 100644 index 0000000..0837ed8 --- /dev/null +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplTimelineApiTest.kt @@ -0,0 +1,34 @@ +package dev.usbharu.multim.api + +import dev.usbharu.multim.TestUtil.failOnSuccess +import dev.usbharu.multim.model.Timeline +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.Assertions.* + +import org.junit.jupiter.api.Test + +@OptIn(ExperimentalCoroutinesApi::class) +class NotImplTimelineApiTest { + private val timeline = object : Timeline("") {} + + @Test + fun availableTimelines() = runTest { + NotImplTimelineApi.availableTimelines().failOnSuccess() + } + + @Test + fun listen() = runTest { + NotImplTimelineApi.listen(timeline) {}.failOnSuccess() + } + + @Test + fun connect() = runTest { + NotImplTimelineApi.connect(timeline).failOnSuccess() + } + + @Test + fun disconnect() = runTest { + NotImplTimelineApi.disconnect(timeline).failOnSuccess() + } +} From 188b4b39880684d2e29397addfefd5bbf153e5a2 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:29:49 +0900 Subject: [PATCH 6/6] =?UTF-8?q?style:=20=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/usbharu/multim/api/AccountApi.kt | 6 +++--- .../kotlin/dev/usbharu/multim/api/StatusApi.kt | 4 +++- .../usbharu/multim/api/StringIdAccountApi.kt | 4 ++-- .../multim/cache/CacheableAccountApi.kt | 2 +- .../multim/multi/MultiAccountApiBase.kt | 2 +- .../test/kotlin/dev/usbharu/multim/TestUtil.kt | 2 +- .../multim/api/NotImplAccountApiTest.kt | 8 ++------ .../usbharu/multim/api/NotImplEmojiApiTest.kt | 6 ------ .../usbharu/multim/api/NotImplStatusApiTest.kt | 18 +++++++++--------- .../misskey/v12/api/MisskeyMultiMApis.kt | 3 +-- .../misskey/v12/common/MisskeyContent.kt | 3 +-- .../multim/misskey/v12/common/MisskeyEmoji.kt | 3 +-- .../multim/misskey/v12/common/MisskeyField.kt | 3 +-- .../multim/misskey/v12/common/MisskeyFile.kt | 4 +--- .../multim/misskey/v12/common/MisskeyFiles.kt | 3 +-- .../dev/usbharu/multim/misskey/v12/model/II.kt | 2 +- .../usbharu/multim/misskey/v12/api/ApTest.kt | 12 ++++++++---- .../multim/misskey/v12/api/NotesTest.kt | 11 ++++++----- .../v12/common/api/MisskeyStatusApiTest.kt | 2 -- 19 files changed, 43 insertions(+), 55 deletions(-) diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt index eeda7a9..f6b9f1e 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt @@ -50,14 +50,14 @@ interface AccountApi { suspend fun statuses( account: Account, includeRepost: Boolean = false, - since:StatusId? = null, - until:StatusId? = null, + since: StatusId? = null, + until: StatusId? = null, ): Result, MultiMError> { Logger.debug("Account Api", "Not impl account api. statuses.") return Err(MultiMError("statuses not implements", null, ErrorType.NOT_IMPL)) } - val RELEATIONSHIPS: String + val RELATIONSHIPS: String get() = "account/relationships" suspend fun relationships(myself: Account, other: Account): Result { diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/StatusApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/StatusApi.kt index 388e3c8..0a2025b 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/StatusApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/StatusApi.kt @@ -131,8 +131,10 @@ interface StatusApi { (status.content.text + status.account.accountName + date).encodeToByteArray() ).toInt() } - val AVAILABLE_REACTIONS:String + + val AVAILABLE_REACTIONS: String get() = "status/availableReactions" + suspend fun availableReactions(): MultiMResult> { Logger.debug("Status Api", "Not impl status api availableReactions") return Err(MultiMError("availableReactions not implements", null, ErrorType.NOT_IMPL)) diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt index d7ea8e3..9ad821b 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt @@ -22,8 +22,8 @@ interface StringIdAccountApi : AccountApi { suspend fun statuses( accountId: String, includeRepost: Boolean = false, - since:String? = null, - until:String? = null + since: String? = null, + until: String? = null ): MultiMResult> { Logger.debug("Account Api", "Not impl account api. statuses by id.") return Err(MultiMError("statuses by id not implements", null, ErrorType.NOT_IMPL)) diff --git a/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt index 9473bfc..0ab2298 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt @@ -51,7 +51,7 @@ class CacheableAccountApi( myself: Account, other: Account ): Result { - return cacheableApi.cacheOrGet(RELEATIONSHIPS, myself, other) { + return cacheableApi.cacheOrGet(RELATIONSHIPS, myself, other) { accountApi.relationships( myself, other diff --git a/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountApiBase.kt b/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountApiBase.kt index c05c060..3309b25 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountApiBase.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountApiBase.kt @@ -13,7 +13,7 @@ class MultiAccountApiBase(val serviceList: List) { val factory = ServiceInfoFactory(serviceList) - val httpClient = MultiM.httpClientWithJson.config({}) + val httpClient = MultiM.httpClientWithJson.config {} val apiClientMap = mutableMapOf() diff --git a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt index a14a041..95fad93 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt @@ -90,7 +90,7 @@ object TestUtil { fail("Return Error ${error.message}", error.throwable) } - fun MultiMResult<*>.failOnSuccess(){ + fun MultiMResult<*>.failOnSuccess() { this.onSuccess { fail("成功してはいけない") } this.onFailure { if (it.errorType != ErrorType.NOT_IMPL) { diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt index 62c28ab..affa95c 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplAccountApiTest.kt @@ -1,16 +1,11 @@ package dev.usbharu.multim.api -import com.github.michaelbull.result.onFailure -import com.github.michaelbull.result.onSuccess import dev.usbharu.multim.TestUtil.failOnSuccess -import dev.usbharu.multim.error.ErrorType -import dev.usbharu.multim.error.MultiMResult import dev.usbharu.multim.model.Account import dev.usbharu.multim.model.Avatar import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Test -import org.junit.jupiter.api.fail @OptIn(ExperimentalCoroutinesApi::class) class NotImplAccountApiTest { @@ -21,6 +16,7 @@ class NotImplAccountApiTest { get() = TODO("Not yet implemented") } + @Test fun userTimeline() = runTest { @Suppress("DEPRECATION") @@ -51,7 +47,7 @@ class NotImplAccountApiTest { @Test fun relationships() = runTest { - NotImplAccountApi.relationships(account,account).failOnSuccess() + NotImplAccountApi.relationships(account, account).failOnSuccess() } diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt index 958e35e..7861815 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplEmojiApiTest.kt @@ -1,16 +1,10 @@ package dev.usbharu.multim.api -import com.github.michaelbull.result.onFailure -import com.github.michaelbull.result.onSuccess import dev.usbharu.multim.TestUtil.failOnSuccess -import dev.usbharu.multim.error.ErrorType -import dev.usbharu.multim.error.MultiMResult import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.* - import org.junit.jupiter.api.Test -import org.junit.jupiter.api.fail @OptIn(ExperimentalCoroutinesApi::class) class NotImplEmojiApiTest { diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt index 758d131..4fb122a 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NotImplStatusApiTest.kt @@ -11,13 +11,13 @@ import org.junit.jupiter.api.Test @OptIn(ExperimentalCoroutinesApi::class) class NotImplStatusApiTest { - val avatar = object : Avatar(""){} - private val account = object : Account("","",false,avatar){ + val avatar = object : Avatar("") {} + private val account = object : Account("", "", false, avatar) { override val cacheKey: String get() = TODO("Not yet implemented") } - private val content = object : Content("F6k"){} - private val statusId = object : StatusId(){ + private val content = object : Content("F6k") {} + private val statusId = object : StatusId() { override fun equals(other: Any?): Boolean { TODO("Not yet implemented") } @@ -33,10 +33,10 @@ class NotImplStatusApiTest { override val cacheKey: String get() = TODO("Not yet implemented") } - private val statusForPost = object : StatusForPost(account,content) { + private val statusForPost = object : StatusForPost(account, content) { } - private val reaction = object : Reaction("",""){} + private val reaction = object : Reaction("", "") {} @Test fun post() = runTest { @@ -55,12 +55,12 @@ class NotImplStatusApiTest { @Test fun addReaction() = runTest { - NotImplStatusApi.addReaction(statusId,reaction).failOnSuccess() + NotImplStatusApi.addReaction(statusId, reaction).failOnSuccess() } @Test fun removeReaction() = runTest { - NotImplStatusApi.removeReaction(statusId,reaction).failOnSuccess() + NotImplStatusApi.removeReaction(statusId, reaction).failOnSuccess() } @Test @@ -85,7 +85,7 @@ class NotImplStatusApiTest { @Test fun replyTo() = runTest { - NotImplStatusApi.replyTo(statusId,statusForPost).failOnSuccess() + NotImplStatusApi.replyTo(statusId, statusForPost).failOnSuccess() } @Test diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyMultiMApis.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyMultiMApis.kt index 8190cba..759c8c1 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyMultiMApis.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyMultiMApis.kt @@ -10,5 +10,4 @@ class MisskeyMultiMApis( emojiApi: EmojiApi, iApi: IApi ) : - MultiMApis(statusApi, accountApi, timelineApi, emojiApi, iApi) { -} + MultiMApis(statusApi, accountApi, timelineApi, emojiApi, iApi) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt index 0c25492..14e1394 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt @@ -2,5 +2,4 @@ package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.Content -class MisskeyContent(val content: String) : Content(content) { -} +class MisskeyContent(val content: String) : Content(content) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyEmoji.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyEmoji.kt index ca1f3ac..8a94a02 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyEmoji.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyEmoji.kt @@ -2,5 +2,4 @@ package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.Emoji -class MisskeyEmoji(name: String, url: String) : Emoji(name, url) { -} +class MisskeyEmoji(name: String, url: String) : Emoji(name, url) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyField.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyField.kt index cba4d62..69ca2c7 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyField.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyField.kt @@ -3,5 +3,4 @@ package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.Field class MisskeyField(name: String = "", value: String = "") : - Field(name, value, false) { -} + Field(name, value, false) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFile.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFile.kt index 61b8755..756d9ba 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFile.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFile.kt @@ -2,6 +2,4 @@ package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.File -class MisskeyFile(data: ByteArray, type: String, name: String) : File(data, type, name) { - -} +class MisskeyFile(data: ByteArray, type: String, name: String) : File(data, type, name) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFiles.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFiles.kt index 3706a94..0e3553e 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFiles.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyFiles.kt @@ -2,5 +2,4 @@ package dev.usbharu.multim.misskey.v12.common import dev.usbharu.multim.model.Files -class MisskeyFiles(files: List) : Files(files) { -} +class MisskeyFiles(files: List) : Files(files) diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/II.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/II.kt index 27c1af4..fed8fa4 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/II.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/model/II.kt @@ -5,6 +5,6 @@ import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth import kotlinx.serialization.Serializable @Serializable -class IIRequest() : MisskeyNeedAuth() +class IIRequest : MisskeyNeedAuth() typealias IIResponse = MeDetailed diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt index e4360f0..b193333 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/ApTest.kt @@ -48,7 +48,8 @@ class ApTest { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth("aaaaaaaa"), "https://localhost", createMockHttpClient(typeUser) ) - val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/IN7OFhht")).failOnError() + val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/IN7OFhht")) + .failOnError() assertEquals(json.decodeFromString(typeUser), show) } @@ -65,7 +66,8 @@ class ApTest { val misskeyApiClient = MisskeyApiClient( SingleTokenAuth("W7Xw8F"), "https://localhost", createMockHttpClient(typeNote) ) - val show = Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/C56WI")).failOnError() + val show = + Ap(misskeyApiClient).show(ApShowRequest("https://localhost/test/C56WI")).failOnError() assertEquals(json.decodeFromString(typeNote), show) } } @@ -82,7 +84,8 @@ class ApTestE2E { // @Test fun show_showUserRequest_respondTypeUser() = runBlocking { val show = - Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin")).failOnError() + Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin")) + .failOnError() delay(1000) assertInstanceOf(ApShowResponse.TypeUser::class.java, show) } @@ -91,7 +94,8 @@ class ApTestE2E { // @Test fun show_showNoteRequest_respondTypeNote() = runBlocking { val show = - Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin/109739544444885718")).failOnError() + Ap(misskeyApiClient).show(ApShowRequest("https://mstdn-dev.usbharu.dev/@testAdmin/109739544444885718")) + .failOnError() delay(1000) assertInstanceOf(ApShowResponse.TypeNote::class.java, show) } diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt index 4a1a6e1..7262f7e 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/api/NotesTest.kt @@ -400,12 +400,12 @@ class NotesTestE2E { .failOnError() assertFalse( NotesStateRequest(create.createdNote.id) - .let { notes.state(it).failOnError().isMutedThread }) + .let { notes.state(it).failOnError().isMutedThread }) NotesThreadMutingCreateRequest(create.createdNote.id) .let { notes.ThreadMuting().create(it) } assertTrue( NotesStateRequest(create.createdNote.id) - .let { notes.state(it).failOnError().isMutedThread }) + .let { notes.state(it).failOnError().isMutedThread }) } @Test @@ -420,12 +420,12 @@ class NotesTestE2E { .let { notes.ThreadMuting().create(it) } assertTrue( NotesStateRequest(create.createdNote.id) - .let { notes.state(it).failOnError().isMutedThread }) + .let { notes.state(it).failOnError().isMutedThread }) NotesThreadMutingDeleteRequest(create.createdNote.id) .let { notes.ThreadMuting().delete(it) } assertFalse( NotesStateRequest(create.createdNote.id) - .let { notes.state(it).failOnError().isMutedThread }) + .let { notes.state(it).failOnError().isMutedThread }) } @Test @@ -441,7 +441,8 @@ class NotesTestE2E { notes.create(NotesCreateRequest(text = "このノートはMultimのテストで作成され、リノート取り消しのテストで使用されます。 ${this@NotesTestE2E::class} unrenote test")) .failOnError() delay(1000) - val renoted = notes.create(NotesCreateRequest(renoteId = create.createdNote.id)).failOnError() + val renoted = + notes.create(NotesCreateRequest(renoteId = create.createdNote.id)).failOnError() delay(1000) NotesUnrenoteRequest(create.createdNote.id).let { notes.unrenote(it) } delay(1000) diff --git a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt index 934405a..a66515a 100644 --- a/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt +++ b/impl/misskey/src/test/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyStatusApiTest.kt @@ -4,8 +4,6 @@ import MisskeyTestUtil import com.github.michaelbull.result.get import dev.usbharu.multim.misskey.v12.api.MisskeyApis import dev.usbharu.multim.misskey.v12.common.MisskeyStatusId -import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient -import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi import dev.usbharu.multim.model.SingleTokenAuth import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest