diff --git a/test_runner/src/main/kotlin/ftl/mock/MockServer.kt b/test_runner/src/main/kotlin/ftl/mock/MockServer.kt index cdfcad5ecb..b74f3c78f4 100644 --- a/test_runner/src/main/kotlin/ftl/mock/MockServer.kt +++ b/test_runner/src/main/kotlin/ftl/mock/MockServer.kt @@ -70,8 +70,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.net.BindException import java.nio.charset.StandardCharsets.UTF_8 -import java.nio.file.Files -import java.nio.file.Paths import java.util.concurrent.atomic.AtomicInteger import java.util.zip.GZIPInputStream @@ -83,9 +81,9 @@ object MockServer { private var isStarted: Boolean = false private inline fun loadCatalog(fileName: String): T { - val jsonPath = Paths.get("./src/test/kotlin/ftl/fixtures/$fileName") - if (!Files.exists(jsonPath)) throw FlankGeneralError("Path doesn't exist: $fileName") - return JSON_FACTORY.fromReader(Files.newBufferedReader(jsonPath), T::class.java) + val jsonPath = {}.javaClass.classLoader.getResourceAsStream(fileName) + ?: throw FlankGeneralError("File doesn't exist: $fileName") + return JSON_FACTORY.fromReader(jsonPath.bufferedReader(), T::class.java) } private val androidCatalog by lazy { loadCatalog("android_catalog.json") } diff --git a/test_runner/src/test/kotlin/ftl/fixtures/android_catalog.json b/test_runner/src/main/resources/android_catalog.json similarity index 100% rename from test_runner/src/test/kotlin/ftl/fixtures/android_catalog.json rename to test_runner/src/main/resources/android_catalog.json diff --git a/test_runner/src/test/kotlin/ftl/fixtures/ios_catalog.json b/test_runner/src/main/resources/ios_catalog.json similarity index 100% rename from test_runner/src/test/kotlin/ftl/fixtures/ios_catalog.json rename to test_runner/src/main/resources/ios_catalog.json diff --git a/test_runner/src/test/kotlin/task/UpdateCatalogFixtures.kt b/test_runner/src/test/kotlin/task/UpdateCatalogFixtures.kt index 439208c71b..29d8d74a91 100644 --- a/test_runner/src/test/kotlin/task/UpdateCatalogFixtures.kt +++ b/test_runner/src/test/kotlin/task/UpdateCatalogFixtures.kt @@ -6,7 +6,7 @@ import java.nio.file.Files import java.nio.file.Paths object UpdateCatalogFixtures { - private const val root = "./test_runner/src/test/kotlin/ftl/fixtures/" + private const val root = "./test_runner/src/main/resources/" private fun write(fileName: String, content: GenericJson) { Files.write(Paths.get(root, fileName), content.toPrettyString().toByteArray())