Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
b78d9ad3
Commit
b78d9ad3
authored
Apr 22, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rearrange tests
parent
9ae02b5a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
25 deletions
+6
-25
mirai-core/src/commonTest/kotlin/net/mamoe/mirai/test/TestDSL.kt
...ore/src/commonTest/kotlin/net/mamoe/mirai/test/TestDSL.kt
+1
-9
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/event/EventTests.kt
...re/src/jvmTest/kotlin/net/mamoe/mirai/event/EventTests.kt
+1
-1
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/message/SubscribingGetTest.kt
...Test/kotlin/net/mamoe/mirai/message/SubscribingGetTest.kt
+4
-5
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/test/runBlocking.kt
...re/src/jvmTest/kotlin/net/mamoe/mirai/test/runBlocking.kt
+0
-9
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/utils/LockFreeLinkedListTest.kt
...st/kotlin/net/mamoe/mirai/utils/LockFreeLinkedListTest.kt
+0
-1
No files found.
mirai-core/src/commonTest/kotlin/net/mamoe/mirai/test/TestDSL.kt
View file @
b78d9ad3
...
@@ -11,9 +11,6 @@
...
@@ -11,9 +11,6 @@
package
net.mamoe.mirai.test
package
net.mamoe.mirai.test
import
kotlinx.coroutines.CoroutineScope
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
import
kotlin.test.assertEquals
import
kotlin.test.assertEquals
import
kotlin.test.assertFalse
import
kotlin.test.assertFalse
import
kotlin.test.assertNotEquals
import
kotlin.test.assertNotEquals
...
@@ -33,8 +30,3 @@ infix fun <E> E.shouldBeEqualTo(another: E) = assertEquals(another, this)
...
@@ -33,8 +30,3 @@ infix fun <E> E.shouldBeEqualTo(another: E) = assertEquals(another, this)
@TestDSL
@TestDSL
infix
fun
<
E
>
E
.
shouldNotBeEqualTo
(
another
:
E
)
=
assertNotEquals
(
another
,
this
)
infix
fun
<
E
>
E
.
shouldNotBeEqualTo
(
another
:
E
)
=
assertNotEquals
(
another
,
this
)
\ No newline at end of file
internal
expect
fun
<
R
>
runBlocking
(
context
:
CoroutineContext
=
EmptyCoroutineContext
,
block
:
suspend
CoroutineScope
.()
->
R
):
R
\ No newline at end of file
mirai-core/src/
common
Test/kotlin/net/mamoe/mirai/event/EventTests.kt
→
mirai-core/src/
jvm
Test/kotlin/net/mamoe/mirai/event/EventTests.kt
View file @
b78d9ad3
...
@@ -11,7 +11,7 @@ package net.mamoe.mirai.event
...
@@ -11,7 +11,7 @@ package net.mamoe.mirai.event
import
kotlinx.coroutines.CompletableJob
import
kotlinx.coroutines.CompletableJob
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
import
net.mamoe.mirai.
test
.runBlocking
import
net.mamoe.mirai.
utils.internal
.runBlocking
import
kotlin.test.Test
import
kotlin.test.Test
import
kotlin.test.assertTrue
import
kotlin.test.assertTrue
...
...
mirai-core/src/
common
Test/kotlin/net/mamoe/mirai/message/SubscribingGetTest.kt
→
mirai-core/src/
jvm
Test/kotlin/net/mamoe/mirai/message/SubscribingGetTest.kt
View file @
b78d9ad3
...
@@ -13,7 +13,6 @@ import kotlinx.coroutines.*
...
@@ -13,7 +13,6 @@ import kotlinx.coroutines.*
import
net.mamoe.mirai.event.TestEvent
import
net.mamoe.mirai.event.TestEvent
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.event.syncFromEvent
import
net.mamoe.mirai.event.syncFromEvent
import
net.mamoe.mirai.test.runBlocking
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.CoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
import
kotlin.coroutines.EmptyCoroutineContext
import
kotlin.coroutines.resume
import
kotlin.coroutines.resume
...
@@ -23,16 +22,16 @@ import kotlin.test.assertFailsWith
...
@@ -23,16 +22,16 @@ import kotlin.test.assertFailsWith
internal
class
SubscribingGetTest
{
internal
class
SubscribingGetTest
{
@Test
@Test
fun
testSyncFromEvent
()
:
Unit
=
runBlocking
{
fun
testSyncFromEvent
()
{
withTimeout
(
5
00
)
{
runBlockingWithTimeout
(
10
00
)
{
suspendCancellableCoroutine
<
Unit
>
{
cont
->
suspendCancellableCoroutine
<
Unit
>
{
cont
->
launch
{
launch
{
syncFromEvent
(
500
0
)
{
_
:
TestEvent
->
syncFromEvent
(
500
)
{
_
:
TestEvent
->
cont
.
resume
(
Unit
)
cont
.
resume
(
Unit
)
}
}
}
}
delay
(
200
)
launch
{
launch
{
delay
(
200
)
TestEvent
().
broadcast
()
TestEvent
().
broadcast
()
}
}
}
}
...
...
mirai-core/src/jvmTest/kotlin/net/mamoe/mirai/test/runBlocking.kt
deleted
100644 → 0
View file @
9ae02b5a
package
net.mamoe.mirai.test
import
kotlinx.coroutines.CoroutineScope
import
kotlin.coroutines.CoroutineContext
internal
actual
fun
<
R
>
runBlocking
(
context
:
CoroutineContext
,
block
:
suspend
CoroutineScope
.()
->
R
):
R
=
kotlinx
.
coroutines
.
runBlocking
(
context
,
block
)
\ No newline at end of file
mirai-core/src/
common
Test/kotlin/net/mamoe/mirai/utils/LockFreeLinkedListTest.kt
→
mirai-core/src/
jvm
Test/kotlin/net/mamoe/mirai/utils/LockFreeLinkedListTest.kt
View file @
b78d9ad3
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
package
net.mamoe.mirai.utils
package
net.mamoe.mirai.utils
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
import
net.mamoe.mirai.test.runBlocking
import
net.mamoe.mirai.test.shouldBeEqualTo
import
net.mamoe.mirai.test.shouldBeEqualTo
import
net.mamoe.mirai.test.shouldBeTrue
import
net.mamoe.mirai.test.shouldBeTrue
import
kotlin.test.Test
import
kotlin.test.Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment