Merge pull request #4346 from stevenaw/4246-fix-cultures-v3

OsirisTerje · web-flow · commit c37595fc77d8 · 2023-04-11T09:35:54.000+02:00
V3 | Add tests for test assembly builder in a few cultures + fix underlying culture issues
diff --git a/src/NUnitFramework/framework/Api/DefaultTestAssemblyBuilder.cs b/src/NUnitFramework/framework/Api/DefaultTestAssemblyBuilder.cs
@@ -148,7 +148,7 @@ private TestSuite Build(Assembly assembly, string assemblyNameOrPath, IDictionar
                         if (!string.IsNullOrEmpty(parameters))
                             foreach (string param in parameters.Split(new[] { ';' }))
                             {
-                                int eq = param.IndexOf("=");
+                                int eq = param.IndexOf('=');
 
                                 if (eq > 0 && eq < param.Length - 1)
                                 {
diff --git a/src/NUnitFramework/framework/Attributes/CategoryAttribute.cs b/src/NUnitFramework/framework/Attributes/CategoryAttribute.cs
@@ -67,7 +67,7 @@ public CategoryAttribute(string name)
         protected CategoryAttribute()
         {
             this.categoryName = this.GetType().Name;
-            if ( categoryName.EndsWith( "Attribute" ) )
+            if ( categoryName.EndsWith( "Attribute", StringComparison.Ordinal ) )
                 categoryName = categoryName.Substring( 0, categoryName.Length - 9 );
         }
 
diff --git a/src/NUnitFramework/framework/Attributes/CombiningStrategyAttribute.cs b/src/NUnitFramework/framework/Attributes/CombiningStrategyAttribute.cs
@@ -119,7 +119,7 @@ public IEnumerable<TestMethod> BuildFrom(IMethodInfo method, Test? suite)
         public void ApplyToTest(Test test)
         {
             var joinType = _strategy.GetType().Name;
-            if (joinType.EndsWith("Strategy"))
+            if (joinType.EndsWith("Strategy", StringComparison.Ordinal))
                 joinType = joinType.Substring(0, joinType.Length - 8);
 
             test.Properties.Set(PropertyNames.JoinType, joinType);
diff --git a/src/NUnitFramework/framework/Attributes/PropertyAttribute.cs b/src/NUnitFramework/framework/Attributes/PropertyAttribute.cs
@@ -84,7 +84,7 @@ protected PropertyAttribute() { }
         protected PropertyAttribute( object propertyValue )
         {
             string propertyName = this.GetType().Name;
-            if ( propertyName.EndsWith( "Attribute" ) )
+            if ( propertyName.EndsWith( "Attribute", StringComparison.Ordinal ) )
                 propertyName = propertyName.Substring( 0, propertyName.Length - 9 );
             this.properties.Add(propertyName, propertyValue);
         }
diff --git a/src/NUnitFramework/framework/Constraints/PredicateConstraint.cs b/src/NUnitFramework/framework/Constraints/PredicateConstraint.cs
@@ -52,7 +52,7 @@ public override string Description
             get
             {
                 var name = predicate.GetMethodInfo().Name;
-                return name.StartsWith("<")
+                return name.StartsWith("<", StringComparison.Ordinal)
                     ? "value matching lambda expression"
                     : "value matching " + name;
             }
diff --git a/src/NUnitFramework/framework/Constraints/UniqueItemsConstraint.cs b/src/NUnitFramework/framework/Constraints/UniqueItemsConstraint.cs
@@ -149,7 +149,7 @@ private ICollection OriginalAlgorithm(IEnumerable actual)
         private static bool IsSpecialComparisonType(Type type)
         {
             if (type.IsGenericType)
-                return type.FullName.StartsWith("System.Collections.Generic.KeyValuePair`2");
+                return type.FullName.StartsWith("System.Collections.Generic.KeyValuePair`2", StringComparison.Ordinal);
 #pragma warning disable CS0618 // 'Numerics' is only marked as obsolete for public use
             else if (Numerics.IsNumericType(type))
 #pragma warning restore CS0618
@@ -257,7 +257,7 @@ private static bool IsHandledSpeciallyByNUnit(Type type)
         {
             foreach (var type in actual.GetType().GetInterfaces())
             {
-                if (type.FullName.StartsWith("System.Collections.Generic.IEnumerable`1"))
+                if (type.FullName.StartsWith("System.Collections.Generic.IEnumerable`1", StringComparison.Ordinal))
                 {
 #if NET35 || NET40
                     return type.GetGenericArguments()[0];
diff --git a/src/NUnitFramework/framework/Interfaces/TNode.cs b/src/NUnitFramework/framework/Interfaces/TNode.cs
@@ -274,7 +274,7 @@ private static NodeList ApplySelection(NodeList nodeList, string xpath)
             Guard.ArgumentNotNullOrEmpty(xpath, nameof(xpath));
             if (xpath[0] == '/')
                 throw new ArgumentException("XPath expressions starting with '/' are not supported", nameof(xpath));
-            if (xpath.IndexOf("//") >= 0)
+            if (xpath.IndexOf("//", StringComparison.Ordinal) >= 0)
                 throw new ArgumentException("XPath expressions with '//' are not supported", nameof(xpath));
 
             string head = xpath;
@@ -378,7 +378,7 @@ private void WriteCDataTo(XmlWriter writer)
 
             while (true)
             {
-                int illegal = text.IndexOf("]]>", start);
+                int illegal = text.IndexOf("]]>", start, StringComparison.Ordinal);
                 if (illegal < 0)
                     break;
                 writer.WriteCData(text.Substring(start, illegal - start + 2));
@@ -410,7 +410,7 @@ public NodeFilter(string xpath)
                 int lbrack = xpath.IndexOf('[');
                 if (lbrack >= 0)
                 {
-                    if (!xpath.EndsWith("]"))
+                    if (!xpath.EndsWith("]", StringComparison.Ordinal))
                         throw new ArgumentException("Invalid property expression", nameof(xpath));
 
                     _nodeName = xpath.Substring(0, lbrack);
diff --git a/src/NUnitFramework/framework/Internal/Builders/NUnitTestCaseBuilder.cs b/src/NUnitFramework/framework/Internal/Builders/NUnitTestCaseBuilder.cs
@@ -87,7 +87,7 @@ public TestMethod BuildTestMethod(IMethodInfo method, Test? parentSuite, TestCas
                     if (parms.TestName != null)
                     {
                         // The test is simply for efficiency
-                        testMethod.Name = parms.TestName.Contains("{")
+                        testMethod.Name = parms.TestName.IndexOf('{') >= 0
                             ? new TestNameGenerator(parms.TestName).GetDisplayName(testMethod, parms.OriginalArguments)
                             : parms.TestName;
                     }
diff --git a/src/NUnitFramework/framework/Internal/Builders/NamespaceTreeBuilder.cs b/src/NUnitFramework/framework/Internal/Builders/NamespaceTreeBuilder.cs
@@ -123,7 +123,7 @@ private TestSuite GetNamespaceSuite( string ns )
                 return _namespaceIndex[ns];
 
             TestSuite suite;
-            int index = ns.LastIndexOf(".");
+            int index = ns.LastIndexOf('.');
 
             if( index == -1 )
             {
diff --git a/src/NUnitFramework/framework/Internal/Reflect.cs b/src/NUnitFramework/framework/Internal/Reflect.cs
@@ -178,7 +178,7 @@ internal static bool CanImplicitlyConvertTo(this Type? from, Type to)
             if (from == null)
             {
                 // Look for the marker that indicates from was null
-                return to.GetTypeInfo().IsClass || to.FullName.StartsWith("System.Nullable");
+                return to.GetTypeInfo().IsClass || to.FullName.StartsWith("System.Nullable", StringComparison.Ordinal);
             }
 
             if (convertibleValueTypes.ContainsKey(to) && convertibleValueTypes[to].Contains(from))
diff --git a/src/NUnitFramework/nunitlite/CommandLineOptions.cs b/src/NUnitFramework/nunitlite/CommandLineOptions.cs
@@ -367,7 +367,7 @@ protected virtual void ConfigureOptions(bool allowInputFile)
                     // This can be changed without breaking backwards compatibility with frameworks.
                     foreach (string param in parameters.Split(new[] { ';' }))
                     {
-                        int eq = param.IndexOf("=");
+                        int eq = param.IndexOf('=');
                         if (eq == -1 || eq == param.Length - 1)
                         {
                             ErrorMessages.Add("Invalid format for test parameter. Use NAME=VALUE.");
@@ -459,7 +459,7 @@ protected virtual void ConfigureOptions(bool allowInputFile)
 
         private bool LooksLikeAnOption(string v)
         {
-            return v.StartsWith("-") || v.StartsWith("/") && Path.DirectorySeparatorChar != '/';
+            return v.StartsWith("-", StringComparison.Ordinal) || (v.StartsWith("/", StringComparison.Ordinal) && Path.DirectorySeparatorChar != '/');
         }
 
         private void ResolveOutputSpecification(string value, IList<OutputSpecification> outputSpecifications)
diff --git a/src/NUnitFramework/nunitlite/OutputWriters/NUnit2XmlOutputWriter.cs b/src/NUnitFramework/nunitlite/OutputWriters/NUnit2XmlOutputWriter.cs
@@ -366,7 +366,7 @@ private void WriteCData(string text)
             int start = 0;
             while (true)
             {
-                int illegal = text.IndexOf("]]>", start);
+                int illegal = text.IndexOf("]]>", start, StringComparison.Ordinal);
                 if (illegal < 0)
                     break;
                 xmlWriter.WriteCData(text.Substring(start, illegal - start + 2));
diff --git a/src/NUnitFramework/nunitlite/TextUI.cs b/src/NUnitFramework/nunitlite/TextUI.cs
@@ -266,7 +266,7 @@ public void TestFinished(ITestResult result)
 
                 WriteOutput(result.Output);
 
-                if (!result.Output.EndsWith("\n"))
+                if (!result.Output.EndsWith("\n", StringComparison.Ordinal))
                     Writer.WriteLine();
             }
 
@@ -689,7 +689,7 @@ private void WriteOutput(ColorStyle color, string text)
             Writer.Write(color, text);
 
             _testCreatedOutput = true;
-            _needsNewLine = !text.EndsWith("\n");
+            _needsNewLine = !text.EndsWith("\n", StringComparison.Ordinal);
         }
 
          private static ColorStyle GetColorForResultStatus(string status)
diff --git a/src/NUnitFramework/tests/Internal/DefaultTestAssemblyBuilderTests.cs b/src/NUnitFramework/tests/Internal/DefaultTestAssemblyBuilderTests.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+using NUnit.Framework.Api;
+
+namespace NUnit.Framework.Internal
+{
+    internal class DefaultTestAssemblyBuilderTests
+    {
+        [Test]
+        public void Build_CanBuildTests()
+        {
+            var builder = new DefaultTestAssemblyBuilder();
+            var opts = new Dictionary<string, object>();
+            var asm = Assembly.Load("nunit.testdata");
+
+            var result = builder.Build(asm, opts);
+
+            Assert.That(result.TestCaseCount, Is.GreaterThan(500));
+        }
+
+        [Test]
+        public void Build_CanBuildTestsForCulture([ValueSource(nameof(GetTestedCultures))] string culture)
+        {
+            using var cultureContext = ThreadCultureContext.Capture();
+
+            System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture);
+            Build_CanBuildTests();
+        }
+
+        private static string[] GetTestedCultures() => new[]
+            {
+                "en-US", // US English
+                "th-TH", // Thai
+                "tr-TR"  // Turkish
+            };
+
+        private class ThreadCultureContext : IDisposable
+        {
+            private readonly CultureInfo _culture;
+            private readonly CultureInfo _uiCulture;
+            private bool _disposed = false;
+
+            public ThreadCultureContext(CultureInfo culture, CultureInfo uiCulture)
+            {
+                _culture = culture;
+                _uiCulture = uiCulture;
+            }
+
+            public static ThreadCultureContext Capture()
+                 => new ThreadCultureContext(CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture);
+
+            public void Dispose()
+            {
+                if (!_disposed)
+                {
+                    _disposed = true;
+
+                    System.Threading.Thread.CurrentThread.CurrentCulture = _culture;
+                    System.Threading.Thread.CurrentThread.CurrentUICulture = _culture;
+                }
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private TestSuite Build(Assembly assembly, string assemblyNameOrPath, IDictionar`
`148`	`148`	`if (!string.IsNullOrEmpty(parameters))`
`149`	`149`	`foreach (string param in parameters.Split(new[] { ';' }))`
`150`	`150`	`{`
`151`		`- int eq = param.IndexOf("=");`
	`151`	`+ int eq = param.IndexOf('=');`
`152`	`152`
`153`	`153`	`if (eq > 0 && eq < param.Length - 1)`
`154`	`154`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public CategoryAttribute(string name)`
`67`	`67`	`protected CategoryAttribute()`
`68`	`68`	`{`
`69`	`69`	`this.categoryName = this.GetType().Name;`
`70`		`- if ( categoryName.EndsWith( "Attribute" ) )`
	`70`	`+ if ( categoryName.EndsWith( "Attribute", StringComparison.Ordinal ) )`
`71`	`71`	`categoryName = categoryName.Substring( 0, categoryName.Length - 9 );`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public IEnumerable<TestMethod> BuildFrom(IMethodInfo method, Test? suite)`
`119`	`119`	`public void ApplyToTest(Test test)`
`120`	`120`	`{`
`121`	`121`	`var joinType = _strategy.GetType().Name;`
`122`		`- if (joinType.EndsWith("Strategy"))`
	`122`	`+ if (joinType.EndsWith("Strategy", StringComparison.Ordinal))`
`123`	`123`	`joinType = joinType.Substring(0, joinType.Length - 8);`
`124`	`124`
`125`	`125`	`test.Properties.Set(PropertyNames.JoinType, joinType);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected PropertyAttribute() { }`
`84`	`84`	`protected PropertyAttribute( object propertyValue )`
`85`	`85`	`{`
`86`	`86`	`string propertyName = this.GetType().Name;`
`87`		`- if ( propertyName.EndsWith( "Attribute" ) )`
	`87`	`+ if ( propertyName.EndsWith( "Attribute", StringComparison.Ordinal ) )`
`88`	`88`	`propertyName = propertyName.Substring( 0, propertyName.Length - 9 );`
`89`	`89`	`this.properties.Add(propertyName, propertyValue);`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public override string Description`
`52`	`52`	`get`
`53`	`53`	`{`
`54`	`54`	`var name = predicate.GetMethodInfo().Name;`
`55`		`- return name.StartsWith("<")`
	`55`	`+ return name.StartsWith("<", StringComparison.Ordinal)`
`56`	`56`	`? "value matching lambda expression"`
`57`	`57`	`: "value matching " + name;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ private ICollection OriginalAlgorithm(IEnumerable actual)`
`149`	`149`	`private static bool IsSpecialComparisonType(Type type)`
`150`	`150`	`{`
`151`	`151`	`if (type.IsGenericType)`
`152`		- return type.FullName.StartsWith("System.Collections.Generic.KeyValuePair`2");
	`152`	+ return type.FullName.StartsWith("System.Collections.Generic.KeyValuePair`2", StringComparison.Ordinal);
`153`	`153`	`#pragma warning disable CS0618 // 'Numerics' is only marked as obsolete for public use`
`154`	`154`	`else if (Numerics.IsNumericType(type))`
`155`	`155`	`#pragma warning restore CS0618`
`@@ -257,7 +257,7 @@ private static bool IsHandledSpeciallyByNUnit(Type type)`
`257`	`257`	`{`
`258`	`258`	`foreach (var type in actual.GetType().GetInterfaces())`
`259`	`259`	`{`
`260`		- if (type.FullName.StartsWith("System.Collections.Generic.IEnumerable`1"))
	`260`	+ if (type.FullName.StartsWith("System.Collections.Generic.IEnumerable`1", StringComparison.Ordinal))
`261`	`261`	`{`
`262`	`262`	`#if NET35 \|\| NET40`
`263`	`263`	`return type.GetGenericArguments()[0];`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public TestMethod BuildTestMethod(IMethodInfo method, Test? parentSuite, TestCas`
`87`	`87`	`if (parms.TestName != null)`
`88`	`88`	`{`
`89`	`89`	`// The test is simply for efficiency`
`90`		`- testMethod.Name = parms.TestName.Contains("{")`
	`90`	`+ testMethod.Name = parms.TestName.IndexOf('{') >= 0`
`91`	`91`	`? new TestNameGenerator(parms.TestName).GetDisplayName(testMethod, parms.OriginalArguments)`
`92`	`92`	`: parms.TestName;`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private TestSuite GetNamespaceSuite( string ns )`
`123`	`123`	`return _namespaceIndex[ns];`
`124`	`124`
`125`	`125`	`TestSuite suite;`
`126`		`- int index = ns.LastIndexOf(".");`
	`126`	`+ int index = ns.LastIndexOf('.');`
`127`	`127`
`128`	`128`	`if( index == -1 )`
`129`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ internal static bool CanImplicitlyConvertTo(this Type? from, Type to)`
`178`	`178`	`if (from == null)`
`179`	`179`	`{`
`180`	`180`	`// Look for the marker that indicates from was null`
`181`		`- return to.GetTypeInfo().IsClass \|\| to.FullName.StartsWith("System.Nullable");`
	`181`	`+ return to.GetTypeInfo().IsClass \|\| to.FullName.StartsWith("System.Nullable", StringComparison.Ordinal);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (convertibleValueTypes.ContainsKey(to) && convertibleValueTypes[to].Contains(from))`