Merge pull request #122 from zuliaio/test-framework

Test framework
zuliaio · Apr 18, 2024 · ccfe192 · ccfe192
2 parents 6d8f4f4 + cfc5b50
commit ccfe192
Show file tree

Hide file tree

Showing 69 changed files with 1,854 additions and 270 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,18 +15,18 @@ annontations = { module = "org.jetbrains:annotations", version = "24.0.0" }
 awssdk-s3 = { module = "software.amazon.awssdk:s3" }
 bson = { module = "org.mongodb:bson", version.ref = "mongodb" }
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine" }
-commons-compress = { module = "org.apache.commons:commons-compress", version = "1.25.0" }
+commons-compress = { module = "org.apache.commons:commons-compress", version = "1.26.1" }
 commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.11.1" }
-flapdoodle-mongo = { module = "de.flapdoodle.embed:de.flapdoodle.embed.mongo", version = "4.11.1" }
+flapdoodle-mongo = { module = "de.flapdoodle.embed:de.flapdoodle.embed.mongo", version = "4.12.2" }
 guava = { module = "com.google.guava:guava", version = "32.1.3-jre" }
 grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" }
 grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
-#graalvm-js = {module = "org.graalvm.js:js", version = "23.0.3"}
+graalvm-js = { module = "org.graalvm.js:js", version = "23.0.3" }
 gson = { module = "com.google.code.gson:gson", version = "2.10.1" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.16.1" }
 jakarta-validation = { module = "jakarta.validation:jakarta.validation-api" }
-jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.0" }
+jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.1" }
 javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" }
 json-io = { module = "com.cedarsoftware:json-io", version = "4.19.1" }
 junit-bom = { module = "org.junit:junit-bom", version = "5.10.1" }

diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name = "ZuliaSearch"
 
-include 'zulia-analyzer', 'zulia-common', 'zulia-client', 'zulia-data', 'zulia-query-parser', 'zulia-server', 'zulia-util'
+include 'zulia-analyzer', 'zulia-common', 'zulia-cmd-shared', 'zulia-client', 'zulia-data', 'zulia-query-parser', 'zulia-server', 'zulia-testing', 'zulia-tools', 'zulia-util'
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
diff --git a/zulia-analyzer/build.gradle.kts b/zulia-analyzer/build.gradle.kts
@@ -9,7 +9,7 @@ val luceneVersion: String by project
 defaultTasks("build", "installDist")
 
 dependencies {
-    api(project(":zulia-common"))
+    api(projects.zuliaCommon)
     api(libs.lucene.analysis.common)
 }
 

diff --git a/zulia-client/build.gradle.kts b/zulia-client/build.gradle.kts
@@ -8,8 +8,8 @@ val okHttpVersion: String by project
 val gsonVersion: String by project
 
 dependencies {
-    api(project(":zulia-common"))
-    api(project(":zulia-util"))
+    api(projects.zuliaCommon)
+    api(projects.zuliaUtil)
     implementation(libs.unirest.java.bom)
     implementation(libs.unirest.core)
     implementation(libs.unirest.gson)

diff --git a/zulia-cmd-shared/build.gradle.kts b/zulia-cmd-shared/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    `java-library`
+}
+
+description = "Zulia CMD Shared"
+
+dependencies {
+    annotationProcessor(libs.picocli.codegen)
+    api(projects.zuliaCommon)
+    implementation(libs.picocli.base)
+}
+
+
diff --git a/...md/common/SelectiveStackTraceHandler.java → ...md/common/SelectiveStackTraceHandler.java b/...md/common/SelectiveStackTraceHandler.java → ...md/common/SelectiveStackTraceHandler.java
@@ -1,4 +1,4 @@
-package io.zulia.server.cmd.common;
+package io.zulia.cmd.common;
 
 import picocli.CommandLine;
 

diff --git a/...ulia/server/cmd/common/ShowStackArgs.java → ...va/io/zulia/cmd/common/ShowStackArgs.java b/...ulia/server/cmd/common/ShowStackArgs.java → ...va/io/zulia/cmd/common/ShowStackArgs.java
@@ -1,4 +1,4 @@
-package io.zulia.server.cmd.common;
+package io.zulia.cmd.common;
 
 import picocli.CommandLine;
 

diff --git a/...a/io/zulia/server/cmd/ZuliaCommonCmd.java → ...a/io/zulia/cmd/common/ZuliaCommonCmd.java b/...a/io/zulia/server/cmd/ZuliaCommonCmd.java → ...a/io/zulia/cmd/common/ZuliaCommonCmd.java
@@ -1,6 +1,5 @@
-package io.zulia.server.cmd;
+package io.zulia.cmd.common;
 
-import io.zulia.server.cmd.common.SelectiveStackTraceHandler;
 import picocli.CommandLine;
 import picocli.CommandLine.Help.Ansi.Style;
 import picocli.CommandLine.Help.ColorScheme;

diff --git a/...rver/cmd/common/ZuliaVersionProvider.java → ...ulia/cmd/common/ZuliaVersionProvider.java b/...rver/cmd/common/ZuliaVersionProvider.java → ...ulia/cmd/common/ZuliaVersionProvider.java
@@ -1,4 +1,4 @@
-package io.zulia.server.cmd.common;
+package io.zulia.cmd.common;
 
 import io.zulia.util.ZuliaVersion;
 import picocli.CommandLine;

diff --git a/zulia-server/src/main/resources/logback.xml → ...cmd-shared/src/main/resources/logback.xml b/zulia-server/src/main/resources/logback.xml → ...cmd-shared/src/main/resources/logback.xml
diff --git a/zulia-cmd-shared/src/test/resources/sample_testing.yaml b/zulia-cmd-shared/src/test/resources/sample_testing.yaml
@@ -0,0 +1,42 @@
+connections:
+  testConnection:
+    serverAddress: 192.168.1.30
+    port: 32191
+indexes:
+  publications:
+    indexName: publications
+    connection: testConnection
+queries:
+  pubsStar:
+    index: publications
+    query: "*:*"
+  pubsWithoutTitle:
+    index: publications
+    query: "-title:*"
+  pubsTest:
+    index: publications
+    query: "title:*"
+    amount: 1
+    facets:
+      - field: pubYear
+        topN: 10
+      - field: journalName
+        topN: 10
+    statFacets:
+      - facetField: pubYear
+        numericField: rcr
+        topN: 10
+tests:
+  pubsCount:
+    expr: pubsStar.count > 200000
+  pubsWithTitleCount:
+    expr: pubsWithoutTitle.count < pubsStar.count * 0.01
+  test1:
+    expr: pubsTest.count > 1
+  test2:
+    expr: pubsTest.doc[0]["authors"][0]["lastName"] == "Abumere"
+  test3:
+    expr: pubsTest.facet["pubYear"][0].label == "2022" && pubsTest.facet["pubYear"][0].count > 1000000
+
+
+
diff --git a/zulia-common/build.gradle.kts b/zulia-common/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 
     protobuf(libs.sketches.java)
 
-    api(project(":zulia-util"))
+    api(projects.zuliaUtil)
 }
 
 

diff --git a/zulia-data/build.gradle.kts b/zulia-data/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     api(libs.bundles.poi)
     api(libs.univocity.parsers)
     api(libs.jackson.databind)
-    api(project(":zulia-util"))
+    api(projects.zuliaUtil)
 }
 
 
diff --git a/zulia-query-parser/build.gradle.kts b/zulia-query-parser/build.gradle.kts
@@ -9,7 +9,7 @@ val luceneVersion: String by project
 defaultTasks("build", "installDist")
 
 dependencies {
-    api(project(":zulia-analyzer"))
+    api(projects.zuliaAnalyzer)
     api(libs.lucene.queryparser)
 }
 

diff --git a/zulia-server/build.gradle.kts b/zulia-server/build.gradle.kts
@@ -37,8 +37,8 @@ tasks.withType<Test> {
 }
 
 dependencies {
-    implementation(project(":zulia-client")) //needed for admin tools
-    implementation(project(":zulia-query-parser"))
+    implementation(projects.zuliaQueryParser)
+    implementation(projects.zuliaCmdShared)
     annotationProcessor(libs.micronaut.http.validation)
     annotationProcessor(libs.micronaut.openapi)
     annotationProcessor(libs.micronaut.serde.processor)
@@ -73,214 +73,56 @@ dependencies {
     testImplementation(libs.flapdoodle.mongo)
     testImplementation(libs.micronaut.http.client)
     testImplementation(libs.micronaut.test.junit5)
+    testImplementation(project(":zulia-client"))
 }
 tasks.withType<JavaCompile> {
     options.isFork = true
     options.forkOptions.jvmArgs?.addAll(listOf("-Dmicronaut.openapi.views.spec=swagger-ui.enabled=true,swagger-ui.theme=flattop"))
 }
 
-val zuliaScriptTask = tasks.getByName<CreateStartScripts>("startScripts")
 
-
-zuliaScriptTask.applicationName = "zulia"
-zuliaScriptTask.mainClass.set("io.zulia.server.cmd.Zulia")
-val zuliaAdminScriptTask = tasks.register<CreateStartScripts>("createZuliaAdminScript") {
-    applicationName = "zuliaadmin"
-    mainClass.set("io.zulia.server.cmd.ZuliaAdmin")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
-
-    doLast {
-        val unixScriptFile = file(unixScript)
-        val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
-        unixScriptFile.writeText(newText, Charsets.UTF_8)
-    }
-}
-
-val zuliaDScriptTask = tasks.register<CreateStartScripts>("createZuliaDScript") {
+val zuliaScriptTask = tasks.getByName<CreateStartScripts>("startScripts") {
     applicationName = "zuliad"
     mainClass.set("io.zulia.server.cmd.ZuliaD")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
-
     doLast {
         val unixScriptFile = file(unixScript)
         val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
+        val newText = text.replace("exec ", "export APP_HOME\nexec ")
         unixScriptFile.writeText(newText, Charsets.UTF_8)
     }
 }
 
-val zuliaDumpScriptTask = tasks.register<CreateStartScripts>("createZuliaDumpScript") {
-    applicationName = "zuliadump"
-    mainClass.set("io.zulia.server.cmd.ZuliaDump")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
 
-    doLast {
-        val unixScriptFile = file(unixScript)
-        val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
-        unixScriptFile.writeText(newText, Charsets.UTF_8)
-    }
-}
-
-val zuliaRestoreScriptTask = tasks.register<CreateStartScripts>("createZuliaRestoreScript") {
-    applicationName = "zuliarestore"
-    mainClass.set("io.zulia.server.cmd.ZuliaRestore")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
-
-    doLast {
-        val unixScriptFile = file(unixScript)
-        val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
-        unixScriptFile.writeText(newText, Charsets.UTF_8)
-    }
-}
-
-val zuliaExportScriptTask = tasks.register<CreateStartScripts>("createZuliaExportScript") {
-    applicationName = "zuliaexport"
-    mainClass.set("io.zulia.server.cmd.ZuliaExport")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
-
-    doLast {
-        val unixScriptFile = file(unixScript)
-        val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
-        unixScriptFile.writeText(newText, Charsets.UTF_8)
-    }
-}
-
-val zuliaImportScriptTask = tasks.register<CreateStartScripts>("createZuliaImportScript") {
-    applicationName = "zuliaimport"
-    mainClass.set("io.zulia.server.cmd.ZuliaImport")
-    outputDir = zuliaScriptTask.outputDir
-    classpath = zuliaScriptTask.classpath
-
-    doLast {
-        val unixScriptFile = file(unixScript)
-        val text = unixScriptFile.readText(Charsets.UTF_8)
-        val newText = text.replace("APP_HOME=\"`pwd -P`\"", "export APP_HOME=\"`pwd -P`\"")
-        unixScriptFile.writeText(newText, Charsets.UTF_8)
-    }
-}
 
 tasks.register("autocompleteDir") {
     doLast {
         mkdir("${layout.buildDirectory.get()}/autocomplete")
     }
 }
 
-task("picoCliZuliaAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args = listOf("--force", "--completionScript", "${layout.buildDirectory.get()}/autocomplete/zulia.sh", "io.zulia.server.cmd.Zulia")
-}
-
 task("picoCliZuliaDAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args = listOf("--force", "--completionScript", "${layout.buildDirectory.get()}/autocomplete/zuliad.sh", "io.zulia.server.cmd.ZuliaD")
-}
-
-task("picoCliZuliaAdminAutoComplete", JavaExec::class) {
     dependsOn("autocompleteDir")
     mainClass.set("picocli.AutoComplete")
     classpath = sourceSets["main"].runtimeClasspath
     args = listOf(
         "--force",
         "--completionScript",
-        "${layout.buildDirectory.get()}/autocomplete/zuliaadmin.sh",
-        "io.zulia.server.cmd.ZuliaAdmin"
+        "${layout.buildDirectory.get()}/autocomplete/zuliad.sh",
+        "io.zulia.server.cmd.ZuliaD"
     )
 }
 
-task("picoCliZuliaDumpAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args =
-        listOf("--force", "--completionScript", "${layout.buildDirectory.get()}/autocomplete/zuliadump.sh", "io.zulia.server.cmd.ZuliaDump")
-}
-
-
-
-task("picoCliZuliaRestoreAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args = listOf(
-        "--force",
-        "--completionScript",
-        "${layout.buildDirectory.get()}/autocomplete/zuliarestore.sh",
-        "io.zulia.server.cmd.ZuliaRestore"
-    )
-}
-
-
-task("picoCliZuliaImportAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args = listOf(
-        "--force",
-        "--completionScript",
-        "${layout.buildDirectory.get()}/autocomplete/zuliaimport.sh",
-        "io.zulia.server.cmd.ZuliaImport"
-    )
-}
-
-task("picoCliZuliaExportAutoComplete", JavaExec::class) {
-    dependsOn("autocompleteDir")
-    mainClass.set("picocli.AutoComplete")
-    classpath = sourceSets["main"].runtimeClasspath
-    args = listOf(
-        "--force",
-        "--completionScript",
-        "${layout.buildDirectory.get()}/autocomplete/zuliaexport.sh",
-        "io.zulia.server.cmd.ZuliaExport"
-    )
-}
 
 tasks.withType<AbstractArchiveTask> {
     dependsOn(
-        "picoCliZuliaAutoComplete",
         "picoCliZuliaDAutoComplete",
-        "picoCliZuliaAdminAutoComplete",
-        "picoCliZuliaDumpAutoComplete",
-        "picoCliZuliaRestoreAutoComplete",
-        "picoCliZuliaImportAutoComplete",
-        "picoCliZuliaExportAutoComplete"
     )
 }
 
 
 distributions {
     main {
         contents {
-            from(zuliaAdminScriptTask) {
-                into("bin")
-            }
-            from(zuliaDScriptTask) {
-                into("bin")
-            }
-            from(zuliaDumpScriptTask) {
-                into("bin")
-            }
-            from(zuliaRestoreScriptTask) {
-                into("bin")
-            }
-            from(zuliaExportScriptTask) {
-                into("bin")
-            }
-            from(zuliaImportScriptTask) {
-                into("bin")
-            }
             from("${layout.buildDirectory.get()}/autocomplete/") {
                 into("bin/autocomplete")
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ dependencies { @@
         protobuf(libs.sketches.java)
-        api(project(":zulia-util"))
+        api(projects.zuliaUtil)
     }
@@ Expand Down @@