-
Notifications
You must be signed in to change notification settings - Fork 724
Fixes #4274 - v2win vsdebugconsole issue CM related UnitTest failures #4287
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.
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
Fixes #4274 - v2win vsdebugconsole issue CM related UnitTest failures #4287
Conversation
…ow size badly using VSDebugConsole.exe
* Update package versions and remove hack code from RuneExtensions Updated several package versions in `Directory.Packages.props`, including `JetBrains.Annotations`, `Microsoft.Extensions.Logging.Abstractions`, `System.IO.Abstractions`, and `Wcwidth`. Refactored methods in `RuneExtensions.cs`: - Simplified `GetColumns` by removing special Unicode handling. - Renamed constants to follow naming conventions. - Improved logic and readability in `DecodeSurrogatePair`, `Encode`, and `GetEncodingLength`. - Streamlined `IsSurrogatePair` and `MakePrintable` for clarity and efficiency. * Update package version ranges for flexibility Updated the `JetBrains.Annotations` package to use a version range starting from `2025.2.2` to allow future updates. Adjusted the `Microsoft.Extensions.Logging.Abstractions` package to a version range `[9.0.0,10)` for compatibility. Changed `System.IO.Abstractions` to a range `[22.0.16,23)` and `Wcwidth` to `[3.0.0,)` to enable future updates within specified ranges.
… structure (gui-cs#4270) * Initial plan * Remove legacy drivers and reorganize v2 architecture Co-authored-by: tig <[email protected]> * Extract Windows key helper utilities and fix build Co-authored-by: tig <[email protected]> * Fix all test references to legacy drivers Co-authored-by: tig <[email protected]> * Update documentation to reflect new driver architecture Co-authored-by: tig <[email protected]> * Remove V2.cd diagram file Co-authored-by: tig <[email protected]> * Fix test failures: support legacy drivers and update exception handling Co-authored-by: tig <[email protected]> * updated driver names * Move V2 tests from ConsoleDrivers/V2 to proper locations Co-authored-by: tig <[email protected]> * Rename ApplicationV2 to ModernApplicationImpl to remove v2 terminology Co-authored-by: tig <[email protected]> * Remove V2 terminology from test drivers and FakeDriver classes Co-authored-by: tig <[email protected]> * Merge ModernApplicationImpl into ApplicationImpl and move to App folder Co-authored-by: tig <[email protected]> * Create modern FakeDriver with component factory architecture in Terminal.Gui project Co-authored-by: tig <[email protected]> * Refactor: Move non-platform-dependent code from /Drivers to /App Co-authored-by: tig <[email protected]> * Code cleanup and org * Unit test reorg * Refactor MainLoop architecture: rename classes and enhance documentation for clarity Co-authored-by: tig <[email protected]> * Add comprehensive FakeDriver tests (WIP - some tests need fixes) Co-authored-by: tig <[email protected]> * Fixed FakeDriver build failures * Fix all FakeDriver test failures - Application.Top creation and clipboard behaviors Co-authored-by: tig <[email protected]> * Fixed FakeDriver build failures2 * Remove hanging legacy FakeDriver tests that use Console.MockKeyPresses Co-authored-by: tig <[email protected]> * Fixed some tests * Fixed more tests * Fixed more tests * Fix bad copilot (gui-cs#4277) * Update Terminal.Gui/Drivers/FakeDriver/FakeConsoleOutput.cs Co-authored-by: Copilot <[email protected]> * Refactor Application Init and Update Tests Refactored `Application.Init` to improve initialization logic: - Added fallback to `ForceDriver` when `driverName` is null. - Changed repeated `Init` calls to throw `InvalidOperationException`. - Updated `_driverName` assignment logic for robustness. Enhanced `IConsoleDriver` with detailed remarks on implementations. Revised test cases to align with updated `Application.Init` behavior: - Replaced `FakeDriver` with `null` and `driverName: "fake"`. - Skipped or commented out tests incompatible with new logic. - Improved formatting and removed redundant setup code. Improved code style and consistency across the codebase: - Standardized parameter formatting and spacing. - Removed outdated comments and unused code. General cleanup to enhance readability and maintainability. * Warp fix copilot (gui-cs#4278) * More fixes (gui-cs#4279) * Fixes/works around test failures and temporarily disable failing test Updated `FakeDriver` to set `RunningUnitTests` to `true` and initialize dimensions using `FakeConsole`. Modified `TestRespondersDisposedAttribute` to set `ConsoleDriver.RunningUnitTests` in the `Before` method, ensuring proper behavior during unit tests. Temporarily disabled the `Button_CanFocus_False_Raises_Accepted_Correctly` test in `ViewCommandTests` by adding a `Skip` parameter to the `[Fact]` attribute, referencing issue gui-cs#4270. * Allow all tests to run despite failures in UnitTests Modified the `dotnet test` command in the `Run UnitTestsParallelizable` step to set `xunit.stopOnFail` to `false`. This ensures that the test runner does not stop execution on the first failure, allowing all tests to execute regardless of individual test outcomes. * Refactor ApplicationScreenTests for cleaner setup/teardown Refactored `ClearContents_Called_When_Top_Frame_Changes` test: - Added `[AutoInitShutdown]` attribute for automatic lifecycle management. - Replaced manual `Application.Init` and `Application.Top` setup with `Application.Begin` and `RunState`. - Simplified event handling by defining `ClearedContents` handler inline. - Removed explicit cleanup logic, relying on `Application.End` for teardown. Updated `using` directives to include `UnitTests` namespace. * Attempt to fix intermittent local test failures. Update ApplicationImpl initialization parameter Changed the second parameter of the `impl.Init` method in the `FakeApplicationFactory` class from `"dotnet"` to `"fake"`. * Code cleanup to cause Action to re-run. * Stop tests on first failure in UnitTestsParallelizable Updated the `dotnet test` command in `unit-tests.yml` to set the `xunit.stopOnFail` parameter to `true`. This change ensures that test execution halts immediately upon encountering a failure, allowing quicker identification and resolution of issues. Note that this may prevent the full test suite from running in the event of a failure. * Allow all tests to run despite failures in CI Updated `unit-tests.yml` to set `xunit.stopOnFail` to `false` in both `Run UnitTests` and `Run UnitTestsParallelizable` steps. This ensures that the test runner does not stop execution on the first test failure, allowing all tests to complete even if some fail. * Enhance RuneExtensions docs and update user dictionary Updated the `<remarks>` section in `RuneExtensions.GetColumns` to include details about the `wcwidth` implementation and improved readability with `<para>` tags. Added `wcwidth` to the user dictionary in `Terminal.sln.DotSettings` to avoid spelling errors. * Improve XML doc formatting in RuneExtensions.cs Updated the remarks section of the `GetColumns` method in the `RuneExtensions` class to enhance readability by reformatting and properly indenting `<para>` tags. The content remains unchanged, describing the method's implementation via `wcwidth` and its role as a Terminal.Gui extension for `System.Text.Rune`. * Refactor drivers and improve clipboard handling Replaced legacy drivers (`CursesDriver`, `NetDriver`) with `UnixDriver` and `DotNetDriver` across the codebase, including comments, method names, and test cases. Updated documentation and remarks to reflect the new driver names and platforms. Revamped clipboard handling with new platform-specific implementations: `UnixClipboard` for Unix, `MacOSXClipboard` for macOS, and `WSLClipboard` for Linux under WSL. Removed the old `CursesClipboard` and consolidated clipboard logic. Updated test cases to align with the new drivers and clipboard implementations. Improved naming consistency and cleaned up redundant code. Updated the README and documentation to reflect these changes. * Remove `PlatformColor` from `Attribute` struct This commit removes the `PlatformColor` property from the `Attribute` struct, simplifying the codebase by eliminating platform-specific color handling. The following changes were made: - Removed `PlatformColor` from the `Attribute` struct, including its initialization, usage, and related comments. - Updated constructors to no longer initialize or use `PlatformColor`. - Modified `Equals` and `GetHashCode` methods to exclude `PlatformColor`. - Updated `UnixComponentFactory` documentation to remove references to "v2unix." - Renamed `v2TestDriver` to `testDriver` in the `With` class for clarity. - Removed `PlatformColor` references in `DriverAssert` and related error messages. - Deleted test cases in `AttributeTests` that relied on `PlatformColor`. - Cleaned up comments and TODOs related to `PlatformColor` and `UnixDriver`. These changes reflect a shift away from platform-dependent color management, improving code clarity and reducing complexity. Remove `PlatformColor` and simplify `Attribute` logic The `PlatformColor` property has been removed from the `Attribute` struct, along with its associated logic, simplifying the codebase and eliminating platform-specific dependencies. Constructors, equality checks, and hash code generation in `Attribute` have been updated accordingly. The `CurrentAttribute` property in `ConsoleDriver` and `OutputBuffer` has been simplified, removing dependencies on `Application.Driver`. The `MakeColor` method logic has been removed or simplified in related classes. Tests in `AttributeTests` have been refactored to reflect these changes, focusing on `Foreground`, `Background`, and `Style`. Unix-specific logic tied to `PlatformColor` has been eliminated. Additional updates include renaming parameters in the `With` class for clarity, simplifying `DriverAssert` output, and performing minor code cleanups to improve readability and maintainability. * Refactor Terminal.Gui driver architecture for v2 Updated documentation to reflect the new modular driver architecture in Terminal.Gui v2. - Revised `namespace-drivers.md` to include new components (`IConsoleInput`, `IConsoleOutput`, `IInputProcessor`, `IOutputBuffer`, `IWindowSizeMonitor`) and terminal size monitoring. - Replaced "Key Components" with "Architecture Overview" and added details on the **Component Factory** pattern. - Documented the four driver implementations (`DotNetDriver`, `WindowsDriver`, `UnixDriver`, `FakeDriver`) and their platform-specific optimizations. - Added a "Threading Model" section to explain the multi-threaded design for responsive input handling. - Updated examples to demonstrate driver capabilities and explicit driver selection. In `drivers.md`: - Expanded the "Overview" to emphasize the modular, component-based architecture. - Reorganized "Drivers" into "Available Drivers" and added details on `FakeDriver` for unit testing. - Added sections on "Initialization Flow," "Shutdown Flow," and platform-specific driver details. - Provided examples for accessing driver components and creating custom drivers. In `index.md`: - Updated "Cross Platform" feature to reflect new driver names and clarified compatibility with SSH and monochrome terminals. * Moved files around --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: tig <[email protected]> Co-authored-by: Tig <[email protected]> Co-authored-by: Thomas Nind <[email protected]> Co-authored-by: Copilot <[email protected]>
…anged configuration
….com:BDisp/Terminal.Gui into BDisp-v2_4274_v2win-window-size-vsdebugconsole-fix
…e-vsdebugconsole-fix Tries to fix sync context test
Changed `fail-fast` to `false` in `non_parallel_unittests` to allow all runners to complete even if errors occur. Updated `xunit.stopOnFail` to `true` in both `Run UnitTests` and `Run UnitTestsParallelizable` steps to stop test execution immediately upon failure. These changes improve test handling and execution consistency. Refactor and enhance configuration and scheme handling Refactored `ConfigurationManager` and `Scope<T>` to improve clarity and ensure proper resetting to hardcoded defaults. Updated `Color` constructor to use ARGB values for accuracy. Added debug assertions and logging for better test reliability. Expanded test coverage: - Verified hardcoded schemes and themes reset correctly. - Added tests for `UpdateFromJson` behavior and `Color.ToString` output. - Improved `SchemeManager` and `SchemeTests` to validate attributes and scheme overrides. General improvements include better state management during tests and enhanced readability of event handlers.
…al.Gui into v2_4274-vsdebugconsole-and-unittests
Note UnitTests now fail in I'm now diving in deeper to figure this out. I likely has something to do with the way CM sets up its global caches and how DeepCloning works. |
@tig this is a changed unit test of your original. That really prove that the CM isn't resetting to the original configuration at all. [Fact]
public void UpdateFromJson_DisableTrue_NewView_Normal_Attribute_Matches_Baseline_TopLevel_Scheme ()
{
Assert.True (IsInitialized ());
Assert.False (IsEnabled);
// Capture hardCoded hard-coded TopLevel scheme colors
Dictionary<string, Scheme> hardCodedSchemes = new (SchemeManager.GetSchemes ());
Color hardCodedTopLevelNormalFg = new (hardCodedSchemes ["Toplevel"].Normal.Foreground);
Color hardCodedTopLevelNormalBg = new (hardCodedSchemes ["Toplevel"].Normal.Background);
Assert.Equal (new Color (StandardColor.CadetBlue), hardCodedTopLevelNormalFg);
Assert.Equal (new Color (StandardColor.Charcoal), hardCodedTopLevelNormalBg);
// Mutate via UpdateFromJson (applies runtime theme), then Disable(true)
var cmt = new ConfigurationManagerTests (output);
cmt.UpdateFromJson ();
// Capture hardCoded hard-coded TopLevel scheme colors after UpdateFromJson
var hardCodedSchemesOriginal = SchemeManager.GetSchemes ();
var hardCodedTopLevelNormalFgOriginal = hardCodedSchemesOriginal ["TopLevel"].Normal.Foreground;
var hardCodedTopLevelNormalBgOriginal = hardCodedSchemesOriginal ["TopLevel"].Normal.Background;
// Use ToString so Assert.Equal shows the actual vs expected values on failure
Assert.Equal (hardCodedSchemes, hardCodedSchemesOriginal);
Assert.Equal (hardCodedTopLevelNormalFg.ToString (), hardCodedTopLevelNormalFgOriginal.ToString ());
Assert.Equal (hardCodedTopLevelNormalBg.ToString (), hardCodedTopLevelNormalBgOriginal.ToString ());
} |
Good. I'm glad I've already figured out what's going on. |
I found the root cause. It's a nasty design error in how It's gonna be a lot of work to fix this correctly, but I've found a workaround that will work ok in the meantime. I'll open another Issue to fully document this. |
…he` directly, eliminating deep copy overhead for better performance. Added a new test in `ConfigurationManagerTests` to verify that `GetHardCodedConfigPropertyCache` always returns the same reference. Updated existing tests to reflect this change. Refactored `SchemeManagerTests` to use `try-finally` blocks for proper cleanup and improved test reliability. Applied similar changes to other test methods for consistency. Re-enabled the `UpdateFrom_Corrupts_Schemes_HardCodeDefaults` test in `ThemeScopeTests` as the underlying issue has been rnot been esolved.
Found one of the CM tests was leaving CM enabled, which was what threw me off thinking my original fix wasn't working. I've fixed that and now I think it's working.... Will continue to test. |
the new overload with a `true` parameter, ensuring consistent behavior.
Yes, I noticed that. Deep copying should only be used when strictly necessary. I think the reason for the immense time spent running unit tests exceeds reasonable time. When the configuration is being changed, each type in the scope must instantiate and change its own configuration. The cache created by default at configuration initialization, stored in the |
Refactored method names across multiple classes for clarity and consistency (e.g., `LoadCurrentValues` to `UpdateToCurrentValues`, `ResetToHardCodedDefaults` to `LoadHardCodedDefaults`). Removed redundant attributes from `ConfigurationManager`. Implemented a workaround for `SchemeManager` to address issues with hard-coded schemes being overwritten. Updated `ThemeManager` logic to ensure proper initialization and updates of themes. Aligned unit tests with refactored methods and added comments to document changes. Made minor adjustments to improve code maintainability, including handling of property values and removal of unused variables.
Replaced `ResetToCurrentValues` with `ResetToHardCodedDefaults` across multiple files to address corruption of hard-coded defaults. - Added a partial workaround in `ConfigurationManager.cs` to prevent overwriting hard-coded schemes in `ThemeScope`. - Highlighted known issues with `UpdateToCurrentValues` in `ThemeManager.cs`. - Updated tests in `ConfigurationManagerTests`, `SchemeManagerTests`, and others to reflect the reset method. - Skipped or modified tests that rely on `ResetToCurrentValues` due to its corruption issues. - Refactored `GlyphTests` to ensure proper cleanup using `try-finally`. - Added comments and skipped tests to document and work around known bugs (e.g., gui-cs#4288).
@BDisp did you see my quesiton above? since it was in a CR comment it may have not shown up in notifications. ![]() |
Updated comments in `SchemeManager` and `ThemeManager` to clarify that the workaround for hardcoded schemes is partial. Added a new `LoadHardCodedDefaults` method to `ThemeManager`, marked with `[RequiresUnreferencedCode]` and `[RequiresDynamicCode]`, to reset themes to hardcoded defaults. This method ensures proper initialization by throwing an exception if `ConfigurationManager` is not initialized. Updated `ThemeManager` to call `SchemeManager.LoadToHardCodedDefaults` during the theme reset process, ensuring consistent loading of hardcoded schemes.
I'm still seeing an unrelated non-deterministic failure in macos and ubuntu regarding some kernel32 issue. This points to the v2 driver stuff, not what we're focused on here. But I think the CM issue has been fixed. |
I actually didn't see the notification. Maybe you didn't submit it, and it was just saved in your review until you submitted it. But to answer your question, I think it doesn't make sense to use |
Seems that only the |
Cool. Thanks for the explanation. |
I wish I could get Test Explorer to reliably run the tests on Ubuntu locally. This is such a pita to diagnose. Did you see it fail locally? When I looked at the logs of the last Action failure I saw, I couldn't find any direct evidence of that test failing. All I saw was that the test run was aborted for some reason. When I looked at all the log, I noted some spew about kernel32.dll but it didnt seem correlated with any failing test. |
Yes I run Ubuntu locally in VS 2022 Test Explorer with the Ubuntu profile. But you can change to what distro you have. Then click on Run until fail on the tests you want. |
It only works for me when the moon is in a certain phase. Other times it fails with a cryptic error when trying to discover the tests. |
First you have to check if the distro in the profile is the same you have installed in your machine. The name is important. For test being discovered when you switch from Windows local to Ubuntu I recommend to clean and rebuild the solution. But you can have some other issue that I don't know. |
Refactored XML documentation comments for better readability. Enhanced exception handling in `GetScheme(Schemes)` by adding a null check and throwing `ArgumentException` for invalid inputs. Simplified method definitions by converting multi-line methods to single-line. Updated attributes for `LoadToHardCodedDefaults` to align with the `SetSchemes` method. Refactored `LoadToHardCodedDefaults` implementation for cleaner code. Added support for Visual Studio debug console in `WindowsDriver`, including disabling the alternative screen buffer, preserving original console colors, and restoring them on shutdown. Performed general code cleanup, including removing unnecessary comments and improving inline comments for clarity.
Removed `Validate` methods from `ConfigurationManager`, `Scope<T>`, and `ThemeManager`, indicating a shift in validation responsibilities. Enabled nullable reference types in `Scope.cs` to enforce stricter nullability checks. Simplified `Scope<T>` constructor and replaced explicit type declarations with `var` for improved readability. Adjusted LINQ query formatting and removed unused `using System.Text.Json;` to clean up dependencies. Made minor formatting changes for consistency and maintainability.
I'm doing code cleanup as a way of repeatedly pushing new commits to this PR to cause the Actions to run so I can figure out wtf is causing the intermittent failures. |
Renamed `ResetToCurrentValues` to `UpdateToCurrentValues` for better clarity and updated all references, including comments and documentation. Introduced `_hardCodedConfigPropertyCacheLock` to ensure thread-safety when accessing `_hardCodedConfigPropertyCache`. Updated `Reset` terminology to `Update` across the codebase to reflect the updated behavior. Improved `SerializerContext` initialization with concise syntax and fixed a formatting issue in a `Console.WriteLine` statement. Reformatted filtering logic for `configPropertiesByScope` for better readability. Updated test cases in `AppSettingsScopeTests` and `ConfigurationManagerTests` to align with the renamed method and ensure consistent functionality.
Improve readability and handle null in serialization Refactored LINQ queries to remove redundant line breaks, improving code readability. Updated comments for clarity and adjusted tone. Added a null check for the `prop` variable during serialization to ensure proper handling of null values by writing `null` to the JSON writer.
Got another failure referencing kernel32.dll on macos. CoPilot says: The failing job was caused by a crash during test execution. The logs show this key error:
Root Cause
Solution1. Fix Platform-specific Code Usage
Example fix: // Example: Prevent Windows-specific code on non-Windows
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Call Windows-specific P/Invoke or APIs
} Review any P/Invoke or platform-specific logic for correct usage. 2. Update/Test Guards in Unit Tests
Example using xUnit: [Fact]
public void MyTest()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
return; // Or use Assert.Skip in newer xUnit
// Windows-specific test logic
} Or with xUnit's [Fact(Skip = "Windows-specific test")] 3. Review and Fix Any Library References
4. Validate CI Runner Configuration
Code References
Summary: If you want to see the referenced test code or suspect another file, let me know which source file you want to inspect. |
Updated ThemeManager to improve method visibility, naming consistency, and documentation. Introduced `GetHardCodedThemes` and `SetThemes` for better encapsulation. Made `DEFAULT_THEME_NAME` public for broader access. Enhanced nullability handling across multiple files using the null-forgiving operator (`!`) to suppress warnings. Refactored `Themes.cs` to ensure proper cleanup of `allViewsView`. Simplified assertions in test files to reflect updated method visibility and removed redundant checks. Improved code clarity and maintainability throughout the codebase.
Ok, I'm convinced CM is no longer causing the failures. There still are intermittent failures (on MacOS), but they are not related to CM. I'm going to merge this and I've opened #4290 |
Fixes
This is a replacement for #4275 that @BDisp created and I accidentally merged then had to revert.