From 4b0e023eb195e48ba81d0520288af3554833a206 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:49:56 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20println=E3=82=92=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/multim/TestUtil.kt | 2 +- .../dev/usbharu/multim/api/NodeInfoTest.kt | 8 +++- .../v12/common/api/MisskeyApiClient.kt | 9 ++-- .../src/test/kotlin/MisskeyTestUtil.kt | 1 - .../multim/misskey/v12/api/MetaTest.kt | 1 - .../multim/misskey/v12/api/NotesTest.kt | 44 ++++++------------- .../v12/common/api/MisskeyStatusApiTest.kt | 5 ++- 7 files changed, 29 insertions(+), 41 deletions(-) diff --git a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt index 95fad93..65cf419 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/TestUtil.kt @@ -61,7 +61,7 @@ object TestUtil { ): suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData { return { httpRequestData: HttpRequestData -> val decodeToString = httpRequestData.body.toByteArray().decodeToString() - println(decodeToString) + Logger.debug(decodeToString) if ("i" in json.parseToJsonElement(decodeToString).jsonObject) { respond(respond, status, headers) } else { diff --git a/core/src/test/kotlin/dev/usbharu/multim/api/NodeInfoTest.kt b/core/src/test/kotlin/dev/usbharu/multim/api/NodeInfoTest.kt index 405761c..31333cb 100644 --- a/core/src/test/kotlin/dev/usbharu/multim/api/NodeInfoTest.kt +++ b/core/src/test/kotlin/dev/usbharu/multim/api/NodeInfoTest.kt @@ -1,14 +1,18 @@ package dev.usbharu.multim.api +import dev.usbharu.multim.Logger +import dev.usbharu.multim.TestUtil.failOnError import io.ktor.client.* import io.ktor.client.engine.cio.* import io.ktor.client.plugins.contentnegotiation.* import io.ktor.serialization.kotlinx.json.* +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json import org.junit.jupiter.api.Test class NodeInfoE2E { + @OptIn(ExperimentalCoroutinesApi::class) @Test fun nodeinfo() = runTest { val nodeinfo = NodeinfoApi(HttpClient(CIO).config { @@ -18,7 +22,7 @@ class NodeInfoE2E { isLenient = true }) } - }).nodeinfo(System.getProperty("multim_misskey_instance")) - println(nodeinfo) + }).nodeinfo(System.getProperty("multim_misskey_instance")).failOnError() + Logger.debug(nodeinfo.toString()) } } diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt index 9d4e7b5..6eb0edd 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyApiClient.kt @@ -1,5 +1,6 @@ package dev.usbharu.multim.misskey.v12.common.api +import dev.usbharu.multim.Logger import dev.usbharu.multim.MultiM.json import dev.usbharu.multim.api.ApiClient import dev.usbharu.multim.misskey.v12.model.components.MisskeyNeedAuth @@ -27,9 +28,9 @@ class MisskeyApiClient(var auth: SingleTokenAuth, baseUrl: String, client: HttpC } install(createClientPlugin("MisskeyAuthPlugin") { onRequest { request, content -> - println("request type is :${content::class}") + Logger.trace("Misskey Auth Plugin","request type is :${content::class}") if (content is MisskeyNeedAuth) { - println("injection token") + Logger.trace("Misskey Auth Plugin","Injection token") content.i = auth.token } request.headers.append( @@ -54,7 +55,7 @@ class MisskeyApiClient(var auth: SingleTokenAuth, baseUrl: String, client: HttpC client.wss("ws" + baseUrl.replaceFirst("http", "") + "streaming?i=${auth.token}") { awaitAll( coroutineScope.async { - commands.onEach { println("Sending :$it");outgoing.send(Frame.Text(it)) } + commands.onEach { Logger.debug("Api Client Streaming","Sending :$it");outgoing.send(Frame.Text(it)) } .launchIn(coroutineScope) }, coroutineScope.async { @@ -68,7 +69,7 @@ class MisskeyApiClient(var auth: SingleTokenAuth, baseUrl: String, client: HttpC } ) } - println("connected") + Logger.debug("Api Client Streaming","Connected") } // launch.join() diff --git a/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt b/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt index f0e836a..317a7bc 100644 --- a/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt +++ b/impl/misskey/src/test/kotlin/MisskeyTestUtil.kt @@ -59,7 +59,6 @@ object MisskeyTestUtil { ): suspend MockRequestHandleScope.(HttpRequestData) -> HttpResponseData { return { httpRequestData: HttpRequestData -> val decodeToString = httpRequestData.body.toByteArray().decodeToString() - println(decodeToString) if ("i" in json.parseToJsonElement(decodeToString).jsonObject) { respond(respond, status, headers) } else { 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 94eb826..3070c37 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 @@ -24,6 +24,5 @@ class MetaTestE2E { @Test fun meta() = runTest { val meta = Meta(misskeyApiClient).meta(MetaRequest()).failOnError() - println(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 7262f7e..1cce52a 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 @@ -116,8 +116,7 @@ class NotesTest { @Test fun ldttest() { - val parse = Instant.parse("2023-01-17T06:58:08.000Z") - println(parse) + Instant.parse("2023-01-17T06:58:08.000Z") } @@ -197,37 +196,32 @@ class NotesTestE2E { @Test fun globalTimeline() = runTest { - val globalTimeline = notes.globalTimeline(NotesGlobalTimelineRequest()).failOnError() - println(globalTimeline) + notes.globalTimeline(NotesGlobalTimelineRequest()).failOnError() } @Test fun hybridTimeline() = runTest { - val hybridTimeline = notes.hybridTimeline(NotesHybridTimelineRequest()).failOnError() - println(hybridTimeline) + notes.hybridTimeline(NotesHybridTimelineRequest()).failOnError() } @Test fun localTimeline() = runTest { - val localTimeline = notes.localTimeline(NotesLocalTimelineRequest()).failOnError() - println(localTimeline) + notes.localTimeline(NotesLocalTimelineRequest()).failOnError() } @Test fun show() = runTest { - val show = notes.show(NotesShowRequest("9bk3hn1qd0")).failOnError() - println(show) + notes.show(NotesShowRequest("9bk3hn1qd0")).failOnError() } @Test fun create() = runTest { - val created = notes.create( + notes.create( NotesCreateRequest( visibility = NotesCreateRequest.Visibility.HOME, text = "このノートはMultim のテストで作成されました。${this@NotesTestE2E::class} create Test" ) ).failOnError() - println(created.createdNote) } @Test @@ -280,26 +274,22 @@ class NotesTestE2E { @Test fun featured() = runTest { - val featured = notes.featured().failOnError() - println(featured) + notes.featured().failOnError() } @Test fun children() = runTest { - val children = notes.children(NotesChildrenRequest("9ad7btwst8")).failOnError() - println(children) + notes.children(NotesChildrenRequest("9ad7btwst8")).failOnError() } @Test fun conversation() = runTest { - val conversation = notes.conversation(NotesConversationRequest("9bk3hn1qd0")).failOnError() - println(conversation) + notes.conversation(NotesConversationRequest("9bk3hn1qd0")).failOnError() } @Test fun state() = runTest { - val state = notes.state(NotesStateRequest("9bk3hn1qd0")).failOnError() - println(state) + notes.state(NotesStateRequest("9bk3hn1qd0")).failOnError() } @Test @@ -334,14 +324,12 @@ class NotesTestE2E { @Test fun mentions() = runTest { - val mentions = notes.mentions(NotesMentionsRequest()) - println(mentions) + notes.mentions(NotesMentionsRequest()).failOnError() } @Test fun reactions() = runTest { - val reactions = notes.reactions(NotesReactionsRequest("9ack8wxw3c")) - println(reactions) + notes.reactions(NotesReactionsRequest("9ack8wxw3c")).failOnError() } @Test @@ -354,7 +342,6 @@ class NotesTestE2E { val renotes = NotesRenoteRequest(create.createdNote.id) .let { notes.renotes(it) }.failOnError() assertEquals(listOf(notesCreateResponse.createdNote), renotes) - println(renotes) } @Test @@ -390,7 +377,6 @@ class NotesTestE2E { val searchByTag = notes.searchByTag(NotesSearchByTagRequest(tag)).failOnError() org.assertj.core.api.Assertions.assertThat(searchByTag)?.isNotEmpty assertTrue(searchByTag.contains(tagedNote.createdNote)) - println(searchByTag) } @Test @@ -430,8 +416,7 @@ class NotesTestE2E { @Test fun timeline() = runTest { - val timeline = notes.timeline(NotesTimelineRequest()) - println(timeline) + notes.timeline(NotesTimelineRequest()).failOnError() } @RepeatedIfExceptionsTest(repeats = 4) @@ -456,8 +441,7 @@ class NotesTestE2E { @Test fun userListTimeline() = runTest { - val userListTimeline = notes.userListTimeline(NotesUserListTimelineRequest("9ady10e6z5")) - println(userListTimeline) + notes.userListTimeline(NotesUserListTimelineRequest("9bvi0taru4")).failOnError() } 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 a66515a..92e9df7 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 @@ -2,6 +2,7 @@ package dev.usbharu.multim.misskey.v12.common.api import MisskeyTestUtil import com.github.michaelbull.result.get +import dev.usbharu.multim.TestUtil.failOnError import dev.usbharu.multim.misskey.v12.api.MisskeyApis import dev.usbharu.multim.misskey.v12.common.MisskeyStatusId import dev.usbharu.multim.model.SingleTokenAuth @@ -52,7 +53,7 @@ class MisskeyStatusApiTest { @Test fun findByIdTest() = runTest { val findById = - misskeyStatusApi.findById(MisskeyStatusId("9a65528e5z", "https://lcalhost")).get() - println(findById?.content?.text) + misskeyStatusApi.findById(MisskeyStatusId("9a65528e5z", "https://lcalhost")).failOnError() + } }