Replaced new Mock<T>.Object with Mock.Of<T>

linkdotnet · linkdotnet · commit 884958f2716b · 2022-01-09T15:38:45.000+01:00
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs
@@ -27,7 +27,7 @@ public async Task ShouldSaveBlogPostOnSave()
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
-        ctx.Services.AddScoped(_ => new Mock<IFileProcessor>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IFileProcessor>());
         using var cut = ctx.RenderComponent<CreateNewBlogPostPage>();
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs
@@ -48,7 +48,7 @@ public void ShouldThrowWhenNoIdProvided()
         using var ctx = new TestContext();
         ctx.AddTestAuthorization().SetAuthorized("some username");
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
 
         Action act = () => ctx.RenderComponent<UpdateBlogPostPage>(
             p => p.Add(s => s.BlogPostId, null));
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs
@@ -83,9 +83,9 @@ public async Task ShouldSetTagsWhenAvailable()
     private void RegisterComponents(TestContextBase ctx, ILocalStorageService localStorageService = null)
     {
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => localStorageService ?? new Mock<ILocalStorageService>().Object);
-        ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => localStorageService ?? Mock.Of<ILocalStorageService>());
+        ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         ctx.Services.AddScoped(_ => new AppConfiguration());
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
@@ -173,6 +173,6 @@ private void RegisterComponents(TestContextBase ctx)
     {
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
@@ -24,7 +24,7 @@ public async Task ShouldOnlyDisplayTagsGivenByParameter()
         await AddBlogPostWithTagAsync("Tag 1");
         await AddBlogPostWithTagAsync("Tag 2");
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, "Tag 1"));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
@@ -39,7 +39,7 @@ public async Task ShouldHandleSpecialCharacters()
         using var ctx = new TestContext();
         await AddBlogPostWithTagAsync("C#");
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
@@ -54,4 +54,4 @@ private async Task AddBlogPostWithTagAsync(string tag)
         await DbContext.AddAsync(blogPost);
         await DbContext.SaveChangesAsync();
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs
@@ -25,7 +25,7 @@ public async Task ShouldFindBlogPostWhenTitleMatches()
         await Repository.StoreAsync(blogPost2);
         using var ctx = new TestContext();
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Title 1"));
 
@@ -44,7 +44,7 @@ public async Task ShouldFindBlogPostWhenTagMatches()
         await Repository.StoreAsync(blogPost2);
         using var ctx = new TestContext();
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Cat"));
 
@@ -61,7 +61,7 @@ public async Task ShouldUnescapeQuery()
         await Repository.StoreAsync(blogPost1);
         using var ctx = new TestContext();
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
         var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Title%201"));
 
@@ -70,4 +70,4 @@ public async Task ShouldUnescapeQuery()
         blogPosts.Should().HaveCount(1);
         blogPosts.Single().Find(".description h1").TextContent.Should().Be("Title 1");
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
@@ -22,7 +22,7 @@ public void ShouldDeleteBlogPostWhenOkClicked()
         using var ctx = new TestContext();
         ctx.AddTestAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock.Object);
-        ctx.Services.AddSingleton(new Mock<IToastService>().Object);
+        ctx.Services.AddSingleton(Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
         cut.Find("#delete-blogpost").Click();
 
@@ -39,7 +39,7 @@ public void ShouldNotDeleteBlogPostWhenCancelClicked()
         using var ctx = new TestContext();
         ctx.AddTestAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock.Object);
-        ctx.Services.AddSingleton(new Mock<IToastService>().Object);
+        ctx.Services.AddSingleton(Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
         cut.Find("#delete-blogpost").Click();
 
@@ -56,12 +56,12 @@ public void ShouldGoToEditPageOnEditClick()
         using var ctx = new TestContext();
         ctx.AddTestAuthorization().SetAuthorized("s");
         ctx.Services.AddSingleton(repositoryMock.Object);
-        ctx.Services.AddSingleton(new Mock<IToastService>().Object);
+        ctx.Services.AddSingleton(Mock.Of<IToastService>());
         var navigationManager = ctx.Services.GetRequiredService<NavigationManager>();
         var cut = ctx.RenderComponent<BlogPostAdminActions>(s => s.Add(p => p.BlogPostId, blogPostId));
 
         cut.Find("#edit-blogpost").Click();
 
         navigationManager.Uri.Should().EndWith($"update/{blogPostId}");
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
@@ -23,7 +23,7 @@ public async Task ShouldDeleteItem()
         using var ctx = new TestContext();
         await Repository.StoreAsync(skill);
         ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
         cut.WaitForState(() => cut.HasComponent<SkillTag>());
@@ -40,7 +40,7 @@ public async Task ShouldAddSkill()
     {
         using var ctx = new TestContext();
         ctx.Services.AddScoped<IRepository<Skill>>(_ => Repository);
-        ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);
+        ctx.Services.AddScoped(_ => Mock.Of<IToastService>());
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.IsAuthenticated, true));
         cut.Find("button").Click();
@@ -61,4 +61,4 @@ public async Task ShouldAddSkill()
         fromRepo.Capability.Should().Be("capability");
         fromRepo.ProficiencyLevel.Should().Be(ProficiencyLevel.Expert);
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs
@@ -96,10 +96,10 @@ private void SetupMocks(AppConfiguration config)
             .ReturnsAsync(new PagedList<ProfileInformationEntry>(Array.Empty<ProfileInformationEntry>(), 1, 1));
 
         Services.AddScoped(_ => config);
-        Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
-        Services.AddScoped(_ => new Mock<ISortOrderCalculator>().Object);
+        Services.AddScoped(_ => Mock.Of<IUserRecordService>());
+        Services.AddScoped(_ => Mock.Of<ISortOrderCalculator>());
         Services.AddScoped(_ => skillRepo.Object);
         Services.AddScoped(_ => profileRepo.Object);
-        Services.AddScoped(_ => new Mock<IToastService>().Object);
+        Services.AddScoped(_ => Mock.Of<IToastService>());
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs
@@ -29,7 +29,7 @@ public void ShouldNotShowAboutMeStatisticsWhenDisabled()
         this.AddTestAuthorization().SetAuthorized("test");
         Services.AddScoped(_ => CreateAppConfiguration(false));
         Services.AddScoped(_ => dashboardService.Object);
-        Services.AddScoped(_ => new Mock<IRepository<BlogPost>>().Object);
+        Services.AddScoped(_ => Mock.Of<IRepository<BlogPost>>());
         Services.AddScoped(_ => new BlogDbContext(options));
         dashboardService.Setup(d => d.GetDashboardDataAsync())
             .ReturnsAsync(new DashboardData());
@@ -58,4 +58,4 @@ private static DbConnection CreateInMemoryConnection()
 
         return connection;
     }
-}
+}
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs
@@ -17,7 +17,7 @@ public class LikeTests : TestContext
     [InlineData(2, "2 Likes")]
     public void ShouldDisplayLikes(int likes, string expectedText)
     {
-        Services.AddScoped(_ => new Mock<ILocalStorageService>().Object);
+        Services.AddScoped(_ => Mock.Of<ILocalStorageService>());
         var blogPost = new BlogPostBuilder().WithLikes(likes).Build();
         var cut = RenderComponent<Like>(
             p => p.Add(l => l.BlogPost, blogPost));
@@ -30,7 +30,7 @@ public void ShouldDisplayLikes(int likes, string expectedText)
     [Fact]
     public void ShouldInvokeEventWhenButtonClicked()
     {
-        Services.AddScoped(_ => new Mock<ILocalStorageService>().Object);
+        Services.AddScoped(_ => Mock.Of<ILocalStorageService>());
         var blogPost = new BlogPostBuilder().Build();
         var wasClicked = false;
         var wasLike = false;
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShareBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShareBlogPostTests.cs
@@ -19,7 +19,7 @@ public class ShareBlogPostTests : TestContext
     public void ShouldCopyLinkToClipboard()
     {
         JSInterop.Mode = JSRuntimeMode.Loose;
-        Services.AddScoped(_ => new Mock<IToastService>().Object);
+        Services.AddScoped(_ => Mock.Of<IToastService>());
         Services.GetRequiredService<FakeNavigationManager>().NavigateTo("blogPost/1");
         var cut = RenderComponent<ShareBlogPost>();
 
@@ -32,7 +32,7 @@ public void ShouldCopyLinkToClipboard()
     [Fact]
     public void ShouldShareToLinkedIn()
     {
-        Services.AddScoped(_ => new Mock<IToastService>().Object);
+        Services.AddScoped(_ => Mock.Of<IToastService>());
         Services.GetRequiredService<FakeNavigationManager>().NavigateTo("blogPost/1");
 
         var cut = RenderComponent<ShareBlogPost>();
@@ -44,7 +44,7 @@ public void ShouldShareToLinkedIn()
     [Fact]
     public void ShouldNotCrashWhenCopyingLinkNotWorking()
     {
-        Services.AddScoped(_ => new Mock<IToastService>().Object);
+        Services.AddScoped(_ => Mock.Of<IToastService>());
         JSInterop.SetupVoid(s => s.InvocationMethodName == "navigator.clipboard.writeText").SetException(new Exception());
         var cut = RenderComponent<ShareBlogPost>();
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/UploadFileTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Shared/UploadFileTests.cs
@@ -44,7 +44,7 @@ public async Task ShouldCallProcessorWhenFilesUploaded()
     [Fact]
     public void ShouldPutIdAndClassOnItems()
     {
-        Services.AddScoped(_ => new Mock<IFileProcessor>().Object);
+        Services.AddScoped(_ => Mock.Of<IFileProcessor>());
         var attributes = new Dictionary<string, object>
         {
             { "class", "some-class" },
@@ -60,7 +60,7 @@ public void ShouldPutIdAndClassOnItems()
     [Fact]
     public void ShouldIndicateDragAndDropBehavior()
     {
-        Services.AddScoped(_ => new Mock<IFileProcessor>().Object);
+        Services.AddScoped(_ => Mock.Of<IFileProcessor>());
         var cut = RenderComponent<UploadFile>();
 
         cut.Find("input").DragEnter();
@@ -71,7 +71,7 @@ public void ShouldIndicateDragAndDropBehavior()
     [Fact]
     public void ShouldRemoveDragAndDropBehaviorWhenOutside()
     {
-        Services.AddScoped(_ => new Mock<IFileProcessor>().Object);
+        Services.AddScoped(_ => Mock.Of<IFileProcessor>());
         var cut = RenderComponent<UploadFile>();
         cut.Find("input").DragEnter();
 

Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ public async Task ShouldSetTagsWhenAvailable()`
`83`	`83`	`private void RegisterComponents(TestContextBase ctx, ILocalStorageService localStorageService = null)`
`84`	`84`	`{`
`85`	`85`	`ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);`
`86`		`- ctx.Services.AddScoped(_ => localStorageService ?? new Mock<ILocalStorageService>().Object);`
`87`		`- ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);`
`88`		`- ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);`
	`86`	`+ ctx.Services.AddScoped(_ => localStorageService ?? Mock.Of<ILocalStorageService>());`
	`87`	`+ ctx.Services.AddScoped(_ => Mock.Of<IToastService>());`
	`88`	`+ ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());`
`89`	`89`	`ctx.Services.AddScoped(_ => new AppConfiguration());`
`90`	`90`	`}`
`91`		`-}`
	`91`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,6 @@ private void RegisterComponents(TestContextBase ctx)`
`173`	`173`	`{`
`174`	`174`	`ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);`
`175`	`175`	`ctx.Services.AddScoped(_ => CreateSampleAppConfiguration());`
`176`		`- ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);`
	`176`	`+ ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());`
`177`	`177`	`}`
`178`		`-}`
	`178`	`+}`