Added method EqualsIgnoreCase (#186)

microsoft · Jun 5, 2019 · 2822c44 · 2822c44
1 parent fdf88c3
commit 2822c44
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 28 deletions.
diff --git a/Oryx.sln b/Oryx.sln
@@ -89,7 +89,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedCodeGenerator", "buil
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2AA826A1-5647-46B2-9885-20E89050653F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oryx.Common.Test", "tests\Oryx.Common.Test\Oryx.Common.Test.csproj", "{48391B54-0D43-4E49-94C6-727B47F7C416}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oryx.Common.Tests", "tests\Oryx.Common.Tests\Oryx.Common.Tests.csproj", "{48391B54-0D43-4E49-94C6-727B47F7C416}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/BuildScriptGenerator/BuildPropertiesHelper.cs b/src/BuildScriptGenerator/BuildPropertiesHelper.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license.
 // --------------------------------------------------------------------------------------------
 
-using System;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator
 {
@@ -19,7 +19,7 @@ public static bool IsTrue(string propertyKeyName, BuildScriptGeneratorContext co
                     return true;
                 }
 
-                if (string.Equals("true", value, StringComparison.InvariantCultureIgnoreCase))
+                if (value.EqualsIgnoreCase("true"))
                 {
                     return true;
                 }

diff --git a/src/BuildScriptGenerator/DefaultBuildScriptGenerator.cs b/src/BuildScriptGenerator/DefaultBuildScriptGenerator.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Oryx.BuildScriptGenerator.Exceptions;
 using Microsoft.Oryx.Common;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator
 {
@@ -133,7 +134,7 @@ public IList<Tuple<IProgrammingPlatform, string>> GetCompatiblePlatforms(BuildSc
             if (!string.IsNullOrEmpty(ctx.Language))
             {
                 var selectedPlatform = enabledPlatforms
-                    .Where(p => string.Equals(ctx.Language, p.Name, StringComparison.OrdinalIgnoreCase))
+                    .Where(p => ctx.Language.EqualsIgnoreCase(p.Name))
                     .FirstOrDefault();
 
                 if (selectedPlatform == null)

diff --git a/src/BuildScriptGenerator/DefaultEnvironment.cs b/src/BuildScriptGenerator/DefaultEnvironment.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Oryx.Common;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator
 {
@@ -40,16 +41,13 @@ public EnvironmentType Type
         public bool? GetBoolEnvironmentVariable(string name)
         {
             var variable = GetEnvironmentVariable(name);
-            if (!string.IsNullOrEmpty(variable))
+            if (variable.EqualsIgnoreCase("true"))
             {
-                if (variable.Equals("true", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    return true;
-                }
-                else if (variable.Equals("false", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    return false;
-                }
+                return true;
+            }
+            else if (variable.EqualsIgnoreCase("false"))
+            {
+                return false;
             }
 
             return null;

diff --git a/src/BuildScriptGenerator/DotNetCore/DefaultAspNetCoreWebAppProjectFileProvider.cs b/src/BuildScriptGenerator/DotNetCore/DefaultAspNetCoreWebAppProjectFileProvider.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Oryx.BuildScriptGenerator.Exceptions;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore
 {
@@ -166,7 +167,7 @@ internal static bool IsAspNetCoreWebApplicationProject(XDocument projectFileDoc)
                 DotNetCoreConstants.ProjectSdkElementNameAttributeValueXPathExpression);
             sdkName = sdkNameAttributeValue as string;
 
-            return string.Equals(sdkName, expectedWebSdkName, StringComparison.OrdinalIgnoreCase);
+            return sdkName.EqualsIgnoreCase(expectedWebSdkName);
         }
 
         // To enable unit testing

diff --git a/src/BuildScriptGenerator/Node/NodePlatform.cs b/src/BuildScriptGenerator/Node/NodePlatform.cs
@@ -10,6 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Oryx.BuildScriptGenerator.SourceRepo;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator.Node
 {
@@ -368,7 +369,7 @@ private static bool ShouldPruneDevDependencies(BuildScriptGeneratorContext conte
             if (context.Properties != null &&
                 context.Properties.TryGetValue(PruneDevDependenciesPropertyKey, out string value))
             {
-                if (string.IsNullOrWhiteSpace(value) || string.Equals("true", value, StringComparison.InvariantCultureIgnoreCase))
+                if (string.IsNullOrWhiteSpace(value) || value.EqualsIgnoreCase("true"))
                 {
                     ret = true;
                 }
@@ -428,13 +429,13 @@ private static bool GetNodeModulesPackOptions(
             {
                 // default to tar.gz if the property was provided with no value.
                 if (string.IsNullOrEmpty(compressNodeModulesOption) ||
-                    string.Equals(compressNodeModulesOption, TarGzNodeModulesOption, StringComparison.InvariantCultureIgnoreCase))
+                    compressNodeModulesOption.EqualsIgnoreCase(TarGzNodeModulesOption))
                 {
                     compressedNodeModulesFileName = NodeConstants.NodeModulesTarGzFileName;
                     compressNodeModulesCommand = $"tar -zcf";
                     isNodeModulesPackaged = true;
                 }
-                else if (string.Equals(compressNodeModulesOption, ZipNodeModulesOption, StringComparison.InvariantCultureIgnoreCase))
+                else if (compressNodeModulesOption.EqualsIgnoreCase(ZipNodeModulesOption))
                 {
                     compressedNodeModulesFileName = NodeConstants.NodeModulesZippedFileName;
                     compressNodeModulesCommand = $"zip -y -q -r";

diff --git a/src/BuildScriptGenerator/Python/PythonPlatform.cs b/src/BuildScriptGenerator/Python/PythonPlatform.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Oryx.BuildScriptGenerator.Exceptions;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator.Python
 {
@@ -260,17 +261,15 @@ private static bool GetVirtualEnvPackOptions(
             {
                 // default to tar.gz if the property was provided with no value.
                 if (string.IsNullOrEmpty(compressVirtualEnvOption) ||
-                    string.Equals(
-                        compressVirtualEnvOption, TarGzOption, StringComparison.InvariantCultureIgnoreCase))
+                    compressVirtualEnvOption.EqualsIgnoreCase(TarGzOption))
                 {
                     compressedVirtualEnvFileName = string.Format(
                         PythonConstants.TarGzVirtualEnvFileNameFormat,
                         virtualEnvName);
                     compressVirtualEnvCommand = $"tar -zcf";
                     isVirtualEnvPackaged = true;
                 }
-                else if (string.Equals(
-                    compressVirtualEnvOption, ZipOption, StringComparison.InvariantCultureIgnoreCase))
+                else if (compressVirtualEnvOption.EqualsIgnoreCase(ZipOption))
                 {
                     compressedVirtualEnvFileName = string.Format(
                         PythonConstants.ZipVirtualEnvFileNameFormat,
@@ -289,7 +288,7 @@ private bool IsCollectStaticEnabled()
             var enableCollectStatic = true;
             var disableCollectStaticEnvValue = _environment.GetEnvironmentVariable(
                 EnvironmentSettingsKeys.DisableCollectStatic);
-            if (string.Equals(disableCollectStaticEnvValue, "true", StringComparison.OrdinalIgnoreCase))
+            if (disableCollectStaticEnvValue.EqualsIgnoreCase("true"))
             {
                 enableCollectStatic = false;
             }

diff --git a/src/BuildScriptGenerator/RunScriptGenerator.cs b/src/BuildScriptGenerator/RunScriptGenerator.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Oryx.BuildScriptGenerator.Exceptions;
+using Microsoft.Oryx.Common.Extensions;
 
 namespace Microsoft.Oryx.BuildScriptGenerator
 {
@@ -21,11 +22,9 @@ public RunScriptGenerator(IEnumerable<IProgrammingPlatform> programmingPlatforms
 
         public string GenerateBashScript(string targetPlatformName, RunScriptGeneratorOptions options)
         {
-            var targetPlatform = _programmingPlatforms.Where(
-                p => string.Equals(
-                    p.Name,
-                    targetPlatformName,
-                    StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault();
+            var targetPlatform = _programmingPlatforms
+                .Where(p => p.Name.EqualsIgnoreCase(targetPlatformName))
+                .FirstOrDefault();
 
             if (targetPlatform == null)
             {

diff --git a/src/Common/Extensions/StringExtensions.cs b/src/Common/Extensions/StringExtensions.cs
@@ -17,6 +17,11 @@ public static class StringExtensions
 
         private static readonly string UrlUserInfoReplacement = "***";
 
+        public static bool EqualsIgnoreCase(this string a, string b)
+        {
+            return string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+        }
+
         /// <summary>
         /// Replaces the userinfo subcomponent of URLs in a string with asterisks.
         /// </summary>

diff --git a/.../Oryx.Common.Test/Oryx.Common.Test.csproj → ...ryx.Common.Tests/Oryx.Common.Tests.csproj b/.../Oryx.Common.Test/Oryx.Common.Test.csproj → ...ryx.Common.Tests/Oryx.Common.Tests.csproj
diff --git a/....Test/OryxDirectoryStructureHelperTest.cs → ...Tests/OryxDirectoryStructureHelperTest.cs b/....Test/OryxDirectoryStructureHelperTest.cs → ...Tests/OryxDirectoryStructureHelperTest.cs
@@ -8,7 +8,7 @@
 using Microsoft.Oryx.Tests.Common;
 using Xunit;
 
-namespace Microsoft.Oryx.Common.Test
+namespace Microsoft.Oryx.Common.Tests
 {
     public class OryxDirectoryStructureHelperTest : IClassFixture<TestTempDirTestFixture>
     {

diff --git a/.../Oryx.Common.Test/StringExtensionsTest.cs → ...Oryx.Common.Tests/StringExtensionsTest.cs b/.../Oryx.Common.Test/StringExtensionsTest.cs → ...Oryx.Common.Tests/StringExtensionsTest.cs
@@ -9,6 +9,20 @@ namespace Microsoft.Oryx.Common.Extensions
 {
     public class StringExtensionsTest
     {
+        [Fact]
+        public void EqualsIgnoreCase_Sanity()
+        {
+            Assert.True("abc".EqualsIgnoreCase("aBc"));
+
+            Assert.True("abc".EqualsIgnoreCase("ABC"));
+
+            Assert.False("bl".EqualsIgnoreCase("bla"));
+
+            string s = null;
+            Assert.False(s.EqualsIgnoreCase("bla"));
+            Assert.False("bla".EqualsIgnoreCase(s));
+        }
+
         [Fact]
         public void Chunkify_Sanity()
         {