github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-20 15:49:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reset listeners before run a new task (#294)

Browse Source 
* 支持监听优先级, 事件传递拦截

* Fix test

* 并发

* 优先级&并发

* Test

* Fix unused

* To GlobalEventListeners

* Add tests

* intercept with subscribeAlways

* test listener.complete()

* Add functions

* Fix test and add new test

* Test concurrent listening

* Test concurrent listening

* update broadcast

* Fix Boom

* Reset listeners before run a new task

Co-authored-by: Him188 <Him188@mamoe.net>
This commit is contained in:
Karlatemp 2020-05-01 22:59:34 +08:00 committed by GitHub
parent 32eb36f817
commit 20af1fc3b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/EventTests.kt
View File

@ -12,6 +12,8 @@ package net.mamoe.mirai.event
import kotlinx.atomicfu.AtomicInt
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.*
import net.mamoe.mirai.event.internal.GlobalEventListeners
import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.StepUtil
import net.mamoe.mirai.utils.internal.runBlocking
import java.util.concurrent.Executor
@ -27,6 +29,7 @@ class TestEvent : Event, AbstractEvent() {
class EventTests {
@Test
fun testSubscribeInplace() {
resetEventListeners()
runBlocking {
val subscriber = subscribeAlways<TestEvent> {
triggered = true
@ -39,6 +42,7 @@ class EventTests {
@Test
fun testSubscribeGlobalScope() {
resetEventListeners()
runBlocking {
GlobalScope.subscribeAlways<TestEvent> {
triggered = true
@ -50,6 +54,7 @@ class EventTests {
@Test
fun `test concurrent listening`() {
resetEventListeners()
var listeners = 0
val counter = AtomicInteger(0)
for (p in Listener.EventPriority.values()) {
@ -73,6 +78,7 @@ class EventTests {
@Test
fun `test concurrent listening 3`() {
resetEventListeners()
runBlocking {
val called = AtomicInteger()
val registered = AtomicInteger()
@ -104,6 +110,7 @@ class EventTests {
@Test
fun `test concurrent listening 2`() {
resetEventListeners()
val registered = AtomicInteger()
val called = AtomicInteger()
val threads = mutableListOf<Thread>()
@ -149,6 +156,7 @@ class EventTests {
@Test
fun `broadcast Child to Parent`() {
resetEventListeners()
runBlocking {
val job: CompletableJob
job = subscribeAlways<ParentEvent> {
@ -162,6 +170,7 @@ class EventTests {
@Test
fun `broadcast ChildChild to Parent`() {
resetEventListeners()
runBlocking {
val job: CompletableJob
job = subscribeAlways<ParentEvent> {
@ -188,6 +197,7 @@ class EventTests {
@Test
fun `test handler remvoe`() {
resetEventListeners()
val step = StepUtil()
singleThreaded(step) {
subscribe<Event> {
@ -209,9 +219,16 @@ class EventTests {
}
}
*/
fun resetEventListeners() {
for (p in Listener.EventPriority.values()) {
@OptIn(MiraiInternalAPI::class)
GlobalEventListeners[p].clear()
}
}
@Test
fun `test intercept with always`() {
resetEventListeners()
val step = StepUtil()
singleThreaded(step) {
subscribeAlways<ParentEvent> {
@ -228,6 +245,7 @@ class EventTests {
@Test
fun `test intercept`() {
resetEventListeners()
val step = StepUtil()
singleThreaded(step) {
subscribeAlways<AbstractEvent> {
@ -244,6 +262,7 @@ class EventTests {
@Test
fun `test listener complete`() {
resetEventListeners()
val step = StepUtil()
singleThreaded(step) {
val listener = subscribeAlways<ParentEvent> {
@ -257,6 +276,7 @@ class EventTests {
@Test
fun `test event priority`() {
resetEventListeners()
val step = StepUtil()
singleThreaded(step) {
subscribe<PriorityTestEvent> {