From 5607d978d262908c415fdfaaf18df1accabe1d73 Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Tue, 30 Apr 2024 00:29:37 +0100 Subject: [PATCH] Housekeeping Tidy using's --- README.md | 32 +- .../ActivatingReactivePagesTests.cs | 146 ------- .../Activation/Mocks/App.xaml | 34 -- .../Activation/Mocks/App.xaml.cs | 52 --- .../Activation/Mocks/AppShell.xaml | 39 -- .../Activation/Mocks/AppShell.xaml.cs | 32 -- .../Activation/Mocks/AppShellViewModel.cs | 38 -- .../Activation/Mocks/ApplicationFixture.cs | 69 ---- .../Activation/Mocks/ApplicationMock.cs | 20 - .../Activation/Mocks/CarouselPageView.cs | 27 -- .../Activation/Mocks/CarouselPageViewModel.cs | 36 -- .../Activation/Mocks/ContentPageView.cs | 27 -- .../Activation/Mocks/ContentPageViewModel.cs | 38 -- .../Activation/Mocks/FlyOutPageViewModel.cs | 38 -- .../Activation/Mocks/FlyoutPageView.xaml | 20 - .../Activation/Mocks/FlyoutPageView.xaml.cs | 51 --- .../Mocks/FlyoutPageViewDetail.xaml | 10 - .../Mocks/FlyoutPageViewDetail.xaml.cs | 21 - .../Mocks/FlyoutPageViewFlyout.xaml | 48 --- .../Mocks/FlyoutPageViewFlyout.xaml.cs | 76 ---- .../Mocks/FlyoutPageViewFlyoutMenuItem.cs | 44 --- .../Activation/Mocks/ShellView.cs | 30 -- .../Activation/Mocks/ShellViewModel.cs | 38 -- .../Activation/Mocks/TabbedPageView.cs | 27 -- .../Activation/Mocks/TabbedPageViewModel.cs | 38 -- src/ReactiveUI.Maui.Tests/GlobalUsings.cs | 13 - src/ReactiveUI.Maui.Tests/Mocks/ChildView.cs | 13 - .../Mocks/ChildViewModel.cs | 36 -- src/ReactiveUI.Maui.Tests/Mocks/MainView.cs | 13 - .../Mocks/MainViewModel.cs | 23 -- .../Mocks/NavigationViewModel.cs | 60 --- .../ReactiveUI.Maui.TDontRunests.csproj | 13 - .../RoutedViewHostTest.cs | 374 ------------------ .../ActivationForViewFetcher.cs | 2 +- .../DisableAnimationAttribute.cs | 2 +- src/ReactiveUI.Maui/GlobalUsings.cs | 20 +- src/ReactiveUI.Maui/ReactiveContentPage.cs | 2 +- src/ReactiveUI.Maui/ReactiveContentView.cs | 2 +- src/ReactiveUI.Maui/ReactiveEntryCell.cs | 2 +- src/ReactiveUI.Maui/ReactiveImageCell.cs | 2 +- .../ReactiveMasterDetailPage.cs | 2 +- src/ReactiveUI.Maui/ReactiveMultiPage.cs | 2 +- src/ReactiveUI.Maui/ReactiveNavigationPage.cs | 2 +- src/ReactiveUI.Maui/ReactiveShell.cs | 4 +- src/ReactiveUI.Maui/ReactiveShellContent.cs | 4 +- src/ReactiveUI.Maui/ReactiveSwitchCell.cs | 2 +- src/ReactiveUI.Maui/ReactiveTabbedPage.cs | 4 +- src/ReactiveUI.Maui/ReactiveTextCell.cs | 2 +- src/ReactiveUI.Maui/ReactiveViewCell.cs | 4 +- src/ReactiveUI.Maui/Registrations.cs | 2 +- src/ReactiveUI.Maui/RoutedViewHost.cs | 9 +- src/ReactiveUI.Maui/ViewModelViewHost.cs | 6 +- src/ReactiveUI.Testing/GlobalUsings.cs | 14 +- src/ReactiveUI.Testing/IBuilderExtensions.cs | 12 +- src/ReactiveUI.Testing/TestSequencer.cs | 2 +- .../Mocks/MockBindListView.cs | 30 +- .../Platforms/wpf/WpfActiveContentTests.cs | 2 - src/ReactiveUI.Winforms/GlobalUsings.cs | 20 +- .../ReactiveUserControl.cs | 4 +- .../ReactiveUserControlNonGeneric.cs | 4 +- src/ReactiveUI.Winforms/Registrations.cs | 2 +- src/ReactiveUI.Winforms/RoutedViewHost.cs | 9 +- src/ReactiveUI.Winforms/ViewModelViewHost.cs | 6 +- .../WinformsCreatesObservableForProperty.cs | 2 +- src/ReactiveUI.Wpf/GlobalUsings.cs | 22 +- .../Rx/Concurrency/DispatcherScheduler.cs | 5 +- 66 files changed, 116 insertions(+), 1669 deletions(-) delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShell.xaml delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShell.xaml.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShellViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ApplicationFixture.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ApplicationMock.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/CarouselPageView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/CarouselPageViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ContentPageView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ContentPageViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyOutPageViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageView.xaml delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageView.xaml.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageViewDetail.xaml delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageViewDetail.xaml.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageViewFlyout.xaml delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageViewFlyout.xaml.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/FlyoutPageViewFlyoutMenuItem.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ShellView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/ShellViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/TabbedPageView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Activation/Mocks/TabbedPageViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/GlobalUsings.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Mocks/ChildView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Mocks/ChildViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Mocks/MainView.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Mocks/MainViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/Mocks/NavigationViewModel.cs delete mode 100644 src/ReactiveUI.Maui.Tests/ReactiveUI.Maui.TDontRunests.csproj delete mode 100644 src/ReactiveUI.Maui.Tests/RoutedViewHostTest.cs diff --git a/README.md b/README.md index fbd7b800da..52fb553924 100644 --- a/README.md +++ b/README.md @@ -157,26 +157,20 @@ See [Contribution Guidelines](https://www.reactiveui.net/contribute/) for furthe Chris Pulman

United Kingdom

+ +
Rodney Littles II

Texas, USA

- -
Colt Bauman

South Korea

- - -
- Artyom Gorchakov -

Moscow, Russia

- @@ -189,19 +183,19 @@ The following have been core team members in the past. - - - - - - + + +
+
Geoffrey Huntley

Sydney, Australia

 +
Kent Boogaart

Brisbane, Australia

 +
Olly Levett @@ -209,24 +203,32 @@ The following have been core team members in the past.
+
Anaïs Betts

San Francisco, USA

 +
Brendan Forster

Melbourne, Australia

 - + +
Claire Novotny

New York, USA

+ +
+ Artyom Gorchakov +

Moscow, Russia

+
diff --git a/src/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs b/src/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs deleted file mode 100644 index 3639812cd7..0000000000 --- a/src/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs +++ /dev/null @@ -1,146 +0,0 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using ReactiveUI.Maui; -using ReactiveUI.Maui.Tests.Activation; -using ReactiveUI.Maui.Tests.Activation.Mocks; - -using Xunit; - -namespace ReactiveUI.Tests; - -/// -/// Tests for activating views. -/// -public class ActivatingReactivePagesTests : IClassFixture> -{ - private readonly ApplicationFixture _fixture; - - /// - /// Initializes a new instance of the class. - /// - /// The fixture. - public ActivatingReactivePagesTests(ApplicationFixture fixture) - { - _fixture = fixture; - Locator.CurrentMutable.Register(() => new ActivationForViewFetcher(), typeof(IActivationForViewFetcher)); - Locator.CurrentMutable.Register>(() => new ShellView()); - Locator.CurrentMutable.Register>(() => new ContentPageView()); - Locator.CurrentMutable.Register>(() => new TabbedPageView()); - Locator.CurrentMutable.Register>(() => new CarouselPageView()); - Locator.CurrentMutable.Register>(() => new FlyoutPageView()); - _fixture.ActivateApp(new App()); - } - - /// - /// Tests to make sure that views generally activate. - /// - [Fact] - public void ActivatingReactiveShellTest() - { - var main = _fixture.AppMock!.MainPage as AppShell; - - Assert.Equal(1, main!.ViewModel!.IsActiveCount); - Assert.Equal(1, main.IsActiveCount); - } - - /// - /// Tests to make sure that views generally activate. - /// - [Fact] - public void ActivatingReactiveContentPageTest() - { - var vm = new ContentPageViewModel(); - var fixture = new ContentPageView - { - ViewModel = vm - }; - - // Activate - Shell.Current.Navigation.PushAsync(fixture); - Assert.Equal(1, fixture.ViewModel.IsActiveCount); - Assert.Equal(1, fixture.IsActiveCount); - - // Deactivate - Shell.Current.GoToAsync(".."); - fixture.ViewModel = null; - Assert.Equal(0, vm.IsActiveCount); - Assert.Equal(0, fixture.IsActiveCount); - } - - /// - /// Tests to make sure that views generally activate. - /// - [Fact] - public void ActivatingReactiveTabbedPageTest() - { - var vm1 = new TabbedPageViewModel(); - var fixture1 = new TabbedPageView - { - ViewModel = vm1 - }; - - // Activate - Shell.Current.Navigation.PushAsync(fixture1); - Assert.Equal(1, fixture1.ViewModel.IsActiveCount); - Assert.Equal(1, fixture1.IsActiveCount); - - // Deactivate - Shell.Current.GoToAsync(".."); - fixture1.ViewModel = null; - Assert.Equal(0, vm1.IsActiveCount); - Assert.Equal(0, fixture1.IsActiveCount); - } - - /// - /// Tests to make sure that views generally activate. - /// - [Fact] - public void ActivatingReactiveFlyoutPageTest() - { - var vm3 = new FlyOutPageViewModel(); - var fixture3 = new FlyoutPageView - { - ViewModel = vm3 - }; - - // Activate - Shell.Current.Navigation.PushAsync(fixture3); - Assert.Equal(1, fixture3.ViewModel!.IsActiveCount); - Assert.Equal(1, fixture3.IsActiveCount); - - // Deactivate - Shell.Current.GoToAsync(".."); - fixture3.ViewModel = null; - Assert.Equal(0, vm3.IsActiveCount); - Assert.Equal(0, fixture3.IsActiveCount); - } - - /// - /// Tests to make sure that views generally activate. - /// - [Fact] - public void ActivatingReactiveCarouselPageTest() - { - var vm4 = new CarouselPageViewModel(); - var fixture4 = new CarouselPageView - { - ViewModel = vm4 - }; - - // TODO: Fix this test - - ////// Activate - ////Shell.Current.Navigation.PushAsync(fixture4); - ////Assert.Equal(1, fixture4.ViewModel!.IsActiveCount); - ////Assert.Equal(1, fixture4.IsActiveCount); - - // Deactivate - Shell.Current.GoToAsync(".."); - fixture4.ViewModel = null; - Assert.Equal(0, vm4.IsActiveCount); - Assert.Equal(0, fixture4.IsActiveCount); - } -} diff --git a/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml b/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml deleted file mode 100644 index a996382d1d..0000000000 --- a/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - #2196F3 - - - - diff --git a/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml.cs b/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml.cs deleted file mode 100644 index 06dca8fea3..0000000000 --- a/src/ReactiveUI.Maui.Tests/Activation/Mocks/App.xaml.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -namespace ReactiveUI.Maui.Tests.Activation; - -/// -/// The App. -/// -public partial class App -{ - /// - /// Initializes a new instance of the class. - /// - public App() - { - InitializeComponent(); - - MainPage = new AppShell(); - } - - /// - /// Application developers override this method to perform actions when the application starts. - /// - /// - /// To be added. - /// - protected override void OnStart() - { - } - - /// - /// Application developers override this method to perform actions when the application enters the sleeping state. - /// - /// - /// To be added. - /// - protected override void OnSleep() - { - } - - /// - /// Application developers override this method to perform actions when the application resumes from a sleeping state. - /// - /// - /// To be added. - /// - protected override void OnResume() - { - } -} diff --git a/src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShell.xaml b/src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShell.xaml deleted file mode 100644 index 51ea564242..0000000000 --- a/src/ReactiveUI.Maui.Tests/Activation/Mocks/AppShell.xaml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - -