Using GdUnit3MonoAPI class wrapper to load GdUnit3Mono assembly (#308)

Author: MikeSchulze

addons/gdUnit3/bin/GdUnitCmdTool.gd

@@ -54,7 +54,7 @@ class CLIRunner extends Node:
 		_executor.fail_fast(true)
 
 		if GdUnitTools.is_mono_supported():
-			_cs_executor = GdUnit3MonoBridge.create_executor(self)
+			_cs_executor = GdUnit3MonoAPI.create_executor(self)
 
 		var err := _executor.connect("send_event", self, "_on_executor_event")
 		if err != OK:

addons/gdUnit3/src/core/GdObjects.gd

@@ -327,7 +327,7 @@ static func is_script(value) -> bool:
 	return is_object(value) and value is Script
 
 static func is_test_suite(script :Script) -> bool:
-	return is_gd_testsuite(script) or GdUnit3MonoBridge.is_test_suite(script.resource_path)
+	return is_gd_testsuite(script) or GdUnit3MonoAPI.is_test_suite(script.resource_path)
 
 static func is_native_class(value) -> bool:
 	return is_object(value) and value.to_string() != null and value.to_string().find("GDScriptNativeClass") != -1

addons/gdUnit3/src/core/GdUnitRunner.gd

@@ -30,7 +30,7 @@ func _init():
 	_signal_handler = GdUnitSingleton.get_or_create_singleton(SignalHandler.SINGLETON_NAME, "res://addons/gdUnit3/src/core/event/SignalHandler.gd")
 	# store current runner instance to engine meta data to can be access in as a singleton
 	Engine.set_meta(GDUNIT_RUNNER, self)
-	_cs_executor = GdUnit3MonoBridge.create_executor(self)
+	_cs_executor = GdUnit3MonoAPI.create_executor(self)
 
 func _ready():
 	var config_result := _config.load()

addons/gdUnit3/src/core/GdUnitTestSuiteBuilder.gd

@@ -23,7 +23,7 @@ func create(source :Script, line_number :int) -> Result:
 	_save_and_close_script(test_suite_path)
 
 	if GdObjects.is_cs_script(source):
-		return GdUnit3MonoBridge.create_test_suite(source.resource_path, line_number+1, test_suite_path)
+		return GdUnit3MonoAPI.create_test_suite(source.resource_path, line_number+1, test_suite_path)
 
 	var parser := GdScriptParser.new()
 	var lines := source.source_code.split("\n")

addons/gdUnit3/src/core/_TestSuiteScanner.gd

@@ -55,8 +55,8 @@ static func _file(dir :Directory, file_name :String) -> String:
 func _parse_is_test_suite(resource_path :String) -> Node:
 	if not _is_script_format_supported(resource_path):
 		return null
-	if GdUnit3MonoBridge.is_test_suite(resource_path):
-		return GdUnit3MonoBridge.parse_test_suite(resource_path)
+	if GdUnit3MonoAPI.is_test_suite(resource_path):
+		return GdUnit3MonoAPI.parse_test_suite(resource_path)
 	var script :Script = ResourceLoader.load(resource_path)
 	if not GdObjects.is_test_suite(script):
 		return null
@@ -68,7 +68,7 @@ static func _is_script_format_supported(resource_path :String) -> bool:
 	var ext := resource_path.get_extension()
 	if ext == "gd":
 		return true
-	return GdUnit3MonoBridge.is_csharp_file(resource_path)
+	return GdUnit3MonoAPI.is_csharp_file(resource_path)
 
 func _parse_test_suite(script :GDScript) -> GdUnitTestSuite:
 	var test_suite = script.new()

addons/gdUnit3/src/mono/GdUnit3MonoAPI.cs

@@ -0,0 +1,5 @@
+
+// GdUnit3 c# API wrapper
+public class GdUnit3MonoAPI : GdUnit3.GdUnit3MonoAPI
+{
+}

addons/gdUnit3/src/mono/GdUnit3MonoBridge.gd addons/gdUnit3/src/mono/GdUnit3MonoAPI.gd

@@ -1,12 +1,12 @@
 extends Reference
-class_name GdUnit3MonoBridge
+class_name GdUnit3MonoAPI
 
 const _instance : = []
 
 static func instance() :
 	if not _instance.empty():
 		return _instance[0]
-	var instance =  load("res://addons/gdUnit3/src/mono/GdUnit3MonoBridge.cs").new()
+	var instance =  load("res://addons/gdUnit3/src/mono/GdUnit3MonoAPI.cs").new()
 	_instance.append(instance)
 	return _instance[0]
 

addons/gdUnit3/src/mono/GdUnit3MonoBridge.cs

@@ -0,0 +1,23 @@
+// GdUnit generated TestSuite
+using Godot;
+using GdUnit3;
+using System;
+
+namespace GdUnit3
+{
+	using static Assertions;
+	using static Utils;
+
+	[TestSuite]
+	public class GdUnit3MonoAPITest
+	{
+		// TestSuite generated from
+		private const string sourceClazzPath = "d:/develop/workspace/gdUnit3/addons/gdUnit3/src/mono/GdUnit3MonoAPI.cs";
+		[TestCase]
+		public void IsTestSuite()
+		{
+			AssertThat(GdUnit3MonoAPI.IsTestSuite("res://addons/gdUnit3/src/mono/GdUnit3MonoAPI.cs")).IsFalse();
+			AssertThat(GdUnit3MonoAPI.IsTestSuite("res://addons/gdUnit3/test/mono/GdUnit3MonoAPITest.cs")).IsTrue();
+		}
+	}
+}

addons/gdUnit3/test/mono/GdUnit3MonoAPITest.cs

@@ -1,11 +1,11 @@
 # GdUnit generated TestSuite
 #warning-ignore-all:unused_argument
 #warning-ignore-all:return_value_discarded
-class_name GdUnit3MonoBridgeTest
+class_name GdUnit3MonoAPITest
 extends GdUnitTestSuite
 
 # TestSuite generated from
-const __source = 'res://addons/gdUnit3/src/mono/GdUnit3MonoBridge.gd'
+const __source = 'res://addons/gdUnit3/src/mono/GdUnit3MonoAPI.gd'
 var _example_source_cs :String
 
 func before_test():
@@ -20,8 +20,8 @@ func test_create_test_suite() -> void:
 		return
 	var source := load(_example_source_cs)
 	var test_suite_path := _TestSuiteScanner.resolve_test_suite_path(source.resource_path, "test")
-	var result := GdUnit3MonoBridge.create_test_suite(source.resource_path, 18, test_suite_path)
-	
+	var result := GdUnit3MonoAPI.create_test_suite(source.resource_path, 18, test_suite_path)
+
 	assert_result(result).is_success()
 	var info := result.value() as Dictionary
 	assert_str(info.get("path")).is_equal("user://tmp/test/examples/TestPersonTest.cs")

addons/gdUnit3/test/mono/GdUnit3MonoBridgeTest.gd addons/gdUnit3/test/mono/GdUnit3MonoAPITest.gd

@@ -305,14 +305,14 @@ _global_script_classes=[ {
 "path": "res://addons/gdUnit3/src/core/parse/GdScriptParser.gd"
 }, {
 "base": "Reference",
-"class": "GdUnit3MonoBridge",
+"class": "GdUnit3MonoAPI",
 "language": "GDScript",
-"path": "res://addons/gdUnit3/src/mono/GdUnit3MonoBridge.gd"
+"path": "res://addons/gdUnit3/src/mono/GdUnit3MonoAPI.gd"
 }, {
 "base": "GdUnitTestSuite",
-"class": "GdUnit3MonoBridgeTest",
+"class": "GdUnit3MonoAPITest",
 "language": "GDScript",
-"path": "res://addons/gdUnit3/test/mono/GdUnit3MonoBridgeTest.gd"
+"path": "res://addons/gdUnit3/test/mono/GdUnit3MonoAPITest.gd"
 }, {
 "base": "Reference",
 "class": "GdUnit3Version",
@@ -1249,8 +1249,8 @@ _global_script_class_icons={
 "GdMarkDownReaderTest": "",
 "GdObjects": "",
 "GdScriptParser": "",
-"GdUnit3MonoBridge": "",
-"GdUnit3MonoBridgeTest": "",
+"GdUnit3MonoAPI": "",
+"GdUnit3MonoAPITest": "",
 "GdUnit3Version": "",
 "GdUnit3VersionTest": "",
 "GdUnitArgumentMatcher": "",