Skip to content

162 explicit autoload update #163

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+389 −338
Open

162 explicit autoload update #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a215d
#162 Removing auto-generated Godot.Autoload and updating tests/docs
Cat-Lips Nov 13, 2025
6126070
#162 Fixing ambiguous type error
Cat-Lips Nov 15, 2025
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
140 changes: 91 additions & 49 deletions Godot 3 Tests/TestScenes/Feature93.AutoloadExtensions/AutoloadExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#define RENAME_TEST

using System;
using FluentAssertions;
using FluentAssertions.Execution;
Expand All @@ -8,6 +6,14 @@

namespace GodotTests.TestScenes;

[Autoload]
public static partial class MyAutoloads;

[Autoload]
[AutoloadRename("NamedAutoLoad1", "namedAutoLoad1")]
[AutoloadRename("NamedAutoLoad2", "namedAutoLoad2")]
public static partial class MyAutoloadsWithRenames;

[SceneTree]
public partial class AutoloadExtensionTests : Node, ITest
{
Expand Down Expand Up @@ -36,62 +42,98 @@ static void TypeTest()
{
static Type TypeOf<T>(T _) => typeof(T);

TypeOf(Autoload.AutoloadScene).Should().Be<Control>();
TypeOf(Autoload.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(Autoload.AutoloadSceneGD).Should().Be<Control>();
TypeOf(MyAutoloads.AutoloadScene).Should().Be<Control>();
TypeOf(MyAutoloads.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(MyAutoloads.AutoloadSceneGD).Should().Be<Control>();

TypeOf(MyAutoloads.InheritedScene).Should().Be<Control>();
TypeOf(MyAutoloads.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(MyAutoloads.InheritedSceneGD).Should().Be<Control>();

TypeOf(MyAutoloads.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(MyAutoloads.InheritedScriptCS).Should().Be<InheritedScript>();

TypeOf(Autoload.InheritedScene).Should().Be<Control>();
TypeOf(Autoload.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(Autoload.InheritedSceneGD).Should().Be<Control>();
TypeOf(MyAutoloads.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(MyAutoloads.AutoloadScriptGD2).Should().Be<Spatial>();
TypeOf(MyAutoloads.AutoloadScriptGD3).Should().Be<Container>();

TypeOf(Autoload.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(Autoload.InheritedScriptCS).Should().Be<InheritedScript>();
TypeOf(MyAutoloads.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(MyAutoloads.InheritedScriptGD2).Should().Be<Spatial>();
TypeOf(MyAutoloads.InheritedScriptGD3).Should().Be<Container>();

TypeOf(Autoload.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(Autoload.AutoloadScriptGD2).Should().Be<Spatial>();
TypeOf(Autoload.AutoloadScriptGD3).Should().Be<Container>();
TypeOf(MyAutoloads.namedAutoLoad1).Should().Be<Control>();
TypeOf(MyAutoloads.namedAutoLoad2).Should().Be<Control>();

TypeOf(Autoload.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(Autoload.InheritedScriptGD2).Should().Be<Spatial>();
TypeOf(Autoload.InheritedScriptGD3).Should().Be<Container>();
// As above, so below (except those so marked)
TypeOf(MyAutoloadsWithRenames.AutoloadScene).Should().Be<Control>();
TypeOf(MyAutoloadsWithRenames.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(MyAutoloadsWithRenames.AutoloadSceneGD).Should().Be<Control>();

#if RENAME_TEST
TypeOf(Autoload.NamedAutoLoad1).Should().Be<Control>();
TypeOf(Autoload.NamedAutoLoad2).Should().Be<Control>();
#else
TypeOf(Autoload.namedAutoLoad1).Should().Be<Control>();
TypeOf(Autoload.namedAutoLoad2).Should().Be<Control>();
#endif
TypeOf(MyAutoloadsWithRenames.InheritedScene).Should().Be<Control>();
TypeOf(MyAutoloadsWithRenames.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(MyAutoloadsWithRenames.InheritedSceneGD).Should().Be<Control>();

TypeOf(MyAutoloadsWithRenames.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(MyAutoloadsWithRenames.InheritedScriptCS).Should().Be<InheritedScript>();

TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD2).Should().Be<Spatial>();
TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD3).Should().Be<Container>();

TypeOf(MyAutoloadsWithRenames.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(MyAutoloadsWithRenames.InheritedScriptGD2).Should().Be<Spatial>();
TypeOf(MyAutoloadsWithRenames.InheritedScriptGD3).Should().Be<Container>();

TypeOf(MyAutoloadsWithRenames.NamedAutoLoad1).Should().Be<Control>(); // Renamed!
TypeOf(MyAutoloadsWithRenames.NamedAutoLoad2).Should().Be<Control>(); // Renamed!
}

static void ValueTest()
{
Autoload.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
Autoload.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
Autoload.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

Autoload.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
Autoload.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
Autoload.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

Autoload.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
Autoload.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

Autoload.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
Autoload.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
Autoload.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

Autoload.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
Autoload.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
Autoload.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

#if RENAME_TEST
Autoload.NamedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
Autoload.NamedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();
#else
Autoload.namedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
Autoload.namedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();
#endif
MyAutoloads.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
MyAutoloads.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloads.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
MyAutoloads.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloads.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
MyAutoloads.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

MyAutoloads.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloads.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
MyAutoloads.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

MyAutoloads.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloads.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
MyAutoloads.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

MyAutoloads.namedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.namedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();

// As above, so below (except those so marked)
MyAutoloadsWithRenames.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloadsWithRenames.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
MyAutoloadsWithRenames.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloadsWithRenames.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloadsWithRenames.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
MyAutoloadsWithRenames.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloadsWithRenames.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
MyAutoloadsWithRenames.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

MyAutoloadsWithRenames.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloadsWithRenames.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
MyAutoloadsWithRenames.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

MyAutoloadsWithRenames.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloadsWithRenames.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Spatial>();
MyAutoloadsWithRenames.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<Container>();

MyAutoloadsWithRenames.NamedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>(); // Renamed!
MyAutoloadsWithRenames.NamedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>(); // Renamed!
}

void EnsureIsInTree()
Expand Down
11 changes: 0 additions & 11 deletions Godot 3 Tests/TestScenes/Feature93.AutoloadExtensions/AutoloadRenameTest.cs
View file
Open in desktop

This file was deleted.

149 changes: 96 additions & 53 deletions Godot 4 Tests/TestScenes/Feature93.AutoloadExtensions/AutoloadExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#define RENAME_TEST

using System;
using FluentAssertions;
using FluentAssertions.Execution;
Expand All @@ -8,6 +6,14 @@

namespace GodotTests.TestScenes;

[Autoload]
public static partial class MyAutoloads;

[Autoload]
[AutoloadRename("NamedAutoLoad1", "namedAutoLoad1")]
[AutoloadRename("NamedAutoLoad2", "namedAutoLoad2")]
public static partial class MyAutoloadsWithRenames;

[SceneTree]
public partial class AutoloadExtensionTests : Node, ITest
{
Expand Down Expand Up @@ -36,61 +42,98 @@ static void TypeTest()
{
static Type TypeOf<T>(T _) => typeof(T);

TypeOf(Autoload.AutoloadScene).Should().Be<Control>();
TypeOf(Autoload.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(Autoload.AutoloadSceneGD).Should().Be<Control>();

TypeOf(Autoload.InheritedScene).Should().Be<Control>();
TypeOf(Autoload.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(Autoload.InheritedSceneGD).Should().Be<Control>();

TypeOf(Autoload.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(Autoload.InheritedScriptCS).Should().Be<InheritedScript>();

TypeOf(Autoload.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(Autoload.AutoloadScriptGD2).Should().Be<Node3D>();
TypeOf(Autoload.AutoloadScriptGD3).Should().Be<GpuParticles3D>();

TypeOf(Autoload.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(Autoload.InheritedScriptGD2).Should().Be<Node3D>();
TypeOf(Autoload.InheritedScriptGD3).Should().Be<GpuParticles3D>();
#if RENAME_TEST
TypeOf(Autoload.NamedAutoLoad1).Should().Be<Control>();
TypeOf(Autoload.NamedAutoLoad2).Should().Be<Control>();
#else
TypeOf(Autoload.namedAutoLoad1).Should().Be<Control>();
TypeOf(Autoload.namedAutoLoad2).Should().Be<Control>();
#endif
TypeOf(MyAutoloads.AutoloadScene).Should().Be<Control>();
TypeOf(MyAutoloads.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(MyAutoloads.AutoloadSceneGD).Should().Be<Control>();

TypeOf(MyAutoloads.InheritedScene).Should().Be<Control>();
TypeOf(MyAutoloads.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(MyAutoloads.InheritedSceneGD).Should().Be<Control>();

TypeOf(MyAutoloads.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(MyAutoloads.InheritedScriptCS).Should().Be<InheritedScript>();

TypeOf(MyAutoloads.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(MyAutoloads.AutoloadScriptGD2).Should().Be<Node3D>();
TypeOf(MyAutoloads.AutoloadScriptGD3).Should().Be<GpuParticles3D>();

TypeOf(MyAutoloads.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(MyAutoloads.InheritedScriptGD2).Should().Be<Node3D>();
TypeOf(MyAutoloads.InheritedScriptGD3).Should().Be<GpuParticles3D>();

TypeOf(MyAutoloads.namedAutoLoad1).Should().Be<Control>();
TypeOf(MyAutoloads.namedAutoLoad2).Should().Be<Control>();

// As above, so below (except those so marked)
TypeOf(MyAutoloadsWithRenames.AutoloadScene).Should().Be<Control>();
TypeOf(MyAutoloadsWithRenames.AutoloadSceneCS).Should().Be<AutoloadSceneCS>();
TypeOf(MyAutoloadsWithRenames.AutoloadSceneGD).Should().Be<Control>();

TypeOf(MyAutoloadsWithRenames.InheritedScene).Should().Be<Control>();
TypeOf(MyAutoloadsWithRenames.InheritedSceneCS).Should().Be<InheritedSceneCS>();
TypeOf(MyAutoloadsWithRenames.InheritedSceneGD).Should().Be<Control>();

TypeOf(MyAutoloadsWithRenames.AutoloadScriptCS).Should().Be<AutoloadScript>();
TypeOf(MyAutoloadsWithRenames.InheritedScriptCS).Should().Be<InheritedScript>();

TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD1).Should().Be<Node2D>();
TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD2).Should().Be<Node3D>();
TypeOf(MyAutoloadsWithRenames.AutoloadScriptGD3).Should().Be<GpuParticles3D>();

TypeOf(MyAutoloadsWithRenames.InheritedScriptGD1).Should().Be<Node>(); // Can't currently resolve if extending by class name
TypeOf(MyAutoloadsWithRenames.InheritedScriptGD2).Should().Be<Node3D>();
TypeOf(MyAutoloadsWithRenames.InheritedScriptGD3).Should().Be<GpuParticles3D>();

TypeOf(MyAutoloadsWithRenames.NamedAutoLoad1).Should().Be<Control>(); // Renamed!
TypeOf(MyAutoloadsWithRenames.NamedAutoLoad2).Should().Be<Control>(); // Renamed!
}

static void ValueTest()
{
Autoload.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
Autoload.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
Autoload.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

Autoload.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
Autoload.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
Autoload.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

Autoload.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
Autoload.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

Autoload.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
Autoload.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
Autoload.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

Autoload.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
Autoload.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
Autoload.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

#if RENAME_TEST
Autoload.NamedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
Autoload.NamedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();
#else
Autoload.namedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
Autoload.namedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();
#endif
MyAutoloads.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
MyAutoloads.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloads.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
MyAutoloads.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloads.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
MyAutoloads.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

MyAutoloads.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloads.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
MyAutoloads.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

MyAutoloads.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloads.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
MyAutoloads.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

MyAutoloads.namedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloads.namedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>();

// As above, so below (except those so marked)
MyAutoloadsWithRenames.AutoloadScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloadsWithRenames.AutoloadSceneCS.Should().NotBeNull().And.BeOfType<AutoloadSceneCS>();
MyAutoloadsWithRenames.AutoloadSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloadsWithRenames.InheritedScene.Should().NotBeNull().And.BeOfType<Control>();
MyAutoloadsWithRenames.InheritedSceneCS.Should().NotBeNull().And.BeOfType<InheritedSceneCS>();
MyAutoloadsWithRenames.InheritedSceneGD.Should().NotBeNull().And.BeOfType<Control>();

MyAutoloadsWithRenames.AutoloadScriptCS.Should().NotBeNull().And.BeOfType<AutoloadScript>();
MyAutoloadsWithRenames.InheritedScriptCS.Should().NotBeNull().And.BeOfType<InheritedScript>();

MyAutoloadsWithRenames.AutoloadScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloadsWithRenames.AutoloadScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
MyAutoloadsWithRenames.AutoloadScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

MyAutoloadsWithRenames.InheritedScriptGD1.Should().NotBeNull().And.BeOfType<Node2D>();
MyAutoloadsWithRenames.InheritedScriptGD2.Should().NotBeNull().And.BeOfType<Node3D>();
MyAutoloadsWithRenames.InheritedScriptGD3.Should().NotBeNull().And.BeOfType<GpuParticles3D>();

MyAutoloadsWithRenames.NamedAutoLoad1.Should().NotBeNull().And.BeOfType<Control>(); // Renamed!
MyAutoloadsWithRenames.NamedAutoLoad2.Should().NotBeNull().And.BeOfType<Control>(); // Renamed!
}

void EnsureIsInTree()
Expand Down
11 changes: 0 additions & 11 deletions Godot 4 Tests/TestScenes/Feature93.AutoloadExtensions/AutoloadRenameTest.cs
View file
Open in desktop

This file was deleted.

Loading