Address PR feedback

Also added a few additional tests.

Author: stephentoub

src/Common/tests/System/IO/TempFile.cs

@@ -35,7 +35,8 @@ public void Dispose()
 
         private void DeleteFile()
         {
-            File.Delete(Path);
+            try { File.Delete(Path); }
+            catch { /* Ignore exceptions on disposal paths */ }
         }
     }
 }

src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateFromFile.Tests.cs

@@ -117,7 +117,8 @@ public void FileAccessAndMapAccessCombinations_Valid(FileAccess fileAccess, Memo
         /// Tests various values of FileAccess used to construct a FileStream and MemoryMappedFileAccess used
         /// to construct a map over that stream on Windows.  The combinations should all be invalid, resulting in exception.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Theory]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadWrite)]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadExecute)]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadWriteExecute)]
@@ -143,7 +144,8 @@ public void FileAccessAndMapAccessCombinations_Invalid_Windows(FileAccess fileAc
         /// Tests various values of FileAccess used to construct a FileStream and MemoryMappedFileAccess used
         /// to construct a map over that stream on Unix.  The combinations should all be invalid, resulting in exception.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.AnyUnix)]
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Theory]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadWrite)]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadExecute)]
         [InlineData(FileAccess.Read, MemoryMappedFileAccess.ReadWriteExecute)]
@@ -188,7 +190,8 @@ public void InvalidArguments_MapName()
         /// <summary>
         /// Test to verify that map names are left unsupported on Unix.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.AnyUnix)]
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         public void MapNamesNotSupported_Unix(string mapName)
         {
@@ -593,7 +596,8 @@ public void FileInUse()
         /// <summary>
         /// Test the exceptional behavior of *Execute access levels.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)] // Unix model for executable differs from Windows
+        [PlatformSpecific(PlatformID.Windows)] // Unix model for executable differs from Windows
+        [Theory]
         [InlineData(MemoryMappedFileAccess.ReadExecute)]
         [InlineData(MemoryMappedFileAccess.ReadWriteExecute)]
         public void FileNotOpenedForExecute(MemoryMappedFileAccess access)
@@ -756,7 +760,7 @@ public void FileSizeExpandsToCapacity()
                 MemoryMappedFile.CreateFromFile(file.Path, FileMode.Open, null, InitialCapacity * 2).Dispose();
                 using (FileStream fs = File.OpenRead(file.Path))
                 {
-                    Assert.Equal(512, fs.Length);
+                    Assert.Equal(InitialCapacity * 2, fs.Length);
                 }
 
                 // Do the same thing again but with a FileStream.
@@ -771,7 +775,8 @@ public void FileSizeExpandsToCapacity()
         /// <summary>
         /// Test the exceptional behavior when attempting to create a map so large it's not supported.
         /// </summary>
-        [Fact, PlatformSpecific(PlatformID.Windows | PlatformID.Linux)] // Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)
+        [PlatformSpecific(~PlatformID.OSX)] // Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)
+        [Fact]
         public void TooLargeCapacity()
         {
             using (FileStream fs = new FileStream(GetTestFilePath(), FileMode.CreateNew))
@@ -784,7 +789,8 @@ public void TooLargeCapacity()
         /// Test to verify map names are handled appropriately, causing a conflict when they're active but
         /// reusable in a sequential manner.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         public void ReusingNames_Windows(string name)
         {

src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs

@@ -86,7 +86,8 @@ public void InvalidArguments_Inheritability(HandleInheritability inheritability)
         /// <summary>
         /// Test the exceptional behavior when attempting to create a map so large it's not supported.
         /// </summary>
-        [Fact, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Fact]
         public void TooLargeCapacity_Windows()
         {
             if (IntPtr.Size == 4)
@@ -102,7 +103,8 @@ public void TooLargeCapacity_Windows()
         /// <summary>
         /// Test the exceptional behavior when attempting to create a map so large it's not supported.
         /// </summary>
-        [Fact, PlatformSpecific(PlatformID.Linux)] // Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)
+        [PlatformSpecific(PlatformID.AnyUnix & ~PlatformID.OSX)] // Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)
+        [Fact]
         public void TooLargeCapacity_Unix()
         {
             // On Windows we fail with too large a capacity as part of the CreateNew call.
@@ -122,7 +124,8 @@ public void TooLargeCapacity_Unix()
         /// <summary>
         /// Test to verify that map names are left unsupported on Unix.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.AnyUnix)]
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         public void MapNamesNotSupported_Unix(string mapName)
         {
@@ -134,7 +137,8 @@ public void MapNamesNotSupported_Unix(string mapName)
         /// <summary>
         /// Test to verify a variety of map names work correctly on Windows.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         [InlineData(null)]
         public void ValidMapNames_Windows(string name)
@@ -157,7 +161,8 @@ public void ValidMapNames_Windows(string name)
         /// Test to verify map names are handled appropriately, causing a conflict when they're active but
         /// reusable in a sequential manner.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         public void ReusingNames_Windows(string name)
         {
@@ -250,7 +255,8 @@ public static IEnumerable<object[]> MemberData_ValidArgumentCombinations(
         /// <summary>
         /// Test to verify that two unrelated maps don't share data.
         /// </summary>
-        [Theory, PlatformSpecific(PlatformID.Windows)]
+        [PlatformSpecific(PlatformID.Windows)]
+        [Theory]
         [MemberData("CreateValidMapNames")]
         [InlineData(null)]
         public void DataNotPersistedBetweenMaps_Windows(string name)
@@ -302,20 +308,36 @@ public void ManyConcurrentMaps()
         /// <summary>
         /// Test to verify expected capacity with regards to page size and automatically rounding up to the nearest.
         /// </summary>
+        [PlatformSpecific(PlatformID.Windows)]
         [Fact]
-        public void RoundedUpCapacity()
+        public void RoundedUpCapacity_Windows()
         {
             // On both Windows and Unix, capacity is rounded up to the nearest page size.   However, 
             // the amount of capacity actually usable by the developer is supposed to be limited
             // to that specified.  That's not currently the case with the MMF APIs on Windows;
             // it is the case on Unix.
-            int specifiedCapacity = 1;
-            using (MemoryMappedFile mmf = MemoryMappedFile.CreateNew(null, specifiedCapacity))
+            const int CapacityLessThanPageSize = 1;
+            using (MemoryMappedFile mmf = MemoryMappedFile.CreateNew(null, CapacityLessThanPageSize))
+            using (MemoryMappedViewAccessor acc = mmf.CreateViewAccessor())
+            {
+                Assert.Equal(s_pageSize.Value, acc.Capacity);
+            }
+        }
+
+        /// <summary>
+        /// Test to verify expected capacity with regards to page size and automatically rounding up to the nearest.
+        /// </summary>
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Fact]
+        public void RoundedUpCapacity_Unix()
+        {
+            // The capacity of the view should match the capacity specified when creating the map,
+            // even though under the covers the map's capacity is rounded up to the nearest page size.
+            const int CapacityLessThanPageSize = 1;
+            using (MemoryMappedFile mmf = MemoryMappedFile.CreateNew(null, CapacityLessThanPageSize))
             using (MemoryMappedViewAccessor acc = mmf.CreateViewAccessor())
             {
-                Assert.Equal(
-                    Interop.IsWindows ? s_pageSize.Value : specifiedCapacity,
-                    acc.Capacity);
+                Assert.Equal(CapacityLessThanPageSize, acc.Capacity);
             }
         }