From 24ff55cabb146ba0723cd6824909991d259d42c8 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 13 Jun 2023 08:43:40 -0600
Subject: [PATCH] chore: fixing namespaces

---
 .../Forms/Prism.Forms.Tests/Services/DialogServiceTests.cs  | 6 +++---
 .../Services/Mocks/Dialogs/DialogMockViewModel.cs           | 6 +++---
 tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs    | 2 +-
 tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/Forms/Prism.Forms.Tests/Services/DialogServiceTests.cs b/tests/Forms/Prism.Forms.Tests/Services/DialogServiceTests.cs
index 7b9e4994ee..4daa42571f 100644
--- a/tests/Forms/Prism.Forms.Tests/Services/DialogServiceTests.cs
+++ b/tests/Forms/Prism.Forms.Tests/Services/DialogServiceTests.cs
@@ -3,8 +3,8 @@
 using Prism.Forms.Tests.Services.Mocks;
 using Prism.Forms.Tests.Services.Mocks.Dialogs;
 using Prism.Ioc;
-using Prism.Services.Dialogs;
-using Prism.Services.Dialogs.Xaml;
+using Prism.Dialogs;
+using Prism.Dialogs.Xaml;
 using Xamarin.Forms;
 using Xunit;
 
@@ -49,7 +49,7 @@ public void DoesNotThrowExceptionWithNullCallback()
         {
             SetMainPage();
             var dialogService = CreateDialogService();
-            var ex = Record.Exception(() => dialogService.ShowDialog(DialogMockViewName, new DialogParameters(), null));
+            var ex = Record.Exception(() => dialogService.ShowDialog(DialogMockViewName, new DialogParameters()));
             Assert.Null(ex);
             ex = Record.Exception(() => DialogMock.Current.ViewModel.SendRequestClose());
             Assert.Null(ex);
diff --git a/tests/Forms/Prism.Forms.Tests/Services/Mocks/Dialogs/DialogMockViewModel.cs b/tests/Forms/Prism.Forms.Tests/Services/Mocks/Dialogs/DialogMockViewModel.cs
index 6097d0861e..c0fcbf9ea4 100644
--- a/tests/Forms/Prism.Forms.Tests/Services/Mocks/Dialogs/DialogMockViewModel.cs
+++ b/tests/Forms/Prism.Forms.Tests/Services/Mocks/Dialogs/DialogMockViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using Prism.AppModel;
 using Prism.Mvvm;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 
 namespace Prism.Forms.Tests.Services.Mocks.Dialogs
 {
@@ -14,7 +14,7 @@ public string Title
             set => SetProperty(ref _title, value);
         }
 
-        public event Action<IDialogParameters> RequestClose;
+        public DialogCloseEvent RequestClose { get; set; }
 
         public bool CanClose { get; set; } = true;
 
@@ -30,6 +30,6 @@ void IDialogAware.OnDialogOpened(IDialogParameters parameters)
 
         }
 
-        public void SendRequestClose(IDialogParameters parameters = null) => RequestClose(parameters);
+        public void SendRequestClose(IDialogParameters parameters = null) => RequestClose.Invoke(parameters);
     }
 }
diff --git a/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs b/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs
index 0608091766..3333374065 100644
--- a/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs
+++ b/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs
@@ -8,7 +8,7 @@
 using Prism.Modularity;
 using Prism.Regions;
 using Prism.Regions.Behaviors;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using Xunit;
 
 namespace Prism.Wpf.Tests
diff --git a/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs b/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs
index 207cd55cfd..3ec78d075c 100644
--- a/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs
+++ b/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs
@@ -8,7 +8,7 @@
 using Prism.Modularity;
 using Prism.Regions;
 using Prism.Regions.Behaviors;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using Xunit;
 
 namespace Prism.Wpf.Tests