From 400612834c917a9bd6c3bdc39d064473b20d9b57 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 28 Oct 2022 12:04:08 -0400 Subject: [PATCH] test: Update reactive tests to use new default generation names --- .../Generator/AssemblyInfo.cs | 8 -------- .../Generator/Given_ViewModel_Then_GenerateBindable.cs | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 src/Uno.Extensions.Reactive.Tests/Generator/AssemblyInfo.cs diff --git a/src/Uno.Extensions.Reactive.Tests/Generator/AssemblyInfo.cs b/src/Uno.Extensions.Reactive.Tests/Generator/AssemblyInfo.cs deleted file mode 100644 index bf9ed12ad0..0000000000 --- a/src/Uno.Extensions.Reactive.Tests/Generator/AssemblyInfo.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Uno.Extensions.Reactive.Config; - -[assembly: ImplicitBindables(patterns: ImplicitBindablesAttribute.LegacyPattern)] diff --git a/src/Uno.Extensions.Reactive.Tests/Generator/Given_ViewModel_Then_GenerateBindable.cs b/src/Uno.Extensions.Reactive.Tests/Generator/Given_ViewModel_Then_GenerateBindable.cs index 9e56131fa4..e768fad9d6 100644 --- a/src/Uno.Extensions.Reactive.Tests/Generator/Given_ViewModel_Then_GenerateBindable.cs +++ b/src/Uno.Extensions.Reactive.Tests/Generator/Given_ViewModel_Then_GenerateBindable.cs @@ -96,7 +96,7 @@ public void NestedInheritingViewModel() => Assert.IsNotNull(GetBindable(typeof(NestedSubViewModel))); private Type? GetBindable(Type vmType) - => vmType.GetNestedType($"Bindable{vmType.Name}"); + => vmType.GetNestedType(vmType.Name.Contains("ViewModel") ? $"Bindable{vmType.Name}" : $"{vmType.Name}ViewModel"); private Type? GetBindable(string vmType) {