From 9ebfef2dd849df497f900688adc78309b5f961bf Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 16 Jul 2020 22:24:14 +0800
Subject: [PATCH] Add tests for #436

---
 .../mamoe/mirai/event/JvmMethodListeners.kt   |  2 +-
 .../mamoe/mirai/event/JvmMethodEventsTest.kt  | 37 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
index 3dab7c58b..d5f715f6f 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
@@ -144,7 +144,7 @@ import kotlin.reflect.jvm.kotlinFunction
  * Events.registerEvents(new MyEventHandlers())
  * ```
  *
- * @sample net.mamoe.mirai.event.JvmMethodEventsTest
+ * //@sample net.mamoe.mirai.event.JvmMethodEventsTest
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/JvmMethodEventsTest.kt b/mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/JvmMethodEventsTest.kt
index 0e071c0aa..9d6bb5d57 100644
--- a/mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/JvmMethodEventsTest.kt
+++ b/mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/JvmMethodEventsTest.kt
@@ -11,12 +11,13 @@
 
 package net.mamoe.mirai.event
 
-import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.mirai.utils.internal.runBlocking
+import kotlinx.coroutines.runBlocking
+import org.jetbrains.annotations.NotNull
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.test.assertEquals
 
 
 internal class JvmMethodEventsTest {
@@ -46,13 +47,6 @@ internal class JvmMethodEventsTest {
                 called.getAndIncrement()
             }
 
-            @Suppress("unused")
-            @EventHandler
-            suspend fun `suspend param Void`(event: TestEvent): Void? {
-                called.getAndIncrement()
-                return null
-            }
-
             @EventHandler
             @Suppress("unused")
             fun TestEvent.`receiver param Unit`(event: TestEvent) {
@@ -80,6 +74,13 @@ internal class JvmMethodEventsTest {
                 return ListeningStatus.STOPPED
             }
 
+            @EventHandler
+            @Suppress("unused")
+            private fun TestEvent.`test annotations`(@NotNull event: TestEvent): ListeningStatus {
+                called.getAndIncrement()
+                return ListeningStatus.STOPPED
+            }
+
             @EventHandler
             @Suppress("unused")
             fun TestEvent.`receiver param LS`(event: TestEvent): ListeningStatus {
@@ -88,15 +89,15 @@ internal class JvmMethodEventsTest {
             }
         }
 
-//        TestClass().run {
-//            this.registerEvents()
-//
-//            runBlocking {
-//                TestEvent().broadcast()
-//            }
-//
-//            assertEquals(9, this.getCalled())
-//        }
+        TestClass().run {
+            this.registerEvents()
+
+            runBlocking {
+                TestEvent().broadcast()
+            }
+
+            assertEquals(9, this.getCalled())
+        }
     }
 
     @Test