From 9d096cb256bf41f7412f4a384dfbbe1d7927a09a Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 18 Oct 2022 14:09:51 +0200
Subject: [PATCH] it: fix test order

---
 .../{MinosoftSIT.kt => `MinosoftSIT`.kt}      | 28 +++++++++++--------
 .../data/registries/blocks/StairsTest.kt      |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)
 rename src/integration-test/kotlin/de/bixilon/minosoft/{MinosoftSIT.kt => `MinosoftSIT`.kt} (82%)

diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/`MinosoftSIT`.kt
similarity index 82%
rename from src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
rename to src/integration-test/kotlin/de/bixilon/minosoft/`MinosoftSIT`.kt
index 43e1de25a..30a6ae919 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/`MinosoftSIT`.kt
@@ -21,16 +21,28 @@ import de.bixilon.minosoft.data.registries.DefaultRegistries
 import de.bixilon.minosoft.data.registries.versions.Versions
 import de.bixilon.minosoft.protocol.packets.factory.PacketTypeRegistry
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
+import de.bixilon.minosoft.util.logging.Log
+import de.bixilon.minosoft.util.logging.LogLevels
+import de.bixilon.minosoft.util.logging.LogMessageType
 import org.testng.Assert
-import org.testng.annotations.Test
+import org.testng.annotations.BeforeTest
 
 
 internal object MinosoftSIT {
 
-    /**
-     * This function starts a thread to keep references to important test classes (otherwise they might get collected)
-     */
-    @Test(priority = 0)
+    @BeforeTest
+    fun setup() {
+        disableGC()
+        initAssetsManager()
+        setupPacketRegistry()
+        loadVersionsJson()
+        loadAssetsProperties()
+        loadDefaultRegistries()
+        `load 1_18_2 PixLyzer data`()
+        Log.log(LogMessageType.OTHER, LogLevels.INFO) { "Integration tests setup successfully!" }
+    }
+
+
     fun disableGC() {
         Thread {
             val references = listOf(Minosoft, IT)
@@ -42,32 +54,26 @@ internal object MinosoftSIT {
         }.start()
     }
 
-    @Test(priority = 1)
     fun initAssetsManager() {
         Minosoft.MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0))
     }
 
-    @Test(priority = 2)
     fun setupPacketRegistry() {
         PacketTypeRegistry.init(CountUpAndDownLatch(0))
     }
 
-    @Test(priority = 3)
     fun loadVersionsJson() {
         Versions.load(CountUpAndDownLatch(0))
     }
 
-    @Test(priority = 4)
     fun loadAssetsProperties() {
         AssetsVersionProperties.load(CountUpAndDownLatch(0))
     }
 
-    @Test(priority = 5)
     fun loadDefaultRegistries() {
         DefaultRegistries.load(CountUpAndDownLatch(0))
     }
 
-    @Test(priority = 6)
     fun `load 1_18_2 PixLyzer data`() {
         val version = Versions["1.18.2"]!!
         Assert.assertEquals(version.versionId, ProtocolVersions.V_1_18_2)
diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/StairsTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/StairsTest.kt
index e1f758e36..b3bae1288 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/StairsTest.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/StairsTest.kt
@@ -25,6 +25,6 @@ internal object StairsTest : BlockTest<Block>() {
 
     @Test
     fun testLightProperties() {
-        super.testLightProperties(0, true, false, false, booleanArrayOf(false, true, true, true, true, true)) // ToDo: one side needs to be false
+        super.testLightProperties(0, true, false, false, booleanArrayOf(false, true, false, true, true, true))
     }
 }