Fix ThemeDB initialization in tests #81305
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also fixes class name shadowing in Viewport/Window tests.
akien-mga
reviewed
Sep 5, 2023
| register_scene_types(); | ||
| register_driver_types(); | ||
|
|
||
| register_scene_singletons(); |
There was a problem hiding this comment.
I trust moving the theme stuff around, but I'm not confident about this. How does this interact with the module/GDExtension scene initialization level? This code is very core and moving stuff around typically breaks stuff.
There was a problem hiding this comment.
It's a method that I've added, it only registers ThemeDB right now and I moved it specifically so the singleton is available for other consumers as early as possible. 🙃
akien-mga
approved these changes
Sep 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on another PR I ran into issues with tests because of how we work with
ThemeDBin tests. Basically, each test cases initializes its ownThemeDBinstance, which overrides the singleton pointer. This means that interactions with the singleton instance become unreliable. It doesn't cause any visible problems at the moment, but it does with my PR, because I needControlandWindowclasses to statically interact with the singleton.So I'm fixing that, and also slightly changing the order of initialization for
ThemeDB. Now it's initialized before scene types, so that they can work with it. I also added an explicit way to finalize default resources inThemeDB, which is needed for test cases which destroy and recreate the theme constantly.Unfortunately, we have to do it this way, because test cases also create and destroy the
RenderingServerinstance, which themes need for textures to work. Otherwise I'd just use the singleton.Also noticed that
ViewportandWindowtests used the same name for the registered class, causing a warning fromClassDBwhen running tests. So fixed that as well.