dotnet#51371 removed extra spaces, adjusted IsCaseSensitiveProperty a…

…nd other review comments changes
mkhamoyan · Jan 20, 2022 · 8696973 · 8696973
1 parent 69ea51e
commit 8696973
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs b/src/libraries/Common/tests/StreamConformanceTests/System/IO/StreamConformanceTests.cs
@@ -1595,7 +1595,7 @@ protected static bool Bidirectional(StreamPair streams) =>
             streams.Stream1.CanRead && streams.Stream1.CanWrite &&
             streams.Stream2.CanRead && streams.Stream2.CanWrite;
 
-        [Fact]        
+        [Fact]
         public virtual async Task ArgumentValidation_ThrowsExpectedException()
         {
             using StreamPair streams = await CreateConnectedStreamsAsync();

diff --git a/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs b/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs
@@ -23,7 +23,7 @@ public abstract partial class FileCleanupTestBase : IDisposable
         /// <summary>Initialize the test class base.  This creates the associated test directory.</summary>
         protected FileCleanupTestBase(string tempDirectory = null)
         {
-            tempDirectory ??= PlatformDetection.IsNotRunningOnMacOS ? Path.GetTempPath() : "/tmp/";
+            tempDirectory ??= PlatformDetection.IsCaseSensitiveOS ? Path.GetTempPath() : "/tmp/";
 
             // Use a unique test directory per test class.  The test directory lives in the user's temp directory,
             // and includes both the name of the test class and a random string.  The test class name is included
@@ -108,7 +108,8 @@ protected string GetTestFileName(int? index = null, [CallerMemberName] string me
 
             const int maxLength = 260 - 5; // Windows MAX_PATH minus a bit
 
-            int excessLength = testFilePath.Length - maxLength;          
+            int excessLength = testFilePath.Length - maxLength;
+
             if (excessLength > 0)
             {
                 // The path will be too long for Windows -- can we
@@ -141,7 +142,7 @@ protected static string GetNamedPipeServerStreamName()
                 return @"LOCAL\" + Guid.NewGuid().ToString("N");
             }
 
-            if (PlatformDetection.IsWindows || !PlatformDetection.IsNotRunningOnMacOS)
+            if (PlatformDetection.IsWindows || !PlatformDetection.IsCaseSensitiveOS)
             {
                 return Guid.NewGuid().ToString("N");
             }

diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -60,7 +60,8 @@ public static partial class PlatformDetection
         public static bool IsNotWindows => !IsWindows;
 
         public static bool IsCaseInsensitiveOS => IsWindows || IsOSX || IsMacCatalyst;
-        public static bool IsCaseSensitiveOS => !IsCaseInsensitiveOS;
+        public static bool IsCaseSensitiveOS => !IsCaseInsensitiveOS && !RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
+                && !RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator");
 
         public static bool IsThreadingSupported => !IsBrowser;
         public static bool IsBinaryFormatterSupported => IsNotMobile && !IsNativeAot;
@@ -77,8 +78,6 @@ public static partial class PlatformDetection
 
         public static bool IsUsingLimitedCultures => !IsNotMobile;
         public static bool IsNotUsingLimitedCultures => IsNotMobile;
-        public static bool IsNotRunningOnMacOS => !RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
-                && !RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator") && !IsMacCatalyst;
 
         public static bool IsLinqExpressionsBuiltWithIsInterpretingOnly => s_LinqExpressionsBuiltWithIsInterpretingOnly.Value;
         public static bool IsNotLinqExpressionsBuiltWithIsInterpretingOnly => !IsLinqExpressionsBuiltWithIsInterpretingOnly;

diff --git a/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs b/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs
@@ -62,7 +62,7 @@ public void SettingInvalidAttributes_Unix(FileAttributes attributes)
             AssertSettingInvalidAttributes(path, attributes);
         }
 
-        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotRunningOnMacOS))]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))]
         [InlineData(FileAttributes.Hidden)]
         [PlatformSpecific(TestPlatforms.AnyUnix & ~(TestPlatforms.OSX | TestPlatforms.FreeBSD))]
         public void SettingInvalidAttributes_UnixExceptOSXAndFreeBSD(FileAttributes attributes)

diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs
@@ -698,10 +698,9 @@ public void WindowsSearchPatternWhitespace()
             Assert.Empty(GetEntries(TestDirectory, "\t"));
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotRunningOnMacOS))]
-        [PlatformSpecific(CaseSensitivePlatforms)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))]
         public void SearchPatternCaseSensitive()
-        {  
+        {
             DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath());
             string testBase = GetTestFileName();
             testDir.CreateSubdirectory(testBase + "aBBb");

diff --git a/src/libraries/System.IO.FileSystem/tests/File/Create.cs b/src/libraries/System.IO.FileSystem/tests/File/Create.cs
@@ -219,8 +219,7 @@ public void LongFileName()
             Assert.False(File.Exists(path));
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotRunningOnMacOS))]
-        [PlatformSpecific(CaseSensitivePlatforms)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))]
         public void CaseSensitive()
         {
             DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath());

diff --git a/src/libraries/System.IO.FileSystem/tests/File/Exists.cs b/src/libraries/System.IO.FileSystem/tests/File/Exists.cs
@@ -112,7 +112,7 @@ public void PathAlreadyExistsAsDirectory()
         }
 
         [Fact]
-         public void DirectoryLongerThanMaxDirectoryAsPath_DoesntThrow()
+        public void DirectoryLongerThanMaxDirectoryAsPath_DoesntThrow()
         {
             Assert.All((IOInputs.GetPathsLongerThanMaxDirectory(GetTestFilePath())), (path) =>
             {

diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.cs
@@ -89,15 +89,7 @@ public NamedPipeClientStream(string serverName, string pipeName, PipeDirection d
             {
                 IsCurrentUserOnly = true;
             }
-            if (RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
-                || RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator"))
-            {
-               _normalizedPipePath = $"/tmp/{pipeName}";
-            }
-            else
-            {
-               _normalizedPipePath = GetPipePath(serverName, pipeName);
-            }
+            _normalizedPipePath = GetPipePath(serverName, pipeName);
             _direction = direction;
             _inheritability = inheritability;
             _impersonationLevel = impersonationLevel;

diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Unix.cs
@@ -41,10 +41,8 @@ private void Create(string pipeName, PipeDirection direction, int maxNumberOfSer
             // We don't have a good way to enforce maxNumberOfServerInstances across processes; we only factor it in
             // for streams created in this process.  Between processes, we behave similarly to maxNumberOfServerInstances == 1,
             // in that the second process to come along and create a stream will find the pipe already in existence and will fail.
-            var pipePath = !RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
-                && !RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator") ? GetPipePath(".", pipeName) : $"/tmp/{pipeName}";
             _instance = SharedServer.Get(
-                pipePath,
+                GetPipePath(".", pipeName),
                 (maxNumberOfServerInstances == MaxAllowedServerInstances) ? int.MaxValue : maxNumberOfServerInstances);
 
             _direction = direction;

diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Unix.cs
@@ -196,6 +196,12 @@ internal static string GetPipePath(string serverName, string pipeName)
                 throw new ArgumentOutOfRangeException(nameof(pipeName), SR.ArgumentOutOfRange_AnonymousReserved);
             }
 
+            if (RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
+                || RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator"))
+            {
+                return $"/tmp/{pipeName}";
+            }
+
             // Since pipes are stored as files in the system we support either an absolute path to a file name
             // or a file name. The support of absolute path was added to allow working around the limited
             // length available for the pipe name when concatenated with the temp path, while being

diff --git a/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs b/src/libraries/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs
@@ -232,6 +232,12 @@ public override void EndWrite(IAsyncResult asyncResult)
 
         internal static string GetPipePath(string serverName, string pipeName)
         {
+            if (RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator")
+                || RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator"))
+            {
+                return $"/tmp/{pipeName}";
+            }
+
             string normalizedPipePath = Path.GetFullPath(@"\\" + serverName + @"\pipe\" + pipeName);
             if (string.Equals(normalizedPipePath, @"\\.\pipe\" + AnonymousPipeName, StringComparison.OrdinalIgnoreCase))
             {