Skip to content

Commit 9887265

Browse files
authored
Merge pull request #109 from Shynixn/development
Merge changes to master --release
2 parents 26bb4a9 + 000ea29 commit 9887265

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

mccoroutine-minestom-core/src/test/java/helper/MockedMinestomServer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package helper
22

3-
import net.kyori.adventure.text.logger.slf4j.ComponentLogger
43
import net.minestom.server.MinecraftServer
54
import net.minestom.server.extensions.Extension
5+
import org.slf4j.Logger
66

77
class MockedMinestomServer {
8-
fun boot(mlogger: ComponentLogger? = null): Extension {
8+
fun boot(mlogger: Logger? = null): Extension {
99
val extension = MockedExtension(mlogger)
1010
MinecraftServer.init()
1111
Thread {
@@ -17,7 +17,7 @@ class MockedMinestomServer {
1717
return extension
1818
}
1919

20-
class MockedExtension(private val logger: ComponentLogger?) : Extension() {
20+
class MockedExtension(private val logger: Logger?) : Extension() {
2121
override fun initialize() {
2222
}
2323

@@ -30,7 +30,7 @@ class MockedMinestomServer {
3030
*
3131
* @return The logger for the extension
3232
*/
33-
override fun getLogger(): ComponentLogger {
33+
override fun getLogger(): Logger {
3434
if (logger != null) {
3535
return logger
3636
}

mccoroutine-minestom-core/src/test/java/integrationtest/MinestomExceptionTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import com.github.shynixn.mccoroutine.minestom.launch
44
import helper.MockedMinestomServer
55
import kotlinx.coroutines.Dispatchers
66
import kotlinx.coroutines.runBlocking
7-
import net.kyori.adventure.text.logger.slf4j.ComponentLogger
87
import org.junit.jupiter.api.Assertions
98
import org.junit.jupiter.api.Test
109
import org.mockito.Mockito
10+
import org.slf4j.Logger
1111

1212
class MinestomExceptionTest {
1313
/**
@@ -22,7 +22,7 @@ class MinestomExceptionTest {
2222
fun extensionLaunch_MultipleFailingCoroutineScopes_ShouldBeCaughtInRootScopeAndKeepExtensionScopeRunning() {
2323
// Arrange
2424
val testServer = MockedMinestomServer()
25-
val logger = Mockito.mock(ComponentLogger::class.java)
25+
val logger = Mockito.mock(Logger::class.java)
2626
var logMessageCounter = 0
2727
Mockito.`when`(
2828
logger.error(Mockito.anyString(), Mockito.any())

0 commit comments

Comments
 (0)