From f81f86ea0a4e7279890969432d10db8dd7d3a96d Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Thu, 26 Mar 2020 16:15:05 -0400 Subject: [PATCH 01/12] Invalidate upon delete and create for fileinfo and directoryinfo --- .../src/System/IO/DirectoryInfo.cs | 10 ++++++++-- .../System.IO.FileSystem/src/System/IO/FileInfo.cs | 13 +++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index 4b5867e540899f..032b38c7c3c65b 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -235,8 +235,14 @@ public void MoveTo(string destDirName) Invalidate(); } - public override void Delete() => FileSystem.RemoveDirectory(FullPath, recursive: false); + public override void Delete() => DeleteAndInvalidate(false); - public void Delete(bool recursive) => FileSystem.RemoveDirectory(FullPath, recursive); + public void Delete(bool recursive) => DeleteAndInvalidate(recursive); + + private void DeleteAndInvalidate(bool recurisve) + { + FileSystem.RemoveDirectory(FullPath, recurisve); + Invalidate(); + } } } diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/FileInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/FileInfo.cs index 6a69fcbcc7ec14..4857812d2b3402 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/FileInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/FileInfo.cs @@ -99,9 +99,18 @@ public FileInfo CopyTo(string destFileName, bool overwrite) return new FileInfo(destinationPath, isNormalized: true); } - public FileStream Create() => File.Create(NormalizedPath); + public FileStream Create() + { + FileStream fileStream = File.Create(NormalizedPath); + Invalidate(); + return fileStream; + } - public override void Delete() => FileSystem.DeleteFile(FullPath); + public override void Delete() + { + FileSystem.DeleteFile(FullPath); + Invalidate(); + } public FileStream Open(FileMode mode) => Open(mode, (mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite), FileShare.None); From 9bec8c58bd5c6f902c1843b58fd16e4b8dc9b675 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Thu, 26 Mar 2020 17:04:02 -0400 Subject: [PATCH 02/12] Add tests, remove directory info test that tested removed behavior --- .../src/System/IO/DirectoryInfo.cs | 12 ++++++------ .../src/System/IO/FileSystemInfo.Windows.cs | 1 + .../tests/DirectoryInfo/Create.cs | 9 +++++++++ .../tests/DirectoryInfo/Delete.cs | 17 +++++++---------- .../tests/FileInfo/Create.cs | 12 ++++++++++++ .../tests/FileInfo/Delete.cs | 15 +++++++++++++++ 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index 032b38c7c3c65b..214e083848c21a 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -50,6 +50,12 @@ private void Init(string originalPath, string? fullPath = null, string? fileName _isNormalized = isNormalized; } + private void DeleteAndInvalidate(bool recurisve) + { + FileSystem.RemoveDirectory(FullPath, recurisve); + Invalidate(); + } + public DirectoryInfo? Parent { get @@ -238,11 +244,5 @@ public void MoveTo(string destDirName) public override void Delete() => DeleteAndInvalidate(false); public void Delete(bool recursive) => DeleteAndInvalidate(recursive); - - private void DeleteAndInvalidate(bool recurisve) - { - FileSystem.RemoveDirectory(FullPath, recurisve); - Invalidate(); - } } } diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs b/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs index 7f02a1296f0cb2..bbd16499952ec4 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs @@ -141,6 +141,7 @@ internal long LengthCore } } + private void EnsureDataInitialized() { if (_dataInitialized == -1) diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs index 3eef2db07abe17..5ca55487405218 100644 --- a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs +++ b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Create.cs @@ -83,5 +83,14 @@ public void CreateDirectoryWithAttributes() testInfo.Create(); testInfo.Attributes = FileAttributes.Directory | FileAttributes.Normal; } + + [Fact] + public void CreateInvalidatesDirectoryInfo() + { + string testDir = Path.Combine(GetTestFilePath(), "DirectoryCreate"); + DirectoryInfo testDirectoryInfo = new DirectoryInfo(testDir); + testDirectoryInfo.Create(); + Assert.True(testDirectoryInfo.Exists); + } } } diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs index 09082d1553f320..1790bd9b2e8f38 100644 --- a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs +++ b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Delete.cs @@ -14,17 +14,14 @@ protected override void Delete(string path) } [Fact] - public void ExistsDoesntRefreshOnDelete() + public void DeleteInvalidatesDirectoryInfo() { - DirectoryInfo dir = Directory.CreateDirectory(Path.Combine(TestDirectory, Path.GetRandomFileName())); - - Assert.True(dir.Exists); - - dir.Delete(); - - Assert.True(dir.Exists); - dir.Refresh(); - Assert.False(dir.Exists); + string testDir = Path.Combine(GetTestFilePath(), "DirectoryCreate"); + DirectoryInfo testDirectoryInfo = new DirectoryInfo(testDir); + testDirectoryInfo.Create(); + Assert.True(testDirectoryInfo.Exists); + testDirectoryInfo.Delete(); + Assert.False(testDirectoryInfo.Exists); } } diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs index c526e3f770f3d9..049c7dc0df6c0d 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs @@ -32,6 +32,18 @@ public void FullNameUpdatesOnCreate() } } + [Fact] + public void FileInfoInvalidAfterCreate() + { + DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); + string testFilePath = Path.Combine(testDir.FullName, GetTestFileName()); + FileInfo info = new FileInfo(testFilePath); + using(FileStream fileStream = info.Create()) + { + Assert.True(info.Exists); + } + } + #endregion } } diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs index 9a76d69e3b0cb5..15784455441309 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs @@ -12,5 +12,20 @@ protected override void Delete(string path) { new FileInfo(path).Delete(); } + + [Fact] + public void FileInfoInvalidatedOnDelete() + { + DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); + string testFilePath = Path.Combine(testDir.FullName, GetTestFileName()); + FileInfo info = new FileInfo(testFilePath); + using(var fileStream = info.Create()) + { + Assert.True(info.Exists); + } + + info.Delete(); + Assert.False(info.Exists); + } } } From 1cde8e887e00180de63bb9b28f61c89b79f5ffff Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Fri, 27 Mar 2020 21:18:04 -0400 Subject: [PATCH 03/12] Add delete test --- src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs index 15784455441309..94c70fbc151e7f 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs @@ -19,7 +19,7 @@ public void FileInfoInvalidatedOnDelete() DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); string testFilePath = Path.Combine(testDir.FullName, GetTestFileName()); FileInfo info = new FileInfo(testFilePath); - using(var fileStream = info.Create()) + using(FileStream fileStream = info.Create()) { Assert.True(info.Exists); } From e1320076dcd4b508796cb84284e83e4101a08a86 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Fri, 27 Mar 2020 22:56:43 -0400 Subject: [PATCH 04/12] Fix typoe in directoryinfo --- .../System.IO.FileSystem/src/System/IO/DirectoryInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index 214e083848c21a..f427cb879a28a0 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -50,9 +50,9 @@ private void Init(string originalPath, string? fullPath = null, string? fileName _isNormalized = isNormalized; } - private void DeleteAndInvalidate(bool recurisve) + private void DeleteAndInvalidate(bool recursive) { - FileSystem.RemoveDirectory(FullPath, recurisve); + FileSystem.RemoveDirectory(FullPath, recursive); Invalidate(); } From ea746cc67f04f0bd17d79b4c6fc048b498bce482 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Fri, 27 Mar 2020 23:01:48 -0400 Subject: [PATCH 05/12] Remove new line, and refactor away private method into delete method with paramter --- .../src/System/IO/DirectoryInfo.cs | 14 ++++++-------- .../src/System/IO/FileSystemInfo.Windows.cs | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index f427cb879a28a0..b019aa4706b405 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -50,12 +50,6 @@ private void Init(string originalPath, string? fullPath = null, string? fileName _isNormalized = isNormalized; } - private void DeleteAndInvalidate(bool recursive) - { - FileSystem.RemoveDirectory(FullPath, recursive); - Invalidate(); - } - public DirectoryInfo? Parent { get @@ -241,8 +235,12 @@ public void MoveTo(string destDirName) Invalidate(); } - public override void Delete() => DeleteAndInvalidate(false); + public override void Delete() => Delete(false); - public void Delete(bool recursive) => DeleteAndInvalidate(recursive); + public void Delete(bool recursive) + { + FileSystem.RemoveDirectory(FullPath, recursive); + Invalidate(); + } } } diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs b/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs index bbd16499952ec4..7f02a1296f0cb2 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/FileSystemInfo.Windows.cs @@ -141,7 +141,6 @@ internal long LengthCore } } - private void EnsureDataInitialized() { if (_dataInitialized == -1) From f204026ab55bbeae1c62252ba67bf61fdeefda5b Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Sat, 28 Mar 2020 13:31:50 -0400 Subject: [PATCH 06/12] Change set time tests --- .../System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs | 3 ++- .../System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs index 0e61c82cd5187d..62b82702883d18 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs @@ -67,7 +67,8 @@ public void TimesStillSetAfterDelete() item.Delete(); Assert.All(times, time => { - Assert.Equal(time.Value, time.Key.Getter(item)); + // We check for the time update from refresh + Assert.True(time.Value < DateTime.UtcNow); }); } } diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs index 9c6109107ca8a4..af055ca18cfa51 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs @@ -194,9 +194,8 @@ public void DeleteAfterEnumerate_TimesStillSet() DateTime afterTime = DateTime.UtcNow.AddSeconds(1); - // Deleting doesn't change any info state info.Delete(); - ValidateSetTimes(info, beforeTime, afterTime); + Assert.True(info.LastAccessTimeUtc > afterTime); } From c9f893591992a71c8a0a2c88329ae9642da3a350 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Sat, 28 Mar 2020 18:24:40 -0400 Subject: [PATCH 07/12] Code review linting as well as test change --- .../System.IO.FileSystem/src/System/IO/DirectoryInfo.cs | 2 +- src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs | 2 +- src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs | 2 +- .../System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs index b019aa4706b405..69792e7eac6510 100644 --- a/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs +++ b/src/libraries/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs @@ -235,7 +235,7 @@ public void MoveTo(string destDirName) Invalidate(); } - public override void Delete() => Delete(false); + public override void Delete() => Delete(recursive: false); public void Delete(bool recursive) { diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs index 049c7dc0df6c0d..f2c5c2b8643b65 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Create.cs @@ -38,7 +38,7 @@ public void FileInfoInvalidAfterCreate() DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); string testFilePath = Path.Combine(testDir.FullName, GetTestFileName()); FileInfo info = new FileInfo(testFilePath); - using(FileStream fileStream = info.Create()) + using (FileStream fileStream = info.Create()) { Assert.True(info.Exists); } diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs index 94c70fbc151e7f..0e14a283653eb5 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Delete.cs @@ -19,7 +19,7 @@ public void FileInfoInvalidatedOnDelete() DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); string testFilePath = Path.Combine(testDir.FullName, GetTestFileName()); FileInfo info = new FileInfo(testFilePath); - using(FileStream fileStream = info.Create()) + using (FileStream fileStream = info.Create()) { Assert.True(info.Exists); } diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs index af055ca18cfa51..2c6ccc9d8f36e0 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs @@ -195,7 +195,8 @@ public void DeleteAfterEnumerate_TimesStillSet() DateTime afterTime = DateTime.UtcNow.AddSeconds(1); info.Delete(); - Assert.True(info.LastAccessTimeUtc > afterTime); + Assert.NotInRange(info.LastAccessTimeUtc, beforeTime, afterTime); + Assert.Equal(info.LastAccessTimeUtc, DateTime.FromFileTimeUtc(0)); } From 2d1f527bb7c66bf4d463651d5c19e9f49b379465 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Sat, 28 Mar 2020 20:31:09 -0400 Subject: [PATCH 08/12] Modify other test that tested prior behavior --- .../System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs index 62b82702883d18..0725b24686cb3d 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs @@ -49,7 +49,7 @@ public void ExistsThenDelete_ReturnsDefaultValues() } [Fact] - public void TimesStillSetAfterDelete() + public void TimesSetToDefaultAfterDelete() { T item = GetExistingItem(); @@ -68,7 +68,7 @@ public void TimesStillSetAfterDelete() Assert.All(times, time => { // We check for the time update from refresh - Assert.True(time.Value < DateTime.UtcNow); + Assert.Equal(time.Value, DateTime.FromFileTimeUtc(0)); }); } } From 03c68b79de6dda91c9692f3365ab3f57f4fdcb65 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Sat, 28 Mar 2020 22:56:15 -0400 Subject: [PATCH 09/12] Rework Reset test --- .../System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs index 0725b24686cb3d..ac95fa0cece18d 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs @@ -49,7 +49,7 @@ public void ExistsThenDelete_ReturnsDefaultValues() } [Fact] - public void TimesSetToDefaultAfterDelete() + public void TimesResetAfterDelete() { T item = GetExistingItem(); @@ -65,10 +65,11 @@ public void TimesSetToDefaultAfterDelete() // Deleting shouldn't change any info state item.Delete(); + Assert.All(times, time => { // We check for the time update from refresh - Assert.Equal(time.Value, DateTime.FromFileTimeUtc(0)); + Assert.NotEqual(time.Key.Getter.Invoke(item), time.Value); }); } } From 9d1d82dc2e4cb39d740e261e9b3c04e60bae6605 Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Sun, 29 Mar 2020 20:56:36 -0400 Subject: [PATCH 10/12] Edits for comments in tests --- .../System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs index ac95fa0cece18d..542064b32a69eb 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs @@ -63,12 +63,12 @@ public void TimesResetAfterDelete() times.Add(timeFunction, timeFunction.Getter(item)); } - // Deleting shouldn't change any info state + // Deleting should refresh state item.Delete(); - + Assert.All(times, time => { - // We check for the time update from refresh + // We check that all the file times have been refreshed Assert.NotEqual(time.Key.Getter.Invoke(item), time.Value); }); } From e914b47e9cdfc4c5b48e106e624f50cce15e1c3a Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Tue, 31 Mar 2020 15:13:38 -0400 Subject: [PATCH 11/12] Slight method refactor --- .../System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs index 542064b32a69eb..9973fe9cdba9f1 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/InfoGetSetTimes.cs @@ -69,7 +69,7 @@ public void TimesResetAfterDelete() Assert.All(times, time => { // We check that all the file times have been refreshed - Assert.NotEqual(time.Key.Getter.Invoke(item), time.Value); + Assert.NotEqual(time.Key.Getter(item), time.Value); }); } } From 1c8242adde3907f51b1c906e63dc04e13175827d Mon Sep 17 00:00:00 2001 From: "jjjlalonde@gmail.com" Date: Thu, 2 Apr 2020 10:53:26 -0400 Subject: [PATCH 12/12] Minor test cleanup --- .../System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs index 2c6ccc9d8f36e0..6fe85747d2de2d 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/GetSetTimes.cs @@ -195,8 +195,7 @@ public void DeleteAfterEnumerate_TimesStillSet() DateTime afterTime = DateTime.UtcNow.AddSeconds(1); info.Delete(); - Assert.NotInRange(info.LastAccessTimeUtc, beforeTime, afterTime); - Assert.Equal(info.LastAccessTimeUtc, DateTime.FromFileTimeUtc(0)); + Assert.Equal(DateTime.FromFileTimeUtc(0), info.LastAccessTimeUtc); }