Revert "Override ReadAsync and WriteAsync methods on ConsoleStream. (#…

…71971)" (#77360) This reverts commit 8cb4e93.
dotnet · Oct 24, 2022 · 58a1180 · 58a1180
1 parent 1c265ec
commit 58a1180
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 196 deletions.
diff --git a/src/libraries/System.Console/src/System/IO/ConsoleStream.cs b/src/libraries/System.Console/src/System/IO/ConsoleStream.cs
@@ -3,8 +3,6 @@
 
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace System.IO
 {
@@ -30,46 +28,6 @@ public override void Write(byte[] buffer, int offset, int count)
 
         public override void WriteByte(byte value) => Write(new ReadOnlySpan<byte>(in value));
 
-        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            ValidateWrite(buffer, offset, count);
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            try
-            {
-                Write(new ReadOnlySpan<byte>(buffer, offset, count));
-                return Task.CompletedTask;
-            }
-            catch (Exception ex)
-            {
-                return Task.FromException(ex);
-            }
-        }
-
-        public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            ValidateCanWrite();
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return ValueTask.FromCanceled(cancellationToken);
-            }
-
-            try
-            {
-                Write(buffer.Span);
-                return ValueTask.CompletedTask;
-            }
-            catch (Exception ex)
-            {
-                return ValueTask.FromException(ex);
-            }
-        }
-
         public override int Read(byte[] buffer, int offset, int count)
         {
             ValidateRead(buffer, offset, count);
@@ -83,44 +41,6 @@ public override int ReadByte()
             return result != 0 ? b : -1;
         }
 
-        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            ValidateRead(buffer, offset, count);
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled<int>(cancellationToken);
-            }
-
-            try
-            {
-                return Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
-            }
-            catch (Exception exception)
-            {
-                return Task.FromException<int>(exception);
-            }
-        }
-
-        public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            ValidateCanRead();
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return ValueTask.FromCanceled<int>(cancellationToken);
-            }
-
-            try
-            {
-                return ValueTask.FromResult(Read(buffer.Span));
-            }
-            catch (Exception exception)
-            {
-                return ValueTask.FromException<int>(exception);
-            }
-        }
-
         protected override void Dispose(bool disposing)
         {
             _canRead = false;
@@ -151,11 +71,7 @@ public override void Flush() { }
         protected void ValidateRead(byte[] buffer, int offset, int count)
         {
             ValidateBufferArguments(buffer, offset, count);
-            ValidateCanRead();
-        }
 
-        private void ValidateCanRead()
-        {
             if (!_canRead)
             {
                 throw Error.GetReadNotSupported();
@@ -165,11 +81,7 @@ private void ValidateCanRead()
         protected void ValidateWrite(byte[] buffer, int offset, int count)
         {
             ValidateBufferArguments(buffer, offset, count);
-            ValidateCanWrite();
-        }
 
-        private void ValidateCanWrite()
-        {
             if (!_canWrite)
             {
                 throw Error.GetWriteNotSupported();

diff --git a/src/libraries/System.Console/tests/ConsoleStreamTests.cs b/src/libraries/System.Console/tests/ConsoleStreamTests.cs
diff --git a/src/libraries/System.Console/tests/Helpers.cs b/src/libraries/System.Console/tests/Helpers.cs
@@ -6,11 +6,8 @@
 using System.Text;
 using Xunit;
 
-static class Helpers
+class Helpers
 {
-    public static bool IsConsoleInSupported =>
-        !PlatformDetection.IsAndroid && !PlatformDetection.IsiOS && !PlatformDetection.IsMacCatalyst && !PlatformDetection.IstvOS && !PlatformDetection.IsBrowser;
-
     public static void SetAndReadHelper(Action<TextWriter> setHelper, Func<TextWriter> getHelper, Func<StreamReader, string> readHelper)
     {
         const string TestString = "Test";

diff --git a/src/libraries/System.Console/tests/ReadAndWrite.cs b/src/libraries/System.Console/tests/ReadAndWrite.cs
@@ -31,6 +31,13 @@ public static void WriteOverloads()
         }
     }
 
+    [Fact]
+    public static void WriteToOutputStream_EmptyArray()
+    {
+        Stream outStream = Console.OpenStandardOutput();
+        outStream.Write(new byte[] { }, 0, 0);
+    }
+
     [Fact]
     [OuterLoop]
     public static void WriteOverloadsToRealConsole()

diff --git a/src/libraries/System.Console/tests/SetIn.cs b/src/libraries/System.Console/tests/SetIn.cs
@@ -10,7 +10,8 @@
 //
 public class SetIn
 {
-    [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
+    [Fact]
+    [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
     public static void SetInThrowsOnNull()
     {
         TextReader savedIn = Console.In;
@@ -24,7 +25,8 @@ public static void SetInThrowsOnNull()
         }
     }
 
-    [ConditionalFact(typeof(Helpers), nameof(Helpers.IsConsoleInSupported))]
+    [Fact]
+    [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")]
     public static void SetInReadLine()
     {
         const string TextStringFormat = "Test {0}";

diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancelKeyPress.cs" />
-    <Compile Include="ConsoleStreamTests.cs" />
     <Compile Include="Helpers.cs" />
     <Compile Include="ReadAndWrite.cs" />
     <Compile Include="ConsoleKeyInfoTests.cs" />
@@ -44,8 +43,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)TestData\**\*"
-             Link="%(RecursiveDir)%(Filename)%(Extension)"
-             CopyToOutputDirectory="PreserveNewest" />
+          Link="%(RecursiveDir)%(Filename)%(Extension)"
+          CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
     <Compile Include="ConsoleEncoding.Windows.cs" />