Skip to content

Commit 71f8c6f

Browse files
committed
fix the test
1 parent ef82023 commit 71f8c6f

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/main/kotlin/net/chariskar/breakthemod/client/utils/Config.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,12 @@ object Config {
5151
)
5252

5353
private val json = Json { encodeDefaults = true }
54-
val configFile: File = File(MinecraftClient.getInstance().runDirectory, "config/breakthemod_config.json")
54+
val configFile: File = File(MinecraftClient.getInstance()?.runDirectory, "config/breakthemod_config.json")
5555
val logger: Logger = LoggerFactory.getLogger("breakthemod")
5656

5757
fun loadConfig() {
58+
if (MinecraftClient.getInstance() == null) return
59+
5860
if (!configFile.exists()) { saveConfig(null) }
5961

6062
val fileContent = configFile.readText()

src/test/kotlin/net/chariskar/breakthemod/Main.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import kotlinx.coroutines.CoroutineScope
44
import kotlinx.coroutines.Dispatchers
55
import kotlinx.coroutines.SupervisorJob
66
import kotlinx.coroutines.cancel
7+
import net.chariskar.breakthemod.client.utils.Config
78

89
object TestScope {
910
val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
@@ -12,7 +13,7 @@ object TestScope {
1213
}
1314
}
1415

15-
class Main {
16-
val scope = TestScope
16+
object Main {
17+
val config = Config.ConfigData()
1718

1819
}

src/test/kotlin/net/chariskar/breakthemod/apiTest/EarthmcApiTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package net.chariskar.breakthemod.apiTest;
22

33
import kotlinx.coroutines.runBlocking
4+
import net.chariskar.breakthemod.Main
45
import net.chariskar.breakthemod.TestScope
56
import net.chariskar.breakthemod.client.api.Fetch
67
import net.chariskar.breakthemod.client.objects.StaffList
8+
import net.chariskar.breakthemod.client.utils.Config
79
import org.junit.jupiter.api.Assertions
810
import org.junit.jupiter.api.Test
911
import kotlin.test.assertEquals
@@ -19,7 +21,7 @@ class EarthmcApiTest {
1921
@Test
2022
fun `test Get request`() {
2123
runBlocking {
22-
val result = Fetch.getRequest<StaffList>(Fetch.Items.STAFF.url)
24+
val result = Fetch.getRequest<StaffList>(Main.config.staffRepoUrl)
2325
assertNotNull(result)
2426
assertIs<StaffList>(result)
2527
}

0 commit comments

Comments
 (0)