From ba067220cffbdd6718b26a885bed8834eb02bd82 Mon Sep 17 00:00:00 2001
From: niimima <niimi@dcinc.co.jp>
Date: Sun, 21 Jan 2024 18:56:58 +0900
Subject: [PATCH] Modify e2e test for GoBack Method

---
 e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs |  9 +++++++++
 e2e/Maui/MauiModule/Views/ViewD.xaml            | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs b/e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs
index d61a06d8..7c3b7b7a 100644
--- a/e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs
+++ b/e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs
@@ -29,6 +29,7 @@ public abstract class ViewModelBase : BindableBase, IInitialize, INavigatedAware
         SelectedDialog = AvailableDialogs.FirstOrDefault();
         ShowDialog = new DelegateCommand(OnShowDialogCommand, () => !string.IsNullOrEmpty(SelectedDialog))
             .ObservesProperty(() => SelectedDialog);
+        GoBack = new DelegateCommand<string>(OnGoBack);
     }
 
     public IEnumerable<string> AvailableDialogs { get; }
@@ -52,6 +53,8 @@ public abstract class ViewModelBase : BindableBase, IInitialize, INavigatedAware
 
     public DelegateCommand ShowDialog { get; }
 
+    public DelegateCommand<string> GoBack { get; }
+
     private void OnNavigateCommandExecuted(string uri)
     {
         Messages.Add($"OnNavigateCommandExecuted: {uri}");
@@ -74,6 +77,12 @@ public abstract class ViewModelBase : BindableBase, IInitialize, INavigatedAware
     private void DialogCallback(IDialogResult result) =>
         Messages.Add("Dialog Closed");
 
+    private void OnGoBack(string viewName)
+    {
+        Messages.Add($"On Go Back {viewName}");
+        _navigationService.GoBackAsync(viewName);
+    }
+
     public void Initialize(INavigationParameters parameters)
     {
         Messages.Add("ViewModel Initialized");
diff --git a/e2e/Maui/MauiModule/Views/ViewD.xaml b/e2e/Maui/MauiModule/Views/ViewD.xaml
index 9ac58f03..a2e2ef58 100644
--- a/e2e/Maui/MauiModule/Views/ViewD.xaml
+++ b/e2e/Maui/MauiModule/Views/ViewD.xaml
@@ -7,7 +7,7 @@
              x:DataType="loc:ViewModelBase"
              Title="{Binding Title}"
              BackgroundColor="White">
-  <Grid RowDefinitions="*,Auto,Auto,Auto"
+  <Grid RowDefinitions="*,Auto,Auto,Auto,Auto"
         ColumnDefinitions="*,*">
     <CollectionView ItemsSource="{Binding Messages}"
                     Grid.ColumnSpan="2">
@@ -57,5 +57,11 @@
             Margin="10"
             Grid.Row="3"
             Grid.Column="1"/>
+    <Button Text="Go Back View B"
+            Command="{Binding GoBack}"
+            CommandParameter="ViewB"
+            Margin="10"
+            Grid.Row="4"
+            Grid.Column="0"/>
   </Grid>
-</ContentPage>
\ No newline at end of file
+</ContentPage>