SrkToolkit.Domain.AspNetCore2: migrate controller.ValidateResult (WIP)

sandrock · Mar 28, 2023 · d69a6fc · d69a6fc
1 parent 2499cef
commit d69a6fc
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 10 deletions.
diff --git a/Sources/SrkToolkit.AspNetCore2.UnitTests/AspNetCoreTestContext.cs b/Sources/SrkToolkit.AspNetCore2.UnitTests/AspNetCoreTestContext.cs
@@ -190,6 +190,12 @@ public ITempDataDictionary TempData
         get { return this.tempData ?? (this.tempData = new TempDataDictionary(this.Context, this.TempDataProvider)); }
     }
 
+    public ControllerContext CreateControllerContext()
+    {
+        var item = new ControllerContext(this.ActionContext);
+        return item;
+    }
+
     internal ITempDataProvider TempDataProvider
     {
         get { return this.tempDataProvider ?? (this.tempDataProvider = new Mock<ITempDataProvider>().Object); }

diff --git a/Sources/SrkToolkit.AspNetCore2.UnitTests/SrkDomainControllerExtensionsTests.cs b/Sources/SrkToolkit.AspNetCore2.UnitTests/SrkDomainControllerExtensionsTests.cs
@@ -0,0 +1,51 @@
+
+namespace SrkToolkit.Web.Tests;
+
+using Microsoft.AspNetCore.Mvc;
+using SrkToolkit.Domain;
+using System;
+using Xunit;
+
+public class SrkDomainControllerExtensionsTests
+{
+    [Fact]
+    public void ValidResult_TempData_Works()
+    {
+        var context = new AspNetCoreTestContext();
+        var controller = new MyController();
+        controller.ControllerContext = context.CreateControllerContext();
+        var result = new BasicResult<ErrorCode>();
+        result.Succeed = true;
+        var isValid = controller.ValidateResult(result, MessageDisplayMode.TempData);
+        Assert.True(isValid);
+        Assert.Empty(context.TempData);
+    }
+
+    [Fact]
+    public void InvalidResult_TempData_Works()
+    {
+        var context = new AspNetCoreTestContext();
+        var controller = new MyController();
+        controller.ControllerContext = context.CreateControllerContext();
+        var result = new BasicResult<ErrorCode>();
+        result.Errors.Add(ErrorCode.Unauthorized);
+        result.Succeed = result.Errors.Count == 0;
+        var isValid = controller.ValidateResult(result, MessageDisplayMode.TempData);
+        Assert.False(isValid);
+        Assert.Single(context.TempData);
+    }
+
+    class MyController : Controller
+    {
+        public ActionResult MyAction()
+        {
+            return this.NoContent();
+        }
+    }
+
+    enum ErrorCode
+    {
+        Invalid,
+        Unauthorized,
+    }
+}
diff --git a/Sources/SrkToolkit.AspNetCore2.UnitTests/SrkToolkit.AspNetCore2.UnitTests.csproj b/Sources/SrkToolkit.AspNetCore2.UnitTests/SrkToolkit.AspNetCore2.UnitTests.csproj
@@ -35,6 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SrkToolkit.Domain.AspNetCore2\SrkToolkit.Domain.AspNetCore2.csproj" />
     <ProjectReference Include="..\SrkToolkit.Web.AspNetCore2\SrkToolkit.Web.AspNetCore2.csproj" />
   </ItemGroup>
 

diff --git a/Sources/SrkToolkit.Domain.AspNetCore2/SrkToolkit.Domain.AspNetCore2.csproj b/Sources/SrkToolkit.Domain.AspNetCore2/SrkToolkit.Domain.AspNetCore2.csproj
@@ -29,8 +29,6 @@
     <None Include="..\SrkToolkit.snk">
       <Link>SrkToolkit.snk</Link>
     </None>
-    <Compile Remove="SrkDomainControllerExtensions.cs" />
-    <None Include="SrkDomainControllerExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,16 +42,12 @@
 
   <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
     <ItemGroup>
-      <_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')"
-                                                   Condition="'%(ProjectReference.PackageVersion)' != ''" />
-      <_ProjectReferenceWithExactPackageVersion Include="@(ProjectReference->'%(FullPath)')"
-                                                Condition="'%(ProjectReference.ExactVersion)' == 'true'" />
-      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)"
-                                              Condition="'%(Identity)' != '' And '@(_ProjectReferencesWithVersions)' == '@(_ProjectReferenceWithExplicitPackageVersion)'">
+      <_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.PackageVersion)' != ''" />
+      <_ProjectReferenceWithExactPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.ExactVersion)' == 'true'" />
+      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferencesWithVersions)' == '@(_ProjectReferenceWithExplicitPackageVersion)'">
         <ProjectVersion>@(_ProjectReferenceWithExplicitPackageVersion->'%(PackageVersion)')</ProjectVersion>
       </_ProjectReferenceWithReassignedVersion>
-      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)"
-                                              Condition="'%(Identity)' != '' And '@(_ProjectReferencesWithVersions)' == '@(_ProjectReferenceWithExactPackageVersion)'">
+      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferencesWithVersions)' == '@(_ProjectReferenceWithExactPackageVersion)'">
         <ProjectVersion>[@(_ProjectReferencesWithVersions->'%(ProjectVersion)')]</ProjectVersion>
       </_ProjectReferenceWithReassignedVersion>
       <_ProjectReferencesWithVersions Remove="@(_ProjectReferenceWithReassignedVersion)" />