Add stream conformance tests for standalone streams (#44069)

* Nullable-enable stream conformance tests * Add standalone stream conformance tests * Address PR feedback
dotnet · Nov 3, 2020 · 7de7895 · 7de7895
1 parent 7a6ee5f
commit 7de7895
Show file tree

Hide file tree

Showing 48 changed files with 1,639 additions and 3,818 deletions.
diff --git a/src/libraries/Common/tests/Tests/System/IO/StreamConformanceTests.cs b/src/libraries/Common/tests/Tests/System/IO/StreamConformanceTests.cs
diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompressionStreamUnitTests.ZLib.cs" />

diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Buffering_regression.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/Buffering_regression.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CanRead.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/CanRead.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CanSeek.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/CanSeek.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CanTimeout.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/CanTimeout.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CanWrite.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/CanWrite.cs
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/CopyToAsync.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/CopyToAsync.cs
@@ -1,10 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Win32.SafeHandles;
 using System.Collections.Generic;
-using System.IO.Pipes;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
@@ -174,22 +171,5 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
                 return base.ReadAsync(buffer, offset, count, cancellationToken);
             }
         }
-
-        #region Windows P/Invokes
-        // We need to P/Invoke to test the named pipe async behavior with FileStream
-        // because NamedPipeClientStream internally binds the created handle,
-        // and that then prevents FileStream's constructor from working with the handle
-        // when trying to set isAsync to true.
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool WaitNamedPipeW(string name, int timeout);
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeFileHandle CreateFileW(
-            string lpFileName, int dwDesiredAccess, FileShare dwShareMode,
-            IntPtr securityAttrs, FileMode dwCreationDisposition, int dwFlagsAndAttributes, IntPtr hTemplateFile);
-
-        #endregion
     }
 }
diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/Dispose.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/Dispose.cs
@@ -12,12 +12,6 @@ namespace System.IO.Tests
 {
     public class FileStream_Dispose : FileSystemTest
     {
-        [Fact]
-        public void CanDispose()
-        {
-            new FileStream(GetTestFilePath(), FileMode.Create).Dispose();
-        }
-
         [Fact]
         public void DisposeClosesHandle()
         {
@@ -30,16 +24,6 @@ public void DisposeClosesHandle()
             Assert.True(handle.IsClosed);
         }
 
-        [Fact]
-        public void HandlesMultipleDispose()
-        {
-            using (FileStream fs = new FileStream(GetTestFilePath(), FileMode.Create))
-            {
-                fs.Dispose();
-                fs.Dispose();
-            }  // disposed as we leave using
-        }
-
         private class MyFileStream : FileStream
         {
             public MyFileStream(string path, FileMode mode)

diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/DisposeAsync.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/DisposeAsync.cs
@@ -9,12 +9,6 @@ namespace System.IO.Tests
 {
     public class FileStream_DisposeAsync : FileSystemTest
     {
-        [Fact]
-        public void CanDisposeAsync()
-        {
-            Assert.True(new FileStream(GetTestFilePath(), FileMode.Create).DisposeAsync().IsCompletedSuccessfully);
-        }
-
         [Fact]
         public async Task DisposeAsyncClosesHandle()
         {
@@ -25,15 +19,6 @@ public async Task DisposeAsyncClosesHandle()
             Assert.True(handle.IsClosed);
         }
 
-        [Fact]
-        public async Task HandlesMultipleDisposeAsync()
-        {
-            var fs = new FileStream(GetTestFilePath(), FileMode.Create);
-            await fs.DisposeAsync();
-            fs.Dispose();
-            await fs.DisposeAsync();
-        }
-
         [Fact]
         public async Task DisposeAsyncFlushes()
         {