Merge pull request #9 from Axemasta/feature/prism-stable

Upgrade Prism & Add GoBack Support
Axemasta · Aug 21, 2024 · 8e941d7 · 8e941d7
2 parents da829f9 + 454a5ed
commit 8e941d7
Show file tree

Hide file tree

Showing 11 changed files with 404 additions and 27 deletions.
diff --git a/directory.build.props b/directory.build.props
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<MauiVersion>8.0.14</MauiVersion>
+		<MauiVersion>8.0.20</MauiVersion>
 		<StandardTargetFramework>net8.0</StandardTargetFramework>
 	</PropertyGroup>
 

diff --git a/src/Moq.INavigationService/ExpressionExtension.cs b/src/Moq.INavigationService/ExpressionExtension.cs
@@ -23,4 +23,12 @@ internal static class ExpressionExtension
 			return default;
 		}
 	}
+
+	public static string GetExpressionMethodName(this Expression expression)
+	{
+		var methodCall = (expression as LambdaExpression)?.Body as MethodCallExpression;
+		var methodName = methodCall?.Method.Name ?? throw new InvalidOperationException("Could not determine calling method name");
+
+		return methodName;
+	}
 }
diff --git a/src/Moq.INavigationService/MockNavigationService.cs b/src/Moq.INavigationService/MockNavigationService.cs
@@ -16,15 +16,9 @@ public Task<INavigationResult> GoBackAsync(INavigationParameters parameters)
 	}
 
 	/// <inheritdoc />
-	public Task<INavigationResult> GoBackAsync(string viewName, INavigationParameters parameters)
+	public Task<INavigationResult> GoBackToAsync(string viewName, INavigationParameters parameters)
 	{
-		return Object.GoBackAsync(viewName, parameters);
-	}
-
-	/// <inheritdoc />
-	public Task<INavigationResult> GoBackToAsync(string name, INavigationParameters parameters)
-	{
-		return Object.GoBackToAsync(name, parameters);
+		return Object.GoBackToAsync(viewName, parameters);
 	}
 
 	/// <inheritdoc />
@@ -40,9 +34,9 @@ public Task<INavigationResult> NavigateAsync(Uri uri, INavigationParameters para
 	}
 
 	/// <inheritdoc />
-	public Task<INavigationResult> SelectTabAsync(string name, INavigationParameters parameters)
+	public Task<INavigationResult> SelectTabAsync(string name, Uri uri, INavigationParameters parameters)
 	{
-		return Object.SelectTabAsync(name, parameters);
+		return Object.SelectTabAsync(name, uri, parameters);
 	}
 
 	#endregion INavigationService

diff --git a/src/Moq.INavigationService/Moq.INavigationService.csproj b/src/Moq.INavigationService/Moq.INavigationService.csproj
@@ -37,7 +37,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Moq" Version="4.20.70"/>
-		<PackageReference Include="Prism.Maui" Version="9.0.401-pre"/>
+		<PackageReference Include="Prism.Maui" Version="9.0.537" />
 		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>

diff --git a/src/Moq.INavigationService/NavigationExpressionArgs.cs b/src/Moq.INavigationService/NavigationExpressionArgs.cs
@@ -19,11 +19,26 @@ public static NavigationExpressionArgs FromNavigationBuilderExpression(Expressio
 		};
 	}
 
-	public static NavigationExpressionArgs FromUriExpression(Expression expression)
+	public static NavigationExpressionArgs FromNavigateUriExpression(Expression expression)
 	{
 		return new NavigationExpressionArgs
 		{
-			NavigationUri = GetNavigationUriFrom(expression),
+			NavigationUri = GetNavigationUriFrom(expression, 1),
+			NavigationParameters = ExpressionInspector.GetArgOf<NavigationParameters>(expression),
+		};
+	}
+
+	public static NavigationExpressionArgs FromGoBackToExpression(Expression expression)
+	{
+		var methodCall = (MethodCallExpression)((LambdaExpression)expression).Body;
+
+		var index = methodCall.Arguments.Any(a => a.Type == typeof(NavigationParameters))
+			? 0
+			: 1;
+
+		return new NavigationExpressionArgs
+		{
+			NavigationUri = GetNavigationUriFrom(expression, index),
 			NavigationParameters = ExpressionInspector.GetArgOf<NavigationParameters>(expression),
 		};
 	}
@@ -225,11 +240,11 @@ private static (Uri Uri, INavigationParameters? NavigationParameters) ParseUriBu
 		return fieldValue;
 	}
 
-	private static Uri GetNavigationUriFrom(Expression expression)
+	private static Uri GetNavigationUriFrom(Expression expression, int index)
 	{
 		var methodCall = (MethodCallExpression)((LambdaExpression)expression).Body;
 
-		var destination = methodCall.Arguments[1];
+		var destination = methodCall.Arguments[index];
 
 		if (destination.Type == typeof(Uri))
 		{

diff --git a/src/Moq.INavigationService/SetupNavigationExtensions.cs b/src/Moq.INavigationService/SetupNavigationExtensions.cs
@@ -120,7 +120,7 @@ public static ISetup<INavigationService, Task<INavigationResult>> SetupNavigatio
 		GuardVerifyExpressionIsForNavigationExtensions(expression);
 
 		// Workout uri
-		var verifyNavigationExpression = VerifyNavigationExpression.From(expression);
+		var verifyNavigationExpression = VerifyNavigationExpression.FromNavigateExpression(expression);
 
 		return ApplySetup(
 			navigationServiceMock,

diff --git a/src/Moq.INavigationService/VerifyNavigationExpression.cs b/src/Moq.INavigationService/VerifyNavigationExpression.cs
@@ -8,18 +8,29 @@ internal class VerifyNavigationExpression
 	public required Expression? DestinationUriExpression { get; set; }
 	public required Expression? NavigationParametersExpression { get; set; }
 
-	public static VerifyNavigationExpression From(Expression expression)
+	public static VerifyNavigationExpression FromNavigateExpression(Expression expression)
 	{
 		return expression.ToString().Contains("CreateBuilder")
 			? ParseNavigationBuilderExpression(expression)
 			: ParseUriNavigationExpression(expression);
 	}
 
+	public static VerifyNavigationExpression FromGoBackToExpression(Expression expression)
+	{
+		return new VerifyNavigationExpression
+		{
+			Args = NavigationExpressionArgs.FromGoBackToExpression(expression),
+			DestinationStringExpression = ExpressionInspector.GetArgExpressionOf<string>(expression),
+			DestinationUriExpression = null,
+			NavigationParametersExpression = ExpressionInspector.GetArgExpressionOf<NavigationParameters>(expression),
+		};
+	}
+
 	private static VerifyNavigationExpression ParseUriNavigationExpression(Expression expression)
 	{
 		return new VerifyNavigationExpression
 		{
-			Args = NavigationExpressionArgs.FromUriExpression(expression),
+			Args = NavigationExpressionArgs.FromNavigateUriExpression(expression),
 			DestinationStringExpression = ExpressionInspector.GetArgExpressionOf<string>(expression),
 			DestinationUriExpression = ExpressionInspector.GetArgExpressionOf<Uri>(expression),
 			NavigationParametersExpression = ExpressionInspector.GetArgExpressionOf<NavigationParameters>(expression),