Rest: ViewTests fail

eXpandFramework · Oct 1, 2021 · 4a33ff8 · 4a33ff8
1 parent 5b484b9
commit 4a33ff8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/Modules/Reactive.Rest/RestService.cs b/src/Modules/Reactive.Rest/RestService.cs
@@ -58,7 +58,7 @@ private static IObservable<Unit> ObjectStringLookup(this XafApplication applicat
                 .SelectMany(frame => frame.View.AsListView().CollectionSource is NonPersistentPropertyCollectionSource source
                     ? source.MasterObjectType.RestListMembers().Where(t => t.attribute.PropertyName == source.MemberInfo.Name)
                         .SelectMany(_ => frame.GetController<NewObjectViewController>().NewObjectAction.WhenExecute()
-                            .Merge(frame.GetController<ListViewProcessCurrentObjectController>().ProcessCurrentObjectAction.WhenExecute())
+                            .Merge(frame.GetController<ListViewProcessCurrentObjectController>().ProcessCurrentObjectAction.WhenExecuted())
                             .SelectMany(e => {
                                 var dataSourceProperty = source.MemberInfo.FindAttribute<DataSourcePropertyAttribute>().DataSourceProperty;
                                 var datasourceMember = source.MemberInfo.Owner.FindMember(dataSourceProperty);

diff --git a/src/Tests/Reactive.Rest/ViewTests.cs b/src/Tests/Reactive.Rest/ViewTests.cs
@@ -20,16 +20,16 @@ public class ViewTests : RestCommonAppTest {
 		public async Task TestListViewProcessSelectedItem() {
 			HandlerMock.SetupRestPropertyObject(Application.CreateObjectSpace(typeof(RestPropertyObject)),
 				o => o.StringArray = new[] {"a"});
+
 			await Application.TestListViewProcessSelectedItem(typeof(RestPropertyObject));
 		}
 
 		[Test]
 		public async Task Arrays_BindingList_Lookup_Datasource() {
 			HandlerMock.SetupRestPropertyObject(Application.CreateObjectSpace(typeof(RestPropertyObject)),
 				o => o.StringArray = new[] {"a"});
-			var detailViewFrame = await Application.TestListViewProcessSelectedItem(typeof(RestPropertyObject));
-			var nestedFrame = detailViewFrame.View.AsDetailView()
-				.GetListPropertyEditor<RestPropertyObject>(o => o.StringArrayList).Frame;
+			var detailView = await Application.TestListViewProcessSelectedItem(typeof(RestPropertyObject));
+			var nestedFrame = detailView.GetListPropertyEditor<RestPropertyObject>(o => o.StringArrayList).Frame;
 			var whenDetailViewCreated =
 				Application.WhenDetailViewCreated(typeof(ObjectString)).FirstAsync().SubscribeReplay();
 			var newObjectAction = nestedFrame.GetController<NewObjectViewController>().NewObjectAction;
@@ -40,7 +40,7 @@ public async Task Arrays_BindingList_Lookup_Datasource() {
 			var t = await whenDetailViewCreated;
 
 			var currentObject = ((ObjectString) t.e.View.CurrentObject);
-			var restPropertyObject = ((RestPropertyObject) detailViewFrame.View.CurrentObject);
+			var restPropertyObject = ((RestPropertyObject) detailView.CurrentObject);
 			currentObject.DataSource.Count.ShouldBe(restPropertyObject.StringArraySource.Count);
 			currentObject.DataSource.Select(s => s.Name).First()
 				.ShouldBe(restPropertyObject.StringArraySource.Select(s => s.Name).First());

diff --git a/src/Tests/TestsLib.Common/CommonTestScenario.cs b/src/Tests/TestsLib.Common/CommonTestScenario.cs
@@ -5,7 +5,6 @@
 using DevExpress.ExpressApp;
 using DevExpress.ExpressApp.SystemModule;
 using Fasterflect;
-using Shouldly;
 using Xpand.Extensions.Reactive.Transform;
 using Xpand.Extensions.Reactive.Utility;
 using Xpand.Extensions.XAF.CollectionSourceExtensions;
@@ -15,21 +14,18 @@
 
 namespace Xpand.TestsLib.Common {
     public static class CommonTestScenario {
-        public static async Task<Frame> TestListViewProcessSelectedItem(this XafApplication application,Type objectType) {
+        public static async Task<DetailView> TestListViewProcessSelectedItem(this XafApplication application,Type objectType) {
             var window = await TestListView(application, objectType);
             var action = window.GetController<ListViewProcessCurrentObjectController>().ProcessCurrentObjectAction;
-            var frameViewChanged = application.WhenFrameViewChanged().Select(frame1 => frame1)
-                .WhenFrame(ViewType.DetailView).FirstAsync().SubscribeReplay();
+            var frameViewChanged = application.WhenViewCreated().OfType<DetailView>()
+                .FirstAsync().SubscribeReplay();
 
             action.DoExecute(objectSpace => {
                 var objects = window.View.AsListView().CollectionSource.Objects().Take(1).ToArray();
                 return objects.Select(objectSpace.GetObject).ToArray();
             },true);
 
-            var frame = await frameViewChanged;
-
-            frame.View.ShouldBeOfType<DetailView>();
-            return frame;
+            return await frameViewChanged.ToTaskWithoutConfigureAwait();
         }
 
         public static async Task<Window> TestListView(this XafApplication application, Type objectType) {