Adapt Tests

utopia-rise · Oct 11, 2024 · b72e0ea · b72e0ea
1 parent 9a505e3
commit b72e0ea
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/harness/flattened-library-tests/settings.gradle.kts b/harness/flattened-library-tests/settings.gradle.kts
@@ -8,7 +8,10 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-debug")).using(project(":godot-api-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/fqname-library-tests/settings.gradle.kts b/harness/fqname-library-tests/settings.gradle.kts
@@ -8,7 +8,10 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-debug")).using(project(":godot-api-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/hierarchical-library-tests/settings.gradle.kts b/harness/hierarchical-library-tests/settings.gradle.kts
@@ -8,7 +8,10 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-debug")).using(project(":godot-api-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -40,6 +40,7 @@ properties = [
 	nav_meshes_dictionary,
 	nullable_dictionary,
 	color,
+	rid,
 	packed_byte_array,
 	packed_int32_array,
 	packed_float64_array,

diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj
@@ -30,7 +30,8 @@ properties = [
 	dictionary
 ]
 functions = [
-    greeting,
+    _ready,
+	greeting,
 	connect_and_trigger_signal,
 	signal_callback
 ]
diff --git a/harness/tests/settings.gradle.kts b/harness/tests/settings.gradle.kts
@@ -8,8 +8,10 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library-debug")).using(project(":godot-library"))
-        substitute(module("com.utopia-rise:godot-library-release")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-api-library-debug")).using(project(":godot-api-library"))
         substitute(module("com.utopia-rise:godot-coroutine-library-debug")).using(project(":godot-coroutine-library"))
         substitute(module("com.utopia-rise:godot-coroutine-library-release")).using(project(":godot-coroutine-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))

diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -19,6 +19,7 @@ import godot.annotation.IntRange
 import godot.annotation.LongRange
 import godot.annotation.MultilineText
 import godot.annotation.PlaceHolderText
+import godot.annotation.Range
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterProperty
@@ -39,7 +40,6 @@ import godot.core.Vector3
 import godot.core.dictionaryOf
 import godot.core.variantArrayOf
 import godot.extensions.getNodeAs
-import godot.registration.Range
 import godot.tests.subpackage.OtherScript
 import godot.util.RealT
 import org.joda.time.DateTime