Fix some functions with wrong parameters in SnackBarMessageQueue.cs (#2367)

* Fix some functions with wrong parameters in SnackBarMessageQueue.cs

* Adding unit test

* Clean up some UI tests that were producing artifacts

Fix naming of artifacts to allow for easier rerun

Co-authored-by: Kevin Bost <[email protected]>

Author: zjdangge

MaterialDesignThemes.UITests/WPF/DialogHost/DialogHostTests.cs

@@ -64,6 +64,7 @@ public async Task ClosingDialogWithIsOpenProperty_ShouldRaiseDialogClosingEvent(
             await closeButton.Click();
 
             await Wait.For(async () => Assert.Equal("1", await resultTextBlock.GetText()));
+            recorder.Success();
         }
     }
 }

MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs

@@ -35,7 +35,6 @@ public async Task PrimaryColor_AdjustToTheme(PrimaryColor primary)
             await App.InitialzeWithMaterialDesign(BaseTheme.Light, primary, colorAdjustment:new ColorAdjustment());
 
             IWindow window = await App.CreateWindow<ColorAdjustWindow>();
-            await recorder.SaveScreenshot();
 
             Color windowBackground = await window.GetBackgroundColor();
 

MaterialDesignThemes.Wpf.Tests/SnackbarMessageQueueTests.cs

@@ -7,10 +7,11 @@
 
 namespace MaterialDesignThemes.Wpf.Tests
 {
-    public class SnackbarMessageQueueTests
+    public sealed class SnackbarMessageQueueTests : IDisposable
     {
         private readonly SnackbarMessageQueue _snackbarMessageQueue;
         private readonly Dispatcher _dispatcher;
+        private bool _isDisposed;
 
         public SnackbarMessageQueueTests()
         {
@@ -22,10 +23,10 @@ public SnackbarMessageQueueTests()
         [Description("Ensures that GetSnackbarMessage raises an exception on null values")]
         public void GetSnackbarMessageNullValues()
         {
-            Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!));
-            Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue("", null, null));
-            Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!, "", null));
-            Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!, null, new Action(() => { })));
+            _ = Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!));
+            _ = Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue("", null, null));
+            _ = Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!, "", null));
+            _ = Assert.Throws<ArgumentNullException>(() => _snackbarMessageQueue.Enqueue(null!, null, new Action(() => { })));
         }
 
         [StaFact]
@@ -81,5 +82,37 @@ public void GetSnackbarMessageSimpleQueue(object content, object actionContent)
             Assert.Equal(content, messages[0].Content);
             Assert.Equal(actionContent, messages[0].ActionContent);
         }
+
+        [Fact]
+        [Description("Pull Request 2367")]
+        public void Enqueue_ProperlySetsPromote()
+        {
+            _snackbarMessageQueue.Enqueue("Content", "Action Content", actionHandler: null, promote: true);
+
+            IReadOnlyList<SnackbarMessageQueueItem> messages = _snackbarMessageQueue.QueuedMessages;
+            Assert.Equal(1, messages.Count);
+            Assert.Equal("Content", messages[0].Content);
+            Assert.Equal("Action Content", messages[0].ActionContent);
+            Assert.True(messages[0].IsPromoted);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (!_isDisposed)
+            {
+                if (disposing)
+                {
+                    _snackbarMessageQueue.Dispose();
+                }
+
+                _isDisposed = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

MaterialDesignThemes.Wpf/SnackbarMessageQueue.cs

@@ -172,15 +172,15 @@ public void Enqueue(object content, object? actionContent, Action? actionHandler
             => Enqueue(content, actionContent, actionHandler, false);
 
         public void Enqueue(object content, object? actionContent, Action? actionHandler, bool promote)
-            => Enqueue(content, actionContent, _ => actionHandler?.Invoke(), promote, false, false);
+            => Enqueue(content, actionContent, _ => actionHandler?.Invoke(), false, promote, false);
 
         public void Enqueue<TArgument>(object content, object? actionContent, Action<TArgument?>? actionHandler,
             TArgument? actionArgument)
             => Enqueue(content, actionContent, actionHandler, actionArgument, false, false);
 
         public void Enqueue<TArgument>(object content, object? actionContent, Action<TArgument?>? actionHandler,
             TArgument? actionArgument, bool promote) =>
-            Enqueue(content, actionContent, actionHandler, actionArgument, promote, promote);
+            Enqueue(content, actionContent, actionHandler, actionArgument, promote, false);
 
         public void Enqueue<TArgument>(object content, object? actionContent, Action<TArgument?>? actionHandler,
             TArgument? actionArgument, bool promote, bool neverConsiderToBeDuplicate, TimeSpan? durationOverride = null)

azure-pipelines.yml

@@ -46,7 +46,7 @@ steps:
 - task: PublishPipelineArtifact@1
   name: "PublishUITestsScreenshots"
   inputs:
-    artifact: 'Screenshots'
+    artifact: 'Screenshots-$(Build.BuildNumber)'
     targetPath: 'MaterialDesignThemes.UITests/bin/$(buildConfiguration)/net5.0-windows/Screenshots'
     publishLocation: 'pipeline'
   condition: always()