From 81ef0cbebe414cf1b048454406c2b51baf5025a1 Mon Sep 17 00:00:00 2001 From: Gureumi Date: Fri, 13 Oct 2023 16:21:44 +0900 Subject: [PATCH] Fix test code --- src/main/kotlin/essentials/Commands.kt | 4 ++-- src/test/kotlin/ClientCommandTest.kt | 32 ++++++++++++------------- src/test/kotlin/FeatureTest.kt | 33 ++++++++++++-------------- src/test/kotlin/PluginTest.kt | 17 ++++++------- src/test/kotlin/SimpleTets.kt | 14 ----------- 5 files changed, 42 insertions(+), 58 deletions(-) delete mode 100644 src/test/kotlin/SimpleTets.kt diff --git a/src/main/kotlin/essentials/Commands.kt b/src/main/kotlin/essentials/Commands.kt index 200fb665..8850713d 100644 --- a/src/main/kotlin/essentials/Commands.kt +++ b/src/main/kotlin/essentials/Commands.kt @@ -804,7 +804,7 @@ class Commands(handler : CommandHandler, isClient : Boolean) { ${bundle["command.info.playtime"]}: ${timeFormat(target.totalPlayTime, "command.info.time")} ${bundle["command.info.playtime.current"]}: ${timeFormat(target.currentPlayTime, "command.info.time.minimal")} ${bundle["command.info.attackclear"]}: ${target.attackModeClear} - ${bundle["command.info.pvpwinrate"]}: [green]${target.pvpVictoriesCount}[white]/[scarlet]${target.pvpDefeatCount}[white]([sky]${if (target.pvpVictoriesCount + target.pvpDefeatCount != 0) round(target.pvpVictoriesCount.toDouble() / (target.pvpVictoriesCount + target.pvpDefeatCount) * 100) else "0%"}%[white]) + ${bundle["command.info.pvpwinrate"]}: [green]${target.pvpVictoriesCount}[white]/[scarlet]${target.pvpDefeatCount}[white]([sky]${if (target.pvpVictoriesCount + target.pvpDefeatCount != 0) round(target.pvpVictoriesCount.toDouble() / (target.pvpVictoriesCount + target.pvpDefeatCount) * 100) else 0}%[white]) ${bundle["command.info.joinstacks"]}: ${target.joinStacks} """.trimIndent() } @@ -1531,7 +1531,7 @@ class Commands(handler : CommandHandler, isClient : Boolean) { "break" -> DB.Player.blockBreakCount else -> DB.Player.uuid // dummy } - DB.Player.slice(type).selectAll().map { + DB.Player.slice(DB.Player.name, DB.Player.uuid, type).selectAll().map { when(arg[0].lowercase()) { "time" -> time[Pair(it[DB.Player.name], it[DB.Player.uuid])] = it[DB.Player.totalPlayTime] "exp" -> exp[Pair(it[DB.Player.name], it[DB.Player.uuid])] = it[DB.Player.exp] diff --git a/src/test/kotlin/ClientCommandTest.kt b/src/test/kotlin/ClientCommandTest.kt index 4051406c..c341f0a9 100644 --- a/src/test/kotlin/ClientCommandTest.kt +++ b/src/test/kotlin/ClientCommandTest.kt @@ -25,31 +25,31 @@ import mindustry.game.Gamemode import mindustry.game.Team import mindustry.gen.Call import org.junit.AfterClass +import org.junit.BeforeClass import org.junit.Test import org.mindrot.jbcrypt.BCrypt import java.lang.Thread.sleep class ClientCommandTest { companion object { - @AfterClass - @JvmStatic - fun client_shutdown() { - path.child("mods/Essentials").deleteDirectory() - path.child("maps").deleteDirectory() - } - } + private var done = false; + lateinit var playerData: DB.PlayerData - var playerData : DB.PlayerData + @BeforeClass + @JvmStatic + fun setup() { + if (!done) { + loadGame() + loadPlugin() - init { - loadGame() - loadPlugin() - //test.runPost() + val p = newPlayer() + Vars.player = p.first.self() + player = p.first.self() + playerData = p.second - val p = newPlayer() - Vars.player = p.first.self() - player = p.first.self() - playerData = p.second + done = true; + } + } } @Test diff --git a/src/test/kotlin/FeatureTest.kt b/src/test/kotlin/FeatureTest.kt index 29c8d299..152878e9 100644 --- a/src/test/kotlin/FeatureTest.kt +++ b/src/test/kotlin/FeatureTest.kt @@ -2,7 +2,6 @@ import PluginTest.Companion.clientCommand import PluginTest.Companion.loadGame import PluginTest.Companion.loadPlugin import PluginTest.Companion.newPlayer -import PluginTest.Companion.path import PluginTest.Companion.player import PluginTest.Companion.setPermission import essentials.DB @@ -10,29 +9,27 @@ import essentials.Main.Companion.database import mindustry.Vars import mindustry.game.Team import mindustry.gen.Groups -import org.junit.AfterClass +import org.junit.BeforeClass import org.junit.Test + class FeatureTest { - companion object { - @AfterClass - @JvmStatic - fun shutdown() { - path.child("mods/Essentials").deleteDirectory() - path.child("maps").deleteDirectory() - } - } + private var done = false; + lateinit var playerData: DB.PlayerData - var playerData : DB.PlayerData + @BeforeClass + fun setup() { + if (!done) { + loadGame() + loadPlugin() - init { - loadGame() - loadPlugin() + val p = newPlayer() + Vars.player = p.first.self() + player = p.first.self() + playerData = p.second - val p = newPlayer() - Vars.player = p.first.self() - player = p.first.self() - playerData = p.second + done = true; + } } @Test diff --git a/src/test/kotlin/PluginTest.kt b/src/test/kotlin/PluginTest.kt index 29012ece..9781b5b4 100644 --- a/src/test/kotlin/PluginTest.kt +++ b/src/test/kotlin/PluginTest.kt @@ -53,13 +53,6 @@ class PluginTest { val serverCommand : CommandHandler = CommandHandler("") val clientCommand : CommandHandler = CommandHandler("/") - @AfterClass - @JvmStatic - fun shutdown() { - path.child("mods/Essentials").deleteDirectory() - path.child("maps").deleteDirectory() - } - @Mock lateinit var mockApplication : Application @@ -75,6 +68,8 @@ class PluginTest { Core.settings.dataDirectory = Fi("") path = Core.settings.dataDirectory + path.child("maps").deleteDirectory() + path.child("locales").writeString("en") path.child("version.properties").writeString("modifier=release\ntype=official\nnumber=7\nbuild=custom build") @@ -167,6 +162,9 @@ class PluginTest { } fun loadPlugin() { + path.child("mods/Essentials").deleteDirectory() + + Config.databasePW = "pk1450" main = Main() Config.border = true @@ -222,7 +220,9 @@ class PluginTest { return } } - player.name(faker.name().lastName()) + val name = faker.name().lastName().toCharArray() + name.shuffle() + player.name(name.concatToString()) player.con.uuid = getSaltString() player.con.usid = getSaltString() player.set(r.nextInt(300).toFloat(), r.nextInt(500).toFloat()) @@ -244,6 +244,7 @@ class PluginTest { return world.tile(random.nextInt(100), random.nextInt(100)) } + fun newPlayer() : Pair { val player = createPlayer() Events.fire(EventType.PlayerJoin(player)) diff --git a/src/test/kotlin/SimpleTets.kt b/src/test/kotlin/SimpleTets.kt deleted file mode 100644 index ad43bd10..00000000 --- a/src/test/kotlin/SimpleTets.kt +++ /dev/null @@ -1,14 +0,0 @@ -import com.github.lalyos.jfiglet.FigletFont -import essentials.Main -import org.junit.Test - -const val TILE_SIZE = 16 -const val MAP_WIDTH = 10 -const val MAP_HEIGHT = 10 - -class SimpleTets { - @Test - fun test() { - println(FigletFont.convertOneLine(Main::class.java.classLoader.getResourceAsStream("5x7.flf"), "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+-=")) - } -} \ No newline at end of file