Try to get the tests to run on the UI thread

dellis1972 · Sep 17, 2024 · d3794d7 · d3794d7
1 parent 491ca7e
commit d3794d7
Show file tree

Hide file tree

Showing 34 changed files with 498 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -80,7 +80,6 @@ jobs:
           DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /home/runner/.winemonogame
           CI: true
-        continue-on-error: true
         if: runner.os == 'Linux'
 
       - name: Test
@@ -89,14 +88,12 @@ jobs:
           DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /Users/runner/.winemonogame
           CI: true
-        continue-on-error: true
         if: runner.os == 'macOS'
 
       - name: Test
         run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 1m -c Release
         env:
           CI: true
-        continue-on-error: true
         if: runner.os == 'Windows'
 
       - name: Expose GitHub Runtime
@@ -195,16 +192,17 @@ jobs:
         run: dotnet test tests-tools/MonoGame.Tools.Tests.dll --blame-hang-timeout 1m
         env:
           CI: true
-        continue-on-error: true
 
       - name: Run Tests
-        run: dotnet test tests-desktopgl/MonoGame.Tests.dll --blame-hang-timeout 1m --filter="TestCategory!=Audio & TestCategory!=Effects"
+        run: ./MonoGame.Tests --blame-hang-timeout 1m --filter="TestCategory!=Audio & TestCategory!=Effects"
         env:
           CI: true
-        continue-on-error: true
+        working-directory: tests-desktopgl
+        if: runner.os != 'Windows'
 
       - name: Run Tests
-        run: dotnet test tests-windowsdx/MonoGame.Tests.dll --blame-hang-timeout 1m
+        run: MonoGame.Tests --blame-hang-timeout 1m
         env:
           CI: true
+        working-directory: tests-windowsdx
         if: runner.os == 'Windows'
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,7 +20,20 @@
             "type": "coreclr",
             "request": "attach",
             "processId": "${input.processid}",
-        }
+        },
+        {
+            "name": "MonoGame.Tests",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-tests",
+            "program": "${workspaceFolder}/Artifacts/Tests/DesktopGL/Debug/MonoGame.Tests",
+            "args": [
+                "--test=MonoGame.Tests.Graphics.SpriteBatchTest.Draw_normal"
+            ],
+            "cwd": "${workspaceFolder}/Artifacts/Tests/DesktopGL/Debug/",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
     ],
     "inputs": [
         {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "dotnetCoreExplorer.searchpatterns": [
+        "Artifacts/Tests/**/MonoGame.Tests.dll",
+        "Artifacts/Tests/**/MonoGame.Tools.Tests.dll"
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,6 +12,18 @@
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build-tests",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Tests/MonoGame.Tests.DesktopGL.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
         }
     ]
 }
diff --git a/Tests/Framework/Graphics/BlendStateTest.cs b/Tests/Framework/Graphics/BlendStateTest.cs
@@ -10,15 +10,18 @@
 namespace MonoGame.Tests.Graphics
 {
     [TestFixture]
+    [NonParallelizable]
     internal class BlendStateTest : GraphicsDeviceTestFixtureBase
     {
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToSetNullBlendState()
         {
             Assert.Throws<ArgumentNullException>(() => game.GraphicsDevice.BlendState = null);
         }
 
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToMutateStateObjectAfterBindingToGraphicsDevice()
         {
             var blendState = new BlendState();
@@ -38,6 +41,7 @@ public void ShouldNotBeAbleToMutateStateObjectAfterBindingToGraphicsDevice()
         }
 
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToMutateDefaultStateObjects()
         {
             DoAsserts(BlendState.Additive, d => Assert.Throws<InvalidOperationException>(d));
@@ -83,6 +87,7 @@ private static void DoAsserts(BlendState blendState, Action<TestDelegate> assert
 #if DESKTOPGL
         [Ignore("Fails similarity test. Needs Investigating")]
 #endif
+        [RunOnUI]
         public void VisualTests()
         {
             var blends = new[]

diff --git a/Tests/Framework/Graphics/DepthStencilStateTest.cs b/Tests/Framework/Graphics/DepthStencilStateTest.cs
@@ -11,15 +11,18 @@
 namespace MonoGame.Tests.Graphics
 {
     [TestFixture]
+    [NonParallelizable]
     internal class DepthStencilStateTest : GraphicsDeviceTestFixtureBase
     {
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToSetNullDepthStencilState()
         {
             Assert.Throws<ArgumentNullException>(() => gd.DepthStencilState = null);
         }
 
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToMutateStateObjectAfterBindingToGraphicsDevice()
         {
             var depthStencilState = new DepthStencilState();
@@ -39,6 +42,7 @@ public void ShouldNotBeAbleToMutateStateObjectAfterBindingToGraphicsDevice()
         }
 
         [Test]
+        [RunOnUI]
         public void ShouldNotBeAbleToMutateDefaultStateObjects()
         {
             DoAsserts(DepthStencilState.Default, d => Assert.Throws<InvalidOperationException>(d));
@@ -68,6 +72,7 @@ private static void DoAsserts(DepthStencilState depthStencilState, Action<TestDe
 
         [TestCase(false)]
         [TestCase(true)]
+        [RunOnUI]
         public void VisualTestDepthBufferEnable(bool depthBufferEnable)
         {
             PrepareFrameCapture();
@@ -95,6 +100,7 @@ public void VisualTestDepthBufferEnable(bool depthBufferEnable)
         }
 
         [Test]
+        [RunOnUI]
         public void VisualTestStencilBuffer()
         {
             PrepareFrameCapture();

diff --git a/Tests/Framework/Graphics/EffectTest.cs b/Tests/Framework/Graphics/EffectTest.cs
@@ -9,9 +9,11 @@
 namespace MonoGame.Tests.Graphics
 {
     [TestFixture]
+    [NonParallelizable]
     internal class EffectTest : GraphicsDeviceTestFixtureBase
     {
         [Test]
+        [RunOnUI]
         public void EffectConstructorShouldAllowIndexAndCount()
         {
             byte[] mgfxo = EffectResource.BasicEffect.Bytecode;
@@ -24,6 +26,7 @@ public void EffectConstructorShouldAllowIndexAndCount()
         }
 
         [Test]
+        [RunOnUI]
         public void EffectPassShouldSetTexture()
         {
             var texture = new Texture2D(game.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
@@ -45,6 +48,7 @@ public void EffectPassShouldSetTexture()
         }
 
         [Test]
+        [RunOnUI]
         public void EffectPassShouldSetTextureOnSubsequentCalls()
         {
             var texture = new Texture2D(game.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
@@ -73,6 +77,7 @@ public void EffectPassShouldSetTextureOnSubsequentCalls()
         }
 
         [Test]
+        [RunOnUI]
         public void EffectPassShouldSetTextureEvenIfNull()
         {
             var texture = new Texture2D(game.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
@@ -94,6 +99,7 @@ public void EffectPassShouldSetTextureEvenIfNull()
         }
 
         [Test]
+        [RunOnUI]
         public void EffectPassShouldOverrideTextureIfNotExplicitlySet()
         {
             var texture = new Texture2D(game.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
@@ -117,6 +123,7 @@ public void EffectPassShouldOverrideTextureIfNotExplicitlySet()
 #if DESKTOPGL
         [Ignore("Fails under OpenGL!")]
 #endif
+        [RunOnUI]
         public void EffectParameterShouldBeSetIfSetByNameAndGetByIndex()
         {
             // This relies on the parameters permanently being on the same index.

diff --git a/Tests/Framework/Graphics/GraphicsDeviceManagerTest.cs b/Tests/Framework/Graphics/GraphicsDeviceManagerTest.cs
@@ -10,9 +10,11 @@
 namespace MonoGame.Tests.Graphics
 {
     [TestFixture]
+    [NonParallelizable]
     internal class GraphicsDeviceManagerTest
     {
         [Test]
+        [RunOnUI]
         public void DefaultParameterValidation()
         {
             var game = new Game();
@@ -37,6 +39,7 @@ public void DefaultParameterValidation()
         }
 
         [Test]
+        [RunOnUI]
         public void InitializeEventCount()
         {
             var game = new TestGameBase();
@@ -72,6 +75,7 @@ public void InitializeEventCount()
         }
 
         [Test]
+        [RunOnUI]
         public void DoNotModifyPresentationParametersDirectly()
         {
             var game = new TestGameBase();
@@ -93,6 +97,7 @@ public void DoNotModifyPresentationParametersDirectly()
         }
 
         [Test]
+        [RunOnUI]
         public void PreparingDeviceSettings()
         {
             var game = new TestGameBase();
@@ -131,6 +136,7 @@ public void PreparingDeviceSettings()
         }
 
         [Test]
+        [RunOnUI]
         public void PreparingDeviceSettingsEventChangeGraphicsProfile()
         {
             var game = new TestGameBase();
@@ -169,6 +175,7 @@ public void PreparingDeviceSettingsEventChangeGraphicsProfile()
         }
 
         [Test]
+        [RunOnUI]
         public void PreparingDeviceSettingsArgsPresentationParametersAreApplied()
         {
             var game = new TestGameBase();
@@ -202,6 +209,7 @@ public void PreparingDeviceSettingsArgsPresentationParametersAreApplied()
         }
 
         [Test]
+        [RunOnUI]
         public void PreparingDeviceSettingsArgsThrowsWhenPPSetToNull()
         {
             var game = new TestGameBase();
@@ -222,6 +230,7 @@ public void PreparingDeviceSettingsArgsThrowsWhenPPSetToNull()
         }
 
         [Test]
+        [RunOnUI]
         public void ApplyChangesReturnsWhenNoSetterCalled()
         {
             var game = new TestGameBase();
@@ -252,6 +261,7 @@ public void ApplyChangesReturnsWhenNoSetterCalled()
         }
 
         [Test]
+        [RunOnUI]
         public void ApplyChangesInvokesPreparingDeviceSettings()
         {
             var game = new TestGameBase();
@@ -277,6 +287,7 @@ public void ApplyChangesInvokesPreparingDeviceSettings()
         }
 
         [Test]
+        [RunOnUI]
         public void ApplyChangesResetsDevice()
         {
             var game = new TestGameBase();
@@ -296,6 +307,7 @@ public void ApplyChangesResetsDevice()
         }
 
         [Test]
+        [RunOnUI]
         public void DeviceDisposingInvokedAfterDeviceDisposed()
         {
             var game = new TestGameBase();
@@ -326,6 +338,7 @@ public void DeviceDisposingInvokedAfterDeviceDisposed()
     internal class GraphicsDeviceManagerFixtureTest : GraphicsDeviceTestFixtureBase
     {
         [Test]
+        [RunOnUI]
         public void ResettingDeviceTriggersResetEvents()
         {
             var resetCount = 0;
@@ -347,6 +360,7 @@ public void ResettingDeviceTriggersResetEvents()
         }
 
         [Test]
+        [RunOnUI]
         public void NewDeviceDoesNotTriggerReset()
         {
             var resetCount = 0;
@@ -370,6 +384,7 @@ public void NewDeviceDoesNotTriggerReset()
         }
 
         [Test]
+        [RunOnUI]
         public void ClientSizeChangedOnDeviceReset()
         {
             var count = 0;
@@ -396,6 +411,7 @@ public void ClientSizeChangedOnDeviceReset()
 #if DESKTOPGL
         [Ignore("Expected 2 but got 3. Needs Investigating")]
 #endif
+        [RunOnUI]
         public void MultiSampleCountRoundsDown()
         {
             gdm.PreferMultiSampling = true;
@@ -412,11 +428,13 @@ public void MultiSampleCountRoundsDown()
 
         }
 
+        [Test]
         [TestCase(false)]
         [TestCase(true)]
 #if DESKTOPGL
         [Ignore("Expected not 1024 but got 1024. Needs Investigating")]
 #endif
+        [RunOnUI]
         public void MSAAEnabled(bool enabled)
         {
             gdm.PreferMultiSampling = enabled;
@@ -492,6 +510,7 @@ public void MSAAEnabled(bool enabled)
         }
 
         [Test]
+        [RunOnUI]
         public void UnsupportedMultiSampleCountDoesNotThrowException()
         {
             gdm.PreferMultiSampling = true;
@@ -513,6 +532,7 @@ public void UnsupportedMultiSampleCountDoesNotThrowException()
 
 #if DIRECTX
         [Test]
+        [RunOnUI]
         public void TooHighMultiSampleCountClampedToMaxSupported()
         {
             var maxMultiSampleCount = gd.GraphicsCapabilities.MaxMultiSampleCount;