Merge pull request #69 from RediCloud/tests

feat: test framework

.gitignore

@@ -4,6 +4,8 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 redicloud-version.properties
+/testing/
+test-cloud/
 
 ### IntelliJ IDEA ###
 .idea/
@@ -14,12 +16,6 @@ out/
 !**/src/main/**/out/
 !**/src/test/**/out/
 
-### Test Files ###
-/test/**/tmp/
-/test/**/.libs/
-/test/**/storage/
-/test/**/*.jar
-
 ### Eclipse ###
 .apt_generated
 .classpath

apis/base-api/src/main/kotlin/dev/redicloud/api/utils/CloudFiles.kt

@@ -19,33 +19,37 @@ val MINECRAFT_VERSIONS_FOLDER = CloudFile("versions", "storage", folder = true)
 val TEMPLATE_FOLDER = CloudFile("templates", "storage", folder = true)
 val DATABASE_JSON = CloudFile("database.json", "storage")
 val CONNECTORS_FOLDER = CloudFile("connectors", "storage", folder = true)
-val MODULE_FOLDER = CloudFile("modules", "storage", folder = true)
+val MODULES_FOLDER = CloudFile("modules", "storage", folder = true)
 
 fun toCloudFile(universalPath: String): File {
     return File(CLOUD_PATH, universalPath)
 }
 
-fun toUniversalPath(file: File): String {
+fun toUniversalPath(file: File, forceSeperator: String = File.separator): String {
     val path = file.absolutePath.replace(CLOUD_PATH, "")
-    return if (path.startsWith(File.separator)) path.replaceFirst(File.separator, "") else path
+        .replace(File.separator, forceSeperator)
+    return if (path.startsWith(forceSeperator)) {
+        path.replaceFirst(forceSeperator, "")
+    } else path
 }
 
 class CloudFile(val name: String, val parent: String = "", val folder: Boolean = false) {
 
-    fun getCloudPath(): String {
+    fun getCloudPath(cloudFolder: File? = null, separator: String = File.separator): String {
+        val prefixPath = cloudFolder?.absolutePath ?: CLOUD_PATH
         return if (parent.isEmpty()) {
-            CLOUD_PATH + File.separator + name
+            prefixPath + separator + name
         }else {
-            CLOUD_PATH + File.separator + parent + File.separator + name
+            prefixPath + separator + parent + separator + name
         }
     }
 
-    fun getFile(): File {
-        return File(getCloudPath())
+    fun getFile(cloudFolder: File? = null): File {
+        return File(getCloudPath(cloudFolder))
     }
 
-    fun createIfNotExists(): File {
-        val file = getFile()
+    fun createIfNotExists(cloudFolder: File? = null): File {
+        val file = getFile(cloudFolder)
         if (file.exists()) return file
         if (!file.parentFile.exists()) file.parentFile.mkdirs()
         if (folder) {

build.gradle.kts

@@ -35,6 +35,15 @@ allprojects {
         dependency(BuildDependencies.KHTTP)
         dependency(BuildDependencies.KOTLIN_REFLECT)
         dependency(BuildDependencies.GUICE)
+
+        testImplementation(BuildDependencies.DOCKER_TEST_CONTAINERS)
+        testImplementation(BuildDependencies.GSON)
+        testImplementation(BuildDependencies.LOGBACK_CORE)
+        testImplementation(BuildDependencies.LOGBACK_CLASSIC)
+        testImplementation(project(":utils"))
+        testImplementation(project(":apis:base-api"))
+        testImplementation(project(":database"))
+        testImplementation(project(":services:node-service"))
     }
 
     tasks {
@@ -90,18 +99,4 @@ allprojects {
         }
     }
 
-}
-
-tasks.register("buildCloudAndCopy") {
-    project.allprojects.forEach {
-        if (it == it.rootProject) return@forEach
-        try {
-            val task = it.tasks.named("buildAndCopy")
-            dependsOn(task)
-            println("Project ${it.name} has ${task.name} task!")
-        }catch (_: UnknownDomainObjectException) {
-            println("Project ${it.name} has no buildAndCopy task! Use default build task instead.")
-            dependsOn(it.tasks.named("build"))
-        }
-    }
 }

buildSrc/src/main/kotlin/BuildDependencies.kt

@@ -32,6 +32,7 @@ object BuildDependencies {
     const val JLINE_CONSOLE = "org.jline:jline-console:3.25.1"
     const val JLINE_JANSI = "org.jline:jline-terminal-jansi:3.25.1"
 
+    const val DOCKER_TEST_CONTAINERS = "org.testcontainers:testcontainers:1.19.7"
     const val BCPROV = "org.bouncycastle:bcprov-jdk15on:1.70"
     const val BCPKIX = "org.bouncycastle:bcpkix-jdk15on:1.70"
 }

connectors/bukkit-connector/build.gradle.kts

@@ -44,34 +44,6 @@ dependencies {
     shade(project(":connectors:bukkit-legacy"))
 }
 
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${original.nameWithoutExtension}-local.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/connectors")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
-}
-
 val shadowModJar by tasks.creating(ShadowJar::class) {
     archiveFileName.set(Builds.getOutputFileName(project) + "-shadow.jar")
 

connectors/bungeecord-connector/build.gradle.kts

@@ -35,31 +35,3 @@ dependencies {
 
     compileOnly(BuildDependencies.BUNGEECORD_API)
 }
-
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${original.nameWithoutExtension}-local.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/connectors")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
-}

connectors/minestom-connector/build.gradle.kts

@@ -46,35 +46,6 @@ dependencies {
     shade(project(":server-factories:remote-server-factory"))
     shade(project(":apis:connector-api"))
     shade(BuildDependencies.CLOUD_LIBLOADER_BOOTSTRAP)
-
     compileOnly(BuildDependencies.MINESTOM_API)
     compileOnly(BuildDependencies.MINESTOM_EXTENSIONS)
-}
-
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${original.nameWithoutExtension}-local.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/connectors")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
 }

connectors/velocity-connector/build.gradle.kts

@@ -40,31 +40,3 @@ dependencies {
     compileOnly(BuildDependencies.VELOCITY_API)
     kapt(BuildDependencies.VELOCITY_API)
 }
-
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${original.nameWithoutExtension}-local.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/connectors")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
-}

database/src/main/kotlin/dev/redicloud/database/DatabaseConnection.kt

@@ -48,12 +48,15 @@ class DatabaseConnection(
             .setCodec(GsonCodec)
         if (config.isCluster()) {
             val clusterConfig = redissonConfig.useClusterServers()
-                .setClientName(serviceId.toName()).also {
-                    if(config.password.isNotEmpty()) it.setPassword(config.password)
+                .setClientName(serviceId.toName())
+                .also {
+                    if(!config.password.isNullOrEmpty()) {
+                        it.setPassword(config.password)
+                    }
+                    if (!config.username.isNullOrEmpty()) {
+                        it.setUsername(config.username)
+                    }
                 }
-            if (!config.username.isNullOrEmpty()) {
-                clusterConfig.setUsername(config.username)
-            }
             config.nodes.forEach { node ->
                 clusterConfig.addNodeAddress(node.toConnectionString())
             }
@@ -70,8 +73,11 @@ class DatabaseConnection(
                 .setConnectionPoolSize(connectionPoolSize)
                 .setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
                 .setConnectionMinimumIdleSize(connectionMinimumIdleSize)
-                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize).also {
-                    if(config.password.isNotEmpty()) it.setPassword(config.password)
+                .setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
+                .also {
+                    if(!config.password.isNullOrEmpty()) {
+                        it.setPassword(config.password)
+                    }
                 }
             if (!config.username.isNullOrEmpty()) {
                 singleConfig.setUsername(config.username)

database/src/main/kotlin/dev/redicloud/database/config/DatabaseConfiguration.kt

@@ -5,7 +5,7 @@ import java.io.File
 
 data class DatabaseConfiguration(
     val username: String? = "",
-    val password: String = "",
+    val password: String? = "",
     val nodes: List<DatabaseNode>,
     val databaseId: Int = 0
 ) {

examples/example-module/build.gradle.kts

@@ -15,31 +15,3 @@ dependencies {
 
     compileOnly(BuildDependencies.SPIGOT_API)
 }
-
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${Builds.getOutputModuleFileName(project)}.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/modules")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
-}

examples/example-plugin/build.gradle.kts

@@ -14,32 +14,4 @@ dependencies {
     // compileOnly("dev.redicloud:api:<cloud-version>")
 
     compileOnly(BuildDependencies.SPIGOT_API)
-}
-
-tasks.register("buildAndCopy") {
-    dependsOn(tasks.named("build"))
-    doLast {
-        val outputJar = Builds.getOutputFileName(project) + ".jar"
-        val original = File(project.buildDir.resolve("libs"), outputJar)
-        val outputJarFile = File(project.buildDir.resolve("libs"), "${original.nameWithoutExtension}-local.jar")
-        original.renameTo(outputJarFile)
-        if (original.exists()) {
-            original.delete()
-        }
-        for (i in 1..Builds.testNodes) {
-            val id = if (i in 1..9) "0$i" else i.toString()
-            val path = File(Builds.getTestDirPath(project, "node$id"), "storage/templates/example/bukkit/plugins")
-            if (!path.exists()) {
-                path.mkdirs()
-            }
-            val targetJar = File(path, outputJarFile.name)
-            if (targetJar.exists()) {
-                targetJar.delete()
-            }
-            project.copy {
-                from(outputJarFile)
-                into(path)
-            }
-        }
-    }
 }

modules/module-handler/src/main/kotlin/dev/redicloud/modules/ModuleHandler.kt

@@ -5,7 +5,7 @@ import com.google.inject.name.Named
 import dev.redicloud.api.modules.*
 import dev.redicloud.api.service.ServiceId
 import dev.redicloud.api.utils.CloudInjectable
-import dev.redicloud.api.utils.MODULE_FOLDER
+import dev.redicloud.api.utils.MODULES_FOLDER
 import dev.redicloud.api.utils.injector
 import dev.redicloud.api.version.ICloudServerVersionType
 import dev.redicloud.commands.api.SUGGESTERS
@@ -176,7 +176,7 @@ class ModuleHandler(
 
     fun detectModules() = lock.withLock {
         moduleFiles.clear()
-        MODULE_FOLDER.getFile().listFiles()?.filter {
+        MODULES_FOLDER.getFile().listFiles()?.filter {
             it.isFile && it.extension == "jar"
         }?.filter {
             val jarFile = JarFile(it)