GD-129: Adding CSharp test support

.github/workflows/selftest-3.3.x-mono.yml

@@ -0,0 +1,39 @@
+name: Run selftest Godot 3.3.x - Mono
+on: [push]
+
+jobs:
+  testing:
+    strategy:
+      matrix:
+        godot: [mono-3.3.1, mono-3.3.2, mono-3.3.3]
+
+    name: GdUnit3 Selftest on Godot ${{ matrix.godot }}
+    runs-on: ubuntu-latest
+    container:
+      image: barichello/godot-ci:${{ matrix.godot }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          lfs: true
+
+      - name: Compile
+        run: |
+          nuget restore
+          mkdir -p .mono/assemblies/Debug
+          cp /usr/local/bin/GodotSharp/Api/Release/* .mono/assemblies/Debug
+          msbuild
+
+      - name: Run Selftes
+        timeout-minutes: 7
+        env: 
+          GODOT_BIN: "/usr/local/bin/godot"
+        shell: bash
+        run: ./runtest.sh --selftest
+
+      - name: Collect Test Reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: Report_${{ matrix.godot }}
+          path: reports/**

.github/workflows/selftest-3.3.x.yml

@@ -5,8 +5,8 @@ jobs:
   testing:
     strategy:
       matrix:
-        godot: [3.3, 3.3.1, 3.3.2, 3.3.3, mono-3.3.3]
-    
+        godot: [3.3, 3.3.1, 3.3.2, 3.3.3]
+
     name: GdUnit3 Selftest on Godot ${{ matrix.godot }}
     runs-on: ubuntu-latest
     container:
@@ -20,15 +20,14 @@ jobs:
       - name: Setup
         shell: bash
         run: echo "GODOT_BIN=/usr/local/bin/godot" >> $GITHUB_ENV
-          
+
       - name: Run Selftes
         shell: bash
         run: ./runtest.sh --selftest
-          
+
       - name: Collect Test Report
         if: always()
         uses: actions/upload-artifact@v2
         with:
           name: Report_${{ matrix.godot }}
           path: reports/**
-

addons/gdUnit3/bin/GdUnitCmdTool.gd

@@ -15,6 +15,7 @@ class CLIRunner extends Node:
 	const RETURN_ERROR    = 100
 	const RETURN_WARNING  = 101
 
+
 	var _state = INIT
 	var _signal_handler
 	var _test_suites_to_process :Array
@@ -24,6 +25,7 @@ class CLIRunner extends Node:
 	var _report_max: int = DEFAULT_REPORT_COUNT
 	var _runner_config := GdUnitRunnerConfig.new()
 	var _console := CmdConsole.new()
+	var _cs_executor
 
 	var _cmd_options: = CmdOptions.new([
 			CmdOption.new("-a, --add", "-a <directory|path of testsuite>", "Adds the given test suite or directory to the execution pipeline.", TYPE_STRING),
@@ -49,6 +51,11 @@ class CLIRunner extends Node:
 		_executor.disable_default_yield()
 		# stop on first test failure to fail fast
 		_executor.fail_fast(true)
+
+		if GdUnitTools.is_mono_supported():
+			_cs_executor = load("res://addons/gdUnit3/src/core/execution/Executor.cs").new()
+			_cs_executor.AddGdTestEventListener(self)
+
 		var err := _executor.connect("send_event", self, "_on_executor_event")
 		if err != OK:
 			push_error("Error on startup, can't connect executor for 'send_event'")
@@ -67,10 +74,13 @@ class CLIRunner extends Node:
 					_state = STOP
 				else:
 					# process next test suite
-					var test_suite := _test_suites_to_process.pop_front() as GdUnitTestSuite
-					var fs = _executor.execute(test_suite)
-					if fs is GDScriptFunctionState:
-						yield(fs, "completed")
+					var test_suite := _test_suites_to_process.pop_front() as Node
+					if GdObjects.is_cs_script(test_suite.get_script()):
+						_cs_executor.execute(test_suite)
+					else:
+						var fs = _executor.execute(test_suite)
+						if fs is GDScriptFunctionState:
+							yield(fs, "completed")
 				set_process(true)
 			STOP:
 				_state = EXIT
@@ -201,7 +211,7 @@ class CLIRunner extends Node:
 		for test_suite in test_suites:
 			skip_suite(test_suite, skipped)
 
-	func skip_suite(test_suite :GdUnitTestSuite, skipped :Dictionary) -> void:
+	func skip_suite(test_suite :Node, skipped :Dictionary) -> void:
 		var skipped_suites := skipped.keys()
 		if skipped_suites.empty():
 			return
@@ -217,7 +227,7 @@ class CLIRunner extends Node:
 				else:
 					# skip tests
 					for test_to_skip in skipped_tests:
-						var test_case :_TestCase = test_suite.find_node(test_to_skip, true, false)
+						var test_case :_TestCase = test_suite.get_test_case_by_name(test_to_skip)
 						if test_case:
 							test_case.skip(true)
 						else:
@@ -229,6 +239,9 @@ class CLIRunner extends Node:
 			total += (test_suite as Node).get_child_count()
 		return total
 
+	func PublishEvent(data) -> void:
+		_on_executor_event(GdUnitEvent.new().deserialize(data.AsDictionary()))
+
 	func _on_executor_event(event :GdUnitEvent):
 		match event.type():
 			GdUnitEvent.INIT:
@@ -244,21 +257,22 @@ class CLIRunner extends Node:
 				_report.add_testsuite_report(GdUnitTestSuiteReport.new(event.resource_path(), event.suite_name()))
 
 			GdUnitEvent.TESTSUITE_AFTER:
-				_report.update_test_suite_report(event.suite_name(), event.skipped_count(), event.orphan_nodes(),  event.elapsed_time())
+				_report.update_test_suite_report(event.resource_path(), 0, event.orphan_nodes(),  event.elapsed_time())
 
 			GdUnitEvent.TESTCASE_BEFORE:
-				_report.add_testcase_report(event.suite_name(), GdUnitTestCaseReport.new(event.test_name()))
+				_report.add_testcase_report(event.resource_path(), GdUnitTestCaseReport.new(event.resource_path(), event.test_name()))
 
 			GdUnitEvent.TESTCASE_AFTER:
 				var test_report := GdUnitTestCaseReport.new(
+					event.resource_path(),
 					event.test_name(),
 					event.is_error(),
 					event.is_failed(),
 					event.orphan_nodes(),
 					event.skipped_count(),
 					event.reports(),
 					event.elapsed_time())
-				_report.update_testcase_report(event.suite_name(), test_report)
+				_report.update_testcase_report(event.resource_path(), test_report)
 		print_status(event)
 
 	func report_exit_code(report :GdUnitHtmlReport) -> int:

addons/gdUnit3/plugin.gd

@@ -13,7 +13,7 @@ func _enter_tree():
 	# show possible update notification when is enabled
 	if GdUnitSettings.is_update_notification_enabled():
 		_update_tool = load("res://addons/gdUnit3/src/update/GdUnitUpdate.tscn").instance()
-		get_parent().add_child(_update_tool)
+		add_child(_update_tool)
 
 	# install SignalHandler singleton
 	GdUnitSingleton.add_singleton(SignalHandler.SINGLETON_NAME, "res://addons/gdUnit3/src/core/event/SignalHandler.gd")

addons/gdUnit3/src/GdUnitStringAssert.gd

@@ -51,5 +51,5 @@ func ends_with(expected: String) -> GdUnitStringAssert:
 	return self
 
 # Verifies that the current String has the expected length by used comparator.
-func has_length(lenght: int, comparator: int = Comparator.EXACTLY) -> GdUnitStringAssert:
+func has_length(lenght: int, comparator: int = Comparator.EQUAL) -> GdUnitStringAssert:
 	return self

addons/gdUnit3/src/IAssert.cs

@@ -0,0 +1,47 @@
+using System.ComponentModel;
+
+namespace GdUnit3
+{
+
+    /// <summary> Main interface of all GdUnit asserts </summary>
+    public interface IAssert
+    {
+
+        enum EXPECT : int
+        {
+            [Description("assert expects ends with success")]
+            SUCCESS = 0,
+            [Description("assert expects ends with errors")]
+            FAIL = 1
+        }
+    }
+
+    /// <summary> Base interface of all GdUnit asserts </summary>
+    public interface IAssertBase<V> : IAssert
+    {
+
+        /// <summary>Verifies that the current value is null.</summary>
+        IAssertBase<V> IsNull();
+
+        /// <summary> Verifies that the current value is not null.</summary>
+        IAssertBase<V> IsNotNull();
+
+        /// <summary> Verifies that the current value is equal to expected one.
+        IAssertBase<V> IsEqual(V expected);
+
+        /// <summary> Verifies that the current value is not equal to expected one.</summary>
+        IAssertBase<V> IsNotEqual(V expected);
+
+        /// <summary></summary>
+        IAssertBase<V> TestFail();
+
+        /// <summary> Verifies the failure message is equal to expected one.</summary>
+        IAssertBase<V> HasFailureMessage(string expected);
+
+        /// <summary> Verifies that the failure starts with the given value.</summary>
+        IAssertBase<V> StartsWithFailureMessage(string value);
+
+        /// <summary> Overrides the default failure message by given custom message.</summary>
+        IAssertBase<V> OverrideFailureMessage(string message);
+    }
+}

addons/gdUnit3/src/IBoolAssert.cs

@@ -0,0 +1,16 @@
+
+namespace GdUnit3
+{
+
+    /// <summary> An Assertion Tool to verify boolean values </summary>
+    public interface IBoolAssert : IAssertBase<bool>
+    {
+
+        /// <summary> Verifies that the current value is true.</summary>
+        IBoolAssert IsTrue();
+
+        /// <summary> Verifies that the current value is false.</summary>
+        IBoolAssert IsFalse();
+
+    }
+}

addons/gdUnit3/src/IDoubleAssert.cs

@@ -0,0 +1,10 @@
+
+namespace GdUnit3
+{
+
+    /// <summary> Base interface for integer assertions.</summary>
+    public interface IDoubleAssert : INumberAssert<double>
+    {
+
+    }
+}

addons/gdUnit3/src/IIntAssert.cs

@@ -0,0 +1,9 @@
+namespace GdUnit3
+{
+
+    /// <summary> Base interface for integer assertions.</summary>
+    public interface IIntAssert : INumberAssert<int>
+    {
+
+    }
+}

addons/gdUnit3/src/INumberAssert.cs

@@ -0,0 +1,62 @@
+using System;
+
+namespace GdUnit3
+{
+
+    /// <summary> Base interface for number assertions.</summary>
+    public interface INumberAssert<V> : IAssertBase<V>
+    {
+
+        /// <summary> Verifies that the current value is less than the given one.</summary>
+        public INumberAssert<V> IsLess(V expected);
+
+
+        /// <summary> Verifies that the current value is less than or equal the given one.</summary>
+        public INumberAssert<V> IsLessEqual(V expected);
+
+
+        /// <summary> Verifies that the current value is greater than the given one.</summary>
+        public INumberAssert<V> IsGreater(V expected);
+
+
+        /// <summary> Verifies that the current value is greater than or equal the given one.</summary>
+        public INumberAssert<V> IsGreaterEqual(V expected);
+
+
+        /// <summary> Verifies that the current value is even.</summary>
+        public INumberAssert<V> IsEven();
+
+
+        /// <summary> Verifies that the current value is odd.</summary>
+        public INumberAssert<V> IsOdd();
+
+
+        /// <summary> Verifies that the current value is negative.</summary>
+        public INumberAssert<V> IsNegative();
+
+
+        /// <summary> Verifies that the current value is not negative.</summary>
+        public INumberAssert<V> IsNotNegative();
+
+
+        /// <summary> Verifies that the current value is equal to zero.</summary>
+        public INumberAssert<V> IsZero();
+
+
+        /// <summary> Verifies that the current value is not equal to zero.</summary>
+        public INumberAssert<V> IsNotZero();
+
+
+        /// <summary> Verifies that the current value is in the given set of values.</summary>
+        public INumberAssert<V> IsIn(Array expected);
+
+
+        /// <summary> Verifies that the current value is not in the given set of values.</summary>
+        public INumberAssert<V> IsNotIn(Array expected);
+
+
+        /// <summary> Verifies that the current value is between the given boundaries (inclusive).</summary>
+        public INumberAssert<V> IsBetween(V from, V to);
+
+    }
+}

addons/gdUnit3/src/IObjectAssert.cs

@@ -0,0 +1,21 @@
+
+namespace GdUnit3
+{
+
+    /// <summary> An Assertion Tool to verify object values </summary>
+    public interface IObjectAssert : IAssertBase<object>
+    {
+        // Verifies that the current value is the same as the given one.
+        public IObjectAssert IsSame(object expected);
+
+        // Verifies that the current value is not the same as the given one.
+        public IObjectAssert IsNotSame(object expected);
+
+        // Verifies that the current value is an instance of the given type.
+        public IObjectAssert IsInstanceof<ExpectedType>();
+
+        // Verifies that the current value is not an instance of the given type.
+        public IObjectAssert IsNotInstanceof<ExpectedType>();
+
+    }
+}