winui

Author: AlexanderEgorov

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/AsyncCommandGenerationTests.cs

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace DevExpress.Mvvm.CodeGenerators.Tests {
@@ -28,7 +29,20 @@ partial class GenerateAsyncCommands {
         public Task AllowMultipleExecution() => Task.CompletedTask;
 
         [GenerateCommand]
-        public Task<int> GenericTask() => task;
+        public Task<int> GenericTask() => task;
+
+#if WINUI
+        [GenerateCommand]
+        public Task CancellationTokenWithNoArg(CancellationToken token) => Task.CompletedTask;
+        //[GenerateCommand]
+        //public Task CancellationTokenWithArg(CancellationToken token, int arg) => Task.CompletedTask;
+        //[GenerateCommand]
+        //public Task CancellationTokenWithNullableArg(CancellationToken token, int? arg) => Task.CompletedTask;
+        //public Task CancellationTokenSomeMethod(CancellationToken token) => Task.CompletedTask;
+
+        //[GenerateCommand(Name = "CancellationTokenMyAsyncCommand", CanExecuteMethod = "CanDoIt")]
+        //public Task CancellationTokenMethod(CancellationToken token, int arg) => Task.CompletedTask;
+#endif
     }
 
     [TestFixture]
@@ -48,40 +62,44 @@ public void AsyncCommandImplementation() {
 
         [Test]
         public void CallRequiredMethodForAsyncCommand() {
-            var generated = new GenerateAsyncCommands();
-
+            var generated = new GenerateAsyncCommands();
+
+#if !WINUI
             var method = GetFieldValue<Func<int, Task>, AsyncCommand<int>>(generated.MyAsyncCommand, "executeMethod");
+            var canMethod = GetFieldValue<Func<int, bool>, AsyncCommand<int>>(generated.MyAsyncCommand, "canExecuteMethod");
+            var canMethod2 = GetFieldValue<Func<int, bool>, AsyncCommand>(generated.GenericTaskCommand, "canExecuteMethod");
+
             var expectedMethod = generated.GetType().GetMethod("Method");
             Assert.AreEqual(expectedMethod, method.Method);
-
-            var canMethod = GetFieldValue<Func<int, bool>, AsyncCommand<int>>(generated.MyAsyncCommand, "canExecuteMethod");
             var expectedCanMethod = generated.GetType().GetMethod("CanDoIt");
             Assert.AreEqual(expectedCanMethod, canMethod.Method);
+            Assert.IsNull(canMethod2);
+#endif
 
-#if !WINUI
             var allowMultipleExecution = generated.MyAsyncCommand.AllowMultipleExecution;
             var expectedAllowMultipleExecution = false;
             Assert.AreEqual(expectedAllowMultipleExecution, allowMultipleExecution);
 
+            allowMultipleExecution = generated.AllowMultipleExecutionCommand.AllowMultipleExecution;
+            Assert.AreEqual(true, allowMultipleExecution);
+
+#if !WINUI
             var useCommandManager = GetFieldValue<bool, AsyncCommand<int>>(generated.MyAsyncCommand, "useCommandManager");
             Assert.AreEqual(true, useCommandManager);
             useCommandManager = GetFieldValue<bool, AsyncCommand>(generated.AsyncCommandWithoutCommandManager, "useCommandManager");
             Assert.AreEqual(false, useCommandManager);
-
-            allowMultipleExecution = generated.AllowMultipleExecutionCommand.AllowMultipleExecution;
-            Assert.AreEqual(true, allowMultipleExecution);
-#endif
-
-            var canExecuteMethod = GetFieldValue<Func<int, bool>, AsyncCommand>(generated.GenericTaskCommand, "canExecuteMethod");
-            Assert.IsNull(canExecuteMethod);
-        }
+#endif      
+        }
+#if !WINUI
         static TResult GetFieldValue<TResult, T>(T source, string fieldName) {
-            var fieldInfo = source.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
+            var fieldInfo = source.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy)
+                ?? source.GetType().BaseType?.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
             Assert.IsNotNull(fieldInfo);
 
             return (TResult)fieldInfo.GetValue(source);
         }
-
+#endif
+
         [Test]
         public void ArgumentTypeForAsyncCommand() {
             var generated = new GenerateAsyncCommands();

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/CommandGenerationTests.cs

@@ -64,8 +64,9 @@ public void CommandImplementation() {
             Assert.IsNull(generated.GetType().GetProperty("With2ArgsCommand"));
             Assert.IsNull(generated.GetType().GetProperty("ReturnNoVoidCommand"));
             Assert.IsNull(generated.GetType().GetProperty("SomeMethodCommand"));
-        }
-
+        }
+
+#if !WINUI
         [Test]
         public void CallRequiredMethodForCommand() {
             var generated = new GenerateCommands();
@@ -82,7 +83,6 @@ public void CallRequiredMethodForCommand() {
             var expectedCanMethod = generated.GetType().GetMethod("CanDoIt");
             Assert.AreEqual(expectedCanMethod, canMethod.Method);
 
-#if !WINUI
             var useCommandManager = GetFieldValue<bool, DelegateCommand<int>>(generated.Command, "useCommandManager");
             Assert.AreEqual(true, useCommandManager);
 
@@ -91,8 +91,9 @@ public void CallRequiredMethodForCommand() {
 
             var canExecuteMethod = GetFieldValue<Func<int, bool>, DelegateCommand>(generated.CommandWithoutCommandManager, "canExecuteMethod");
             Assert.IsNull(canExecuteMethod);
-#endif
+
         }
+#endif
         static TResult GetFieldValue<TResult, T>(T source, string fieldName) {
             var fieldInfo = source.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
             Assert.IsNotNull(fieldInfo);

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/InterfacesTests.cs

@@ -1,5 +1,9 @@
 using NUnit.Framework;
 using System.ComponentModel;
+#if WINUI
+using ISupportServices = DevExpress.Mvvm.ISupportUIServices;
+using IServiceContainer = DevExpress.Mvvm.IUIServiceContainer;
+#endif
 
 namespace DevExpress.Mvvm.CodeGenerators.Tests {
     partial class SimpleClass { }
@@ -9,25 +13,32 @@ partial class ClassWithGenerator { }
     [GenerateViewModel(ImplementINotifyPropertyChanging = false)]
     partial class NotImplementINPCing { }
     [GenerateViewModel(ImplementINotifyPropertyChanging = true)]
-    partial class ImplementINPCing { }
-
+    partial class ImplementINPCing { }
+
 #if !WINUI
     [GenerateViewModel(ImplementIDataErrorInfo = false)]
     partial class NotImplementIDEI { }
     [GenerateViewModel(ImplementIDataErrorInfo = true)]
     partial class ImplementIDEI { }
 #endif
-
+
+#if !WINUI
     [GenerateViewModel(ImplementISupportServices = false)]
     partial class NotImplementISS { }
     [GenerateViewModel(ImplementISupportServices = true)]
     partial class ImplementISS { }
-
-    [GenerateViewModel(ImplementINotifyPropertyChanging = true,
-#if !WINUI
-    ImplementIDataErrorInfo = true, 
+#else
+    [GenerateViewModel(ImplementISupportUIServices = false)]
+    partial class NotImplementISS { }
+    [GenerateViewModel(ImplementISupportUIServices = true)]
+    partial class ImplementISS { }
+#endif
+
+#if !WINUI
+    [GenerateViewModel(ImplementINotifyPropertyChanging = true, ImplementIDataErrorInfo = true, ImplementISupportServices = true)]
+#else
+    [GenerateViewModel(ImplementINotifyPropertyChanging = true, ImplementISupportUIServices = true)]
 #endif
-    ImplementISupportServices = true)]
     partial class FullImplemented : INotifyPropertyChanged, INotifyPropertyChanging, IDataErrorInfo, ISupportServices {
         public event PropertyChangedEventHandler PropertyChanged;
         public event PropertyChangingEventHandler PropertyChanging;

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/NullableAnnotationTests.cs

@@ -1,11 +1,11 @@
 using System.Threading.Tasks;
 
-namespace DevExpress.Mvvm.CodeGenerators.Tests {
-    [GenerateViewModel(ImplementINotifyPropertyChanging = true,
+namespace DevExpress.Mvvm.CodeGenerators.Tests {
 #if !WINUI
-    ImplementIDataErrorInfo = true, 
+    [GenerateViewModel(ImplementINotifyPropertyChanging = true, ImplementIDataErrorInfo = true, ImplementISupportServices = true)]
+#else 
+    [GenerateViewModel(ImplementINotifyPropertyChanging = true, ImplementISupportUIServices = true)]
 #endif
-    ImplementISupportServices = true)]
     public partial class NullableAnnotation {
 #nullable enable
         public NullableAnnotation() {

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/PropertyGenerationTests.cs

@@ -5,7 +5,8 @@ namespace DevExpress.Mvvm.CodeGenerators.Tests {
     class ViewModelParent {
         public int a = 0;
         public void OnParentViewModelChanged(object o) { a = 1; }
-    }
+    }
+#if !WINUI
     [GenerateViewModel(ImplementISupportParentViewModel = true)]
     partial class WithInheritedParentViewModelMethod : ViewModelParent {
     }
@@ -14,6 +15,7 @@ partial class WithParentViewModelMethod {
         public int a = 0;
         void OnParentViewModelChanged(object o) { a = 1; }
     }
+#endif
     [GenerateViewModel(ImplementINotifyPropertyChanging = true)]
     partial class GenerateProperties {
         [GenerateProperty(IsVirtual = true)]
@@ -35,7 +37,8 @@ public void PropertyImplementation() {
 
             Assert.IsNotNull(generated.GetType().GetProperty("Property"));
             Assert.IsNull(generated.GetType().GetProperty("NotProperty"));
-        }
+        }
+#if !WINUI
         [Test]
         public void ISupportParentViewModelTest() {
             var generatedWithParent = new WithInheritedParentViewModelMethod();
@@ -48,6 +51,7 @@ public void ISupportParentViewModelTest() {
             Assert.AreEqual(1, generated.a);
             Assert.Throws<System.InvalidOperationException>(() => generated.ParentViewModel = generated);
         }
+#endif
         [Test]
         public void DoNotGeneratePrismMembers() {
             var generated = new WithTwoMvvmAttribute();

DevExpress.Mvvm.CodeGenerators.Tests/SharedTests/DxTest/SupportServicesTests.cs

@@ -1,19 +1,37 @@
 using NUnit.Framework;
+#if WINUI
+using ISupportServices = DevExpress.Mvvm.ISupportUIServices;
+using IServiceContainer = DevExpress.Mvvm.IUIServiceContainer;
+using ServiceContainer = DevExpress.Mvvm.UIServiceContainer;
+#endif
 
-namespace DevExpress.Mvvm.CodeGenerators.Tests {
+namespace DevExpress.Mvvm.CodeGenerators.Tests {
+#if !WINUI
     [GenerateViewModel(ImplementISupportServices = true)]
-    partial class ClassWithSupportServices {
-    }
+#else
+    [GenerateViewModel(ImplementISupportUIServices = true)]
+#endif
+    partial class ClassWithSupportServices { }
     public interface IService { }
     public class TestService : IService { }
+#if !WINUI
     [GenerateViewModel(ImplementISupportServices = true)]
+#else
+    [GenerateViewModel(ImplementISupportUIServices = true)]
+#endif
     partial class GetServiceGenerate {
         public GetServiceGenerate(ServiceContainer serv) {
             serviceContainer = serv;
-        }
+        }
+#if !WINUI
         public IService GetService() {
             return GetService<IService>();
         }
+#else
+        public IService GetUIService() {
+            return GetUIService<IService>();
+        }
+#endif
     }
 
 
@@ -28,13 +46,23 @@ public void CreateServiceContainerOnce() {
         }
         [Test]
         public void GenerateGetService() {
-            var serv = new TestService();
+            var serv = new TestService();
+#if !WINUI
             var serviceContainer = new ServiceContainer(null);
             serviceContainer.RegisterService(serv, false);
-            var serviceImpl = new GetServiceGenerate(serviceContainer);
-
+#else
+            var serviceContainer = new ServiceContainer();
+            serviceContainer.Register(serv);
+#endif
+            var serviceImpl = new GetServiceGenerate(serviceContainer);
+
+#if !WINUI
             Assert.IsNotNull(serviceImpl.GetType().GetMethod(nameof(GetServiceGenerate.GetService)));
             Assert.AreEqual(serv, serviceImpl.GetService());
+#else
+            Assert.IsNotNull(serviceImpl.GetType().GetMethod(nameof(GetServiceGenerate.GetUIService)));
+            Assert.AreEqual(serv, serviceImpl.GetUIService());
+#endif
         }
 
     }