Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GD-275: Move c# api into onwn module #277

Merged
merged 2 commits into from
Jun 4, 2022
Merged

GD-275: Move c# api into onwn module #277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3830031
GD-275: Move c# api into onwn module
MikeSchulze Jun 4, 2022
3f27dd7
- add mono tests to cmd tool self test
MikeSchulze Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/gdUnit3/bin/GdUnitCmdTool.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class CLIRunner extends Node:
_executor.fail_fast(true)

if GdUnitTools.is_mono_supported():
_cs_executor = load("res://addons/gdUnit3/src/core/execution/Executor.cs").new()
_cs_executor = load("res://addons/gdUnit3/mono/src/core/execution/Executor.cs").new()
_cs_executor.AddGdTestEventListener(self)

var err := _executor.connect("send_event", self, "_on_executor_event")
Expand Down
0 addons/gdUnit3/src/Assertions.cs → addons/gdUnit3/mono/src/Assertions.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IArrayAssert.cs → addons/gdUnit3/mono/src/IArrayAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IAssert.cs → addons/gdUnit3/mono/src/IAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IBoolAssert.cs → addons/gdUnit3/mono/src/IBoolAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IDoubleAssert.cs → addons/gdUnit3/mono/src/IDoubleAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IExceptionAssert.cs → addons/gdUnit3/mono/src/IExceptionAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IIntAssert.cs → addons/gdUnit3/mono/src/IIntAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/INumberAssert.cs → addons/gdUnit3/mono/src/INumberAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IObjectAssert.cs → addons/gdUnit3/mono/src/IObjectAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/ISceneRunner.cs → addons/gdUnit3/mono/src/ISceneRunner.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IStringAssert.cs → addons/gdUnit3/mono/src/IStringAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/ITuple.cs → addons/gdUnit3/mono/src/ITuple.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/IValueExtractor.cs → addons/gdUnit3/mono/src/IValueExtractor.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/Utils.cs → addons/gdUnit3/mono/src/Utils.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/ArrayAssert.cs → ...s/gdUnit3/mono/src/asserts/ArrayAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/AssertBase.cs → ...ns/gdUnit3/mono/src/asserts/AssertBase.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/AssertFailures.cs → ...dUnit3/mono/src/asserts/AssertFailures.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/BoolAssert.cs → ...ns/gdUnit3/mono/src/asserts/BoolAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/Comparable.cs → ...ns/gdUnit3/mono/src/asserts/Comparable.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/DoubleAssert.cs → .../gdUnit3/mono/src/asserts/DoubleAssert.cs
View file
Open in desktop
File renamed without changes.
0 ...ns/gdUnit3/src/asserts/ExceptionAssert.cs → ...Unit3/mono/src/asserts/ExceptionAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/IntAssert.cs → addons/gdUnit3/mono/src/asserts/IntAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/NumberAssert.cs → .../gdUnit3/mono/src/asserts/NumberAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/ObjectAssert.cs → .../gdUnit3/mono/src/asserts/ObjectAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/asserts/StringAssert.cs → .../gdUnit3/mono/src/asserts/StringAssert.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/core/CsTools.cs → addons/gdUnit3/mono/src/core/CsTools.cs
View file
Open in desktop
File renamed without changes.
0 ...dUnit3/src/core/GdUnitTestSuiteBuilder.cs → ...3/mono/src/core/GdUnitTestSuiteBuilder.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/core/SceneRunner.cs → addons/gdUnit3/mono/src/core/SceneRunner.cs
View file
Open in desktop
File renamed without changes.
0 ...t3/src/core/attributes/FuzzerAttribute.cs → ...no/src/core/attributes/FuzzerAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...src/core/attributes/TestCaseAttributes.cs → ...src/core/attributes/TestCaseAttributes.cs
View file
Open in desktop
File renamed without changes.
0 ...src/core/attributes/TestStageAttribute.cs → ...src/core/attributes/TestStageAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...src/core/attributes/TestSuiteAttribute.cs → ...src/core/attributes/TestSuiteAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...s/gdUnit3/src/core/data/IValueProvider.cs → ...nit3/mono/src/core/data/IValueProvider.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/core/event/TestEvent.cs → .../gdUnit3/mono/src/core/event/TestEvent.cs
View file
Open in desktop
File renamed without changes.
0 ...Unit3/src/core/event/TestEventListener.cs → .../mono/src/core/event/TestEventListener.cs
View file
Open in desktop
File renamed without changes.
0 ...src/core/execution/AfterExecutionStage.cs → ...src/core/execution/AfterExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...core/execution/AfterTestExecutionStage.cs → ...core/execution/AfterTestExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...rc/core/execution/BeforeExecutionStage.cs → ...rc/core/execution/BeforeExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...ore/execution/BeforeTestExecutionStage.cs → ...ore/execution/BeforeTestExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...t3/src/core/execution/ExecutionContext.cs → ...no/src/core/execution/ExecutionContext.cs
View file
Open in desktop
File renamed without changes.
0 ...nit3/src/core/execution/ExecutionStage.cs → ...mono/src/core/execution/ExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...re/execution/ExecutionTimeoutException.cs → ...re/execution/ExecutionTimeoutException.cs
View file
Open in desktop
File renamed without changes.
0 ...ns/gdUnit3/src/core/execution/Executor.cs → ...Unit3/mono/src/core/execution/Executor.cs
View file
Open in desktop
File renamed without changes.
0 ...it3/src/core/execution/IExecutionStage.cs → ...ono/src/core/execution/IExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...ns/gdUnit3/src/core/execution/TestCase.cs → ...Unit3/mono/src/core/execution/TestCase.cs
View file
Open in desktop
File renamed without changes.
0 .../core/execution/TestCaseExecutionStage.cs → .../core/execution/TestCaseExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 ...src/core/execution/TestFailedException.cs → ...src/core/execution/TestFailedException.cs
View file
Open in desktop
File renamed without changes.
0 ...s/gdUnit3/src/core/execution/TestSuite.cs → ...nit3/mono/src/core/execution/TestSuite.cs
View file
Open in desktop
File renamed without changes.
0 ...core/execution/TestSuiteExecutionStage.cs → ...core/execution/TestSuiteExecutionStage.cs
View file
Open in desktop
File renamed without changes.
0 .../src/core/execution/monitor/MemoryPool.cs → .../src/core/execution/monitor/MemoryPool.cs
View file
Open in desktop
File renamed without changes.
0 ...e/execution/monitor/OrphanNodesMonitor.cs → ...e/execution/monitor/OrphanNodesMonitor.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/core/report/TestReport.cs → ...dUnit3/mono/src/core/report/TestReport.cs
View file
Open in desktop
File renamed without changes.
0 ...t3/src/core/report/TestReportCollector.cs → ...no/src/core/report/TestReportCollector.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/src/extractors/Tuple.cs → addons/gdUnit3/mono/src/extractors/Tuple.cs
View file
Open in desktop
File renamed without changes.
0 .../gdUnit3/src/extractors/ValueExtractor.cs → ...it3/mono/src/extractors/ValueExtractor.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/test/AssertionsTest.cs → addons/gdUnit3/mono/test/AssertionsTest.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/test/UtilsTest.cs → addons/gdUnit3/mono/test/UtilsTest.cs
View file
Open in desktop
File renamed without changes.
0 ...s/gdUnit3/test/asserts/ArrayAssertTest.cs → ...nit3/mono/test/asserts/ArrayAssertTest.cs
View file
Open in desktop
File renamed without changes.
0 ...ns/gdUnit3/test/asserts/BoolAssertTest.cs → ...Unit3/mono/test/asserts/BoolAssertTest.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/test/asserts/IntAssertTest.cs → ...dUnit3/mono/test/asserts/IntAssertTest.cs
View file
Open in desktop
File renamed without changes.
0 .../gdUnit3/test/asserts/ObjectAssertTest.cs → ...it3/mono/test/asserts/ObjectAssertTest.cs
View file
Open in desktop
File renamed without changes.
0 .../gdUnit3/test/asserts/StringAssertTest.cs → ...it3/mono/test/asserts/StringAssertTest.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/gdUnit3/test/core/CsToolsTest.cs → addons/gdUnit3/mono/test/core/CsToolsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void CreateTestSuite()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs")), sourceClass);

// first time generates the test suite and adds the test case
string path = Path.Combine(tmp, "TestPersonTest.cs");
Expand Down
0 addons/gdUnit3/test/core/ExampleTestSuite.cs → ...dUnit3/mono/test/core/ExampleTestSuite.cs
View file
Open in desktop
File renamed without changes.
0 addons/gdUnit3/test/core/ExecutorTest.cs → ...ns/gdUnit3/mono/test/core/ExecutorTest.cs
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions ...3/test/core/GdUnitTestSuiteBuilderTest.cs → ...o/test/core/GdUnitTestSuiteBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@ public void AfterEach()
[TestCase]
public void ParseType()
{
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/test/core/resources/testsuites/mono/noSpace/TestSuiteWithoutNamespace.cs")).IsEqual(typeof(TestSuiteWithoutNamespace));
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/test/core/resources/testsuites/mono/spaceA/TestSuite.cs")).IsEqual(typeof(GdUnit3.Tests.SpaceA.TestSuite));
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/test/core/resources/testsuites/mono/spaceB/TestSuite.cs")).IsEqual(typeof(GdUnit3.Tests.SpaceB.TestSuite));
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/mono/test/core/resources/testsuites/mono/noSpace/TestSuiteWithoutNamespace.cs")).IsEqual(typeof(TestSuiteWithoutNamespace));
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/mono/test/core/resources/testsuites/mono/spaceA/TestSuite.cs")).IsEqual(typeof(GdUnit3.Tests.SpaceA.TestSuite));
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/mono/test/core/resources/testsuites/mono/spaceB/TestSuite.cs")).IsEqual(typeof(GdUnit3.Tests.SpaceB.TestSuite));
// source file not exists
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/test/core/resources/testsuites/mono/spaceC/TestSuite.cs")).IsNull();
AssertObject(GdUnitTestSuiteBuilder.ParseType("addons/gdUnit3/mono/test/core/resources/testsuites/mono/spaceC/TestSuite.cs")).IsNull();
}

[TestCase]
public void FindMethod_LineOutOfRange()
{
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs");
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs");
AssertThrown(() => GdUnitTestSuiteBuilder.FindMethod(classPath, 0)).StartsWithMessage("Specified argument was out of the range of valid values.");
AssertThrown(() => GdUnitTestSuiteBuilder.FindMethod(classPath, 10000)).StartsWithMessage("Specified argument was out of the range of valid values.");
}

[TestCase]
public void FindMethod_NoMethodFound()
{
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs");
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs");
AssertString(GdUnitTestSuiteBuilder.FindMethod(classPath, 5)).IsNull();
AssertString(GdUnitTestSuiteBuilder.FindMethod(classPath, 11)).IsNull();
}

[TestCase]
public void FindMethod_Found()
{
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs");
var classPath = Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs");
AssertString(GdUnitTestSuiteBuilder.FindMethod(classPath, 14)).IsEqual("FirstName");
AssertString(GdUnitTestSuiteBuilder.FindMethod(classPath, 16)).IsEqual("LastName");
AssertString(GdUnitTestSuiteBuilder.FindMethod(classPath, 18)).IsEqual("FullName");
Expand All @@ -62,7 +62,7 @@ public void CreateTestSuite()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs")), sourceClass);

// first time generates the test suite and adds the test case
string testSuite = Path.Combine(tmp, "TestPersonTest.cs");
Expand All @@ -83,7 +83,7 @@ public void CreateTestSuite_NoMethodFound()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs")), sourceClass);

// use of a line number for which no method is defined in the source class
Dictionary<string, object> dictionary = GdUnitTestSuiteBuilder.Build(sourceClass, 4, Path.Combine(tmp, "TestPersonTest.cs"));
Expand All @@ -97,7 +97,7 @@ public void CreateTestSuite_NoNamespace()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson2.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson2.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson2.cs")), sourceClass);

// use of a line number for which no method is defined in the source class
string testSuite = Path.Combine(tmp, "TestPerson2Test.cs");
Expand All @@ -111,7 +111,7 @@ public void CreateTestSuite_WithNamespace()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs")), sourceClass);

// use of a line number for which no method is defined in the source class
string testSuite = Path.Combine(tmp, "TestPersonTest.cs");
Expand All @@ -125,7 +125,7 @@ public void CreateTestSuite_TestCaseAlreadyExists()
{
var tmp = CreateTempDir("build-test-suite-test");
string sourceClass = Path.Combine(tmp, "TestPerson.cs");
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs")), sourceClass);
File.Copy(Path.GetFullPath(Godot.ProjectSettings.GlobalizePath("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs")), sourceClass);

string expected = NewCreatedTestSuite(sourceClass);

Expand Down
0 addons/gdUnit3/test/core/SceneRunnerTest.cs → ...gdUnit3/mono/test/core/SceneRunnerTest.cs
View file
Open in desktop
File renamed without changes.
0 ...test/core/resources/sources/TestPerson.cs → ...test/core/resources/sources/TestPerson.cs
View file
Open in desktop
File renamed without changes.
0 ...est/core/resources/sources/TestPerson2.cs → ...est/core/resources/sources/TestPerson2.cs
View file
Open in desktop
File renamed without changes.
0 ...rces/testsuites/mono/ExampleTestSuiteA.cs → ...rces/testsuites/mono/ExampleTestSuiteA.cs
View file
Open in desktop
File renamed without changes.
0 ...esources/testsuites/mono/NotATestSuite.cs → ...esources/testsuites/mono/NotATestSuite.cs
View file
Open in desktop
File renamed without changes.
0 ...uites/mono/TestSuiteAbortOnTestTimeout.cs → ...uites/mono/TestSuiteAbortOnTestTimeout.cs
View file
Open in desktop
File renamed without changes.
0 ...tsuites/mono/TestSuiteAllStagesSuccess.cs → ...tsuites/mono/TestSuiteAllStagesSuccess.cs
View file
Open in desktop
File renamed without changes.
0 ...s/mono/TestSuiteFailAndOrpahnsDetected.cs → ...s/mono/TestSuiteFailAndOrpahnsDetected.cs
View file
Open in desktop
File renamed without changes.
0 ...suites/mono/TestSuiteFailOnMultiStages.cs → ...suites/mono/TestSuiteFailOnMultiStages.cs
View file
Open in desktop
File renamed without changes.
0 ...tsuites/mono/TestSuiteFailOnStageAfter.cs → ...tsuites/mono/TestSuiteFailOnStageAfter.cs
View file
Open in desktop
File renamed without changes.
0 ...tes/mono/TestSuiteFailOnStageAfterTest.cs → ...tes/mono/TestSuiteFailOnStageAfterTest.cs
View file
Open in desktop
File renamed without changes.
0 ...suites/mono/TestSuiteFailOnStageBefore.cs → ...suites/mono/TestSuiteFailOnStageBefore.cs
View file
Open in desktop
File renamed without changes.
0 ...es/mono/TestSuiteFailOnStageBeforeTest.cs → ...es/mono/TestSuiteFailOnStageBeforeTest.cs
View file
Open in desktop
File renamed without changes.
0 ...stsuites/mono/TestSuiteFailOnTestCase1.cs → ...stsuites/mono/TestSuiteFailOnTestCase1.cs
View file
Open in desktop
File renamed without changes.
0 ...mono/noSpace/TestSuiteWithoutNamespace.cs → ...mono/noSpace/TestSuiteWithoutNamespace.cs
View file
Open in desktop
File renamed without changes.
0 ...urces/testsuites/mono/spaceA/TestSuite.cs → ...urces/testsuites/mono/spaceA/TestSuite.cs
View file
Open in desktop
File renamed without changes.
0 ...urces/testsuites/mono/spaceB/TestSuite.cs → ...urces/testsuites/mono/spaceB/TestSuite.cs
View file
Open in desktop
File renamed without changes.
0 ...it3/test/extractors/ValueExtractorTest.cs → ...ono/test/extractors/ValueExtractorTest.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/gdUnit3/src/core/GdObjects.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static func is_cs_test_suite(instance :Node) -> bool:

static func is_cs_testsuite(script :Script) -> bool:
if GdUnitTools.is_mono_supported():
var csTools = load("res://addons/gdUnit3/src/core/CsTools.cs").new()
var csTools = load("res://addons/gdUnit3/mono/src/core/CsTools.cs").new()
return not script.resource_path.empty() and csTools.IsTestSuite(script.resource_path)
return false;

Expand Down
2 changes: 1 addition & 1 deletion addons/gdUnit3/src/core/GdUnitRunner.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func _init():
# store current runner instance to engine meta data to can be access in as a singleton
Engine.set_meta(GDUNIT_RUNNER, self)
if GdUnitTools.is_mono_supported():
_cs_executor = load("res://addons/gdUnit3/src/core/execution/Executor.cs").new()
_cs_executor = load("res://addons/gdUnit3/mono/src/core/execution/Executor.cs").new()
_cs_executor.AddGdTestEventListener(self)

func _ready():
Expand Down
2 changes: 1 addition & 1 deletion addons/gdUnit3/src/core/GdUnitTestSuiteBuilder.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func create(source :Script, line_number :int) -> Result:
if GdObjects.is_cs_script(source):
if not GdUnitTools.is_mono_supported():
return Result.error("Can't create test. No c# support found.")
var csTools = load("res://addons/gdUnit3/src/core/CsTools.cs").new()
var csTools = load("res://addons/gdUnit3/mono/src/core/CsTools.cs").new()
var result := csTools.CreateTestSuite(source.resource_path, line_number+1, test_suite_path) as Dictionary
if result.has("error"):
return Result.error(result.get("error"))
Expand Down
2 changes: 1 addition & 1 deletion addons/gdUnit3/src/core/_TestSuiteScanner.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static func _is_script_format_supported(resource_path :String) -> bool:
return false

func _parse_cs_test_suite(script :Script) -> Node:
var csTools = load("res://addons/gdUnit3/src/core/CsTools.cs").new()
var csTools = load("res://addons/gdUnit3/mono/src/core/CsTools.cs").new()
return csTools.ParseTestSuite(script.resource_path)

func _parse_test_suite(script :GDScript) -> GdUnitTestSuite:
Expand Down
4 changes: 2 additions & 2 deletions addons/gdUnit3/test/core/GdObjectsTest.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,8 @@ func test_is_snake_case() -> void:
func test_is_test_suite() -> void:
assert_bool(GdObjects.is_test_suite(GdUnitTestResourceLoader.load_gd_script("res://addons/gdUnit3/test/core/ResultTest.gd"))).is_true()
if GdUnitTools.is_mono_supported():
assert_bool(GdObjects.is_test_suite(GdUnitTestResourceLoader.load_cs_script("res://addons/gdUnit3/test/core/ExampleTestSuite.cs"))).is_true()
assert_bool(GdObjects.is_test_suite(GdUnitTestResourceLoader.load_cs_script("res://addons/gdUnit3/test/core/resources/testsuites/mono/NotATestSuite.cs"))).is_false()
assert_bool(GdObjects.is_test_suite(GdUnitTestResourceLoader.load_cs_script("res://addons/gdUnit3/mono/test/core/ExampleTestSuite.cs"))).is_true()
assert_bool(GdObjects.is_test_suite(GdUnitTestResourceLoader.load_cs_script("res://addons/gdUnit3/mono/test/core/resources/testsuites/mono/NotATestSuite.cs"))).is_false()
# currently not supported
assert_bool(GdObjects.is_test_suite(NativeScript.new())).is_false()
assert_bool(GdObjects.is_test_suite(PluginScript.new())).is_false()
Expand Down
2 changes: 1 addition & 1 deletion addons/gdUnit3/test/core/GdUnitTestSuiteBuilderTest.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func before_test():
var result := GdUnitTools.copy_file("res://addons/gdUnit3/test/core/resources/sources/test_person.gd", temp)
assert_result(result).is_success()
_example_source_gd = result.value() as String
result = GdUnitTools.copy_file("res://addons/gdUnit3/test/core/resources/sources/TestPerson.cs", temp)
result = GdUnitTools.copy_file("res://addons/gdUnit3/mono/test/core/resources/sources/TestPerson.cs", temp)
assert_result(result).is_success()
_example_source_cs = result.value() as String
_test_suite_builder = GdUnitTestSuiteBuilder.new()
Expand Down