From 320c7a96b76a2996f6d84fd8e35408bdd8f9e305 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 20 Oct 2020 12:16:29 -0700 Subject: [PATCH 1/8] Use FileSystemWatcher to check if file was modified --- .../Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index bccddafac496..690d7d57b749 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -384,13 +384,18 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() taskInstance.Execute(); + var modified = false; + using (FileSystemWatcher watcher = new FileSystemWatcher()) { + watcher.Path = expectedFile; + watcher.Changed += (object source, FileSystemEventArgs e) => modified = true; + } + // Assert + Assert.True(modified); Assert.True(result); Assert.True(File.Exists(expectedFile)); var actualContents = File.ReadAllText(expectedFile); Assert.Equal(UpdatedBundleContent, actualContents, ignoreLineEndingDifferences: true); - - Assert.NotEqual(lastModified, File.GetLastWriteTimeUtc(expectedFile)); } } } From 1dd877a9c0337328c453facc7d61f5aff541f045 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 20 Oct 2020 13:44:22 -0700 Subject: [PATCH 2/8] Update ConcatenateFilesTest.cs --- src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 690d7d57b749..26a76c9ae688 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -382,10 +382,9 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() }), }; - taskInstance.Execute(); - var modified = false; using (FileSystemWatcher watcher = new FileSystemWatcher()) { + taskInstance.Execute(); watcher.Path = expectedFile; watcher.Changed += (object source, FileSystemEventArgs e) => modified = true; } From 607338f00ca8119799851ad26f6d6a4efd88fb81 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 20 Oct 2020 19:25:36 -0700 Subject: [PATCH 3/8] Update ConcatenateFilesTest.cs --- .../test/ConcatenateFilesTest.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 26a76c9ae688..167828db0ee7 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -351,6 +351,12 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() ProjectBundles = Array.Empty(), OutputFile = expectedFile }; + + var modified = false; + using FileSystemWatcher watcher = new FileSystemWatcher(); + + watcher.Path = expectedFile; + watcher.Changed += (object source, FileSystemEventArgs e) => modified = true; // Act var result = taskInstance.Execute(); @@ -381,13 +387,8 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() ["RelativePath"] = "TestFiles/Generated/FetchData.razor.rz.scp.css", }), }; - - var modified = false; - using (FileSystemWatcher watcher = new FileSystemWatcher()) { - taskInstance.Execute(); - watcher.Path = expectedFile; - watcher.Changed += (object source, FileSystemEventArgs e) => modified = true; - } + + taskInstance.Execute(); // Assert Assert.True(modified); From 329ce8ca12571335e0d58198e2cfb7861e4f1bbc Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 20 Oct 2020 19:26:00 -0700 Subject: [PATCH 4/8] Update ConcatenateFilesTest.cs --- src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 167828db0ee7..66c5c88b7032 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -387,7 +387,7 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() ["RelativePath"] = "TestFiles/Generated/FetchData.razor.rz.scp.css", }), }; - + taskInstance.Execute(); // Assert From 618e384fff61223b6463e32251502c1fe08c9806 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Sun, 1 Nov 2020 21:43:41 -0800 Subject: [PATCH 5/8] Update ConcatenateFilesTest.cs --- .../test/ConcatenateFilesTest.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 66c5c88b7032..492f98244933 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -325,7 +325,7 @@ public void BundlesScopedCssFiles_DoesNotOverrideBundleForSameContents() [Fact] [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/25623")] - public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() + public async Task BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() { // Arrange var expectedFile = Path.Combine(Directory.GetCurrentDirectory(), $"{Guid.NewGuid():N}.css"); @@ -351,12 +351,6 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() ProjectBundles = Array.Empty(), OutputFile = expectedFile }; - - var modified = false; - using FileSystemWatcher watcher = new FileSystemWatcher(); - - watcher.Path = expectedFile; - watcher.Changed += (object source, FileSystemEventArgs e) => modified = true; // Act var result = taskInstance.Execute(); @@ -388,14 +382,15 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() }), }; + await Task.Delay(500); taskInstance.Execute(); // Assert - Assert.True(modified); Assert.True(result); Assert.True(File.Exists(expectedFile)); var actualContents = File.ReadAllText(expectedFile); Assert.Equal(UpdatedBundleContent, actualContents, ignoreLineEndingDifferences: true); + Assert.NotEqual(lastModified, File.GetLastWriteTimeUtc(expectedFile)); } } } From 1a8f631b6a078b3ca19bcdf243b2b0dae033ff19 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 2 Nov 2020 08:59:02 -0800 Subject: [PATCH 6/8] Update ConcatenateFilesTest.cs --- .../Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 492f98244933..b952de475ade 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -325,7 +325,7 @@ public void BundlesScopedCssFiles_DoesNotOverrideBundleForSameContents() [Fact] [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/25623")] - public async Task BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() + public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() { // Arrange var expectedFile = Path.Combine(Directory.GetCurrentDirectory(), $"{Guid.NewGuid():N}.css"); @@ -382,7 +382,7 @@ public async Task BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() }), }; - await Task.Delay(500); + Thread.Sleep(TimeSpan.FromSeconds(1)); taskInstance.Execute(); // Assert From 5b6631b5b3b7b54ee37b90d5441a4a6156f91103 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 2 Nov 2020 09:18:44 -0800 Subject: [PATCH 7/8] Update ConcatenateFilesTest.cs --- src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index b952de475ade..918c4c141e67 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Threading; using Microsoft.AspNetCore.Testing; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; From f7480db6e9a5c778664cc7138a85f127dc1a5340 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 3 Nov 2020 12:26:21 -0800 Subject: [PATCH 8/8] Use Task.Delay --- .../Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs index 918c4c141e67..b42daa9dbbdc 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Threading; using Microsoft.AspNetCore.Testing; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; @@ -326,7 +325,7 @@ public void BundlesScopedCssFiles_DoesNotOverrideBundleForSameContents() [Fact] [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/25623")] - public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() + public async System.Threading.Tasks.Task BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() { // Arrange var expectedFile = Path.Combine(Directory.GetCurrentDirectory(), $"{Guid.NewGuid():N}.css"); @@ -383,7 +382,7 @@ public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange() }), }; - Thread.Sleep(TimeSpan.FromSeconds(1)); + await System.Threading.Tasks.Task.Delay(1000); taskInstance.Execute(); // Assert