Fixed variable locale settings when calling string.Format(...)

AutoFixture · Oct 4, 2016 · b9d2423 · b9d2423
1 parent f9fdacc
commit b9d2423
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Src/AutoFixture.NUnit3.UnitTest/Scenario.cs b/Src/AutoFixture.NUnit3.UnitTest/Scenario.cs
@@ -394,31 +394,31 @@ public void AutoDataUsesFixedValuesForTestName()
         {
             var testMethod = GetTestMethod<AutoDataAttribute>(nameof(IntroductoryTest));
             Assert.That(testMethod.Name,
-                Is.EqualTo($@"{nameof(IntroductoryTest)}(auto<Int32>, auto<MyClass>)"));
+                Is.EqualTo(nameof(IntroductoryTest) + "(auto<Int32>, auto<MyClass>)"));
         }
 
         [Test]
         public void AutoDataUsesFixedValuesForTestFullName()
         {
             var testMethod = GetTestMethod<AutoDataAttribute>(nameof(IntroductoryTest));
             Assert.That(testMethod.FullName,
-                Is.EqualTo($@"{typeof(Scenario).FullName}.{nameof(IntroductoryTest)}(auto<Int32>, auto<MyClass>)"));
+                Is.EqualTo(typeof(Scenario).FullName + "." + nameof(IntroductoryTest) + "(auto<Int32>, auto<MyClass>)"));
         }
 
         [Test]
         public void InlineAutoDataUsesFixedValuesForTestName()
         {
             var testMethod = GetTestMethod<InlineAutoDataAttribute>(nameof(InlineAutoDataProvidesParameterValuesWhenMissing));
             Assert.That(testMethod.Name,
-                Is.EqualTo($@"{nameof(InlineAutoDataProvidesParameterValuesWhenMissing)}(""alpha"", ""beta"", auto<String>)"));
+                Is.EqualTo(nameof(InlineAutoDataProvidesParameterValuesWhenMissing) + @"(""alpha"", ""beta"", auto<String>)"));
         }
 
         [Test]
         public void InlineAutoDataUsesFixedValuesForTestFullName()
         {
             var testMethod = GetTestMethod<InlineAutoDataAttribute>(nameof(InlineAutoDataProvidesParameterValuesWhenMissing));
             Assert.That(testMethod.FullName,
-                Is.EqualTo($@"{typeof(Scenario).FullName}.{nameof(InlineAutoDataProvidesParameterValuesWhenMissing)}(""alpha"", ""beta"", auto<String>)"));
+                Is.EqualTo(typeof(Scenario).FullName + "." + nameof(InlineAutoDataProvidesParameterValuesWhenMissing) + @"(""alpha"", ""beta"", auto<String>)"));
         }
 
         private TestMethod GetTestMethod<TAttribute>(string testName) where TAttribute : Attribute, NUnit.Framework.Interfaces.ITestBuilder

diff --git a/Src/AutoFixture.NUnit3/AutoDataAttribute.cs b/Src/AutoFixture.NUnit3/AutoDataAttribute.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework.Internal;
 using NUnit.Framework.Internal.Builders;
 using Ploeh.AutoFixture.Kernel;
+using System.Globalization;
 
 namespace Ploeh.AutoFixture.NUnit3
 {
@@ -67,9 +68,9 @@ private TestCaseParameters GetParametersForMethod(IMethodInfo method)
                 var parameters = method.GetParameters();
 
                 var parameterValues = this.GetParameterValues(parameters);
-                var invariantParameterValuesAsString = BuildInvariantParametersAsString(parameters);
+                var invariantTestName = string.Format(CultureInfo.CurrentCulture, "{{m}}({0})", BuildInvariantParametersAsString(parameters));
 
-                return new TestCaseParameters(parameterValues.ToArray()) { TestName = $"{{m}}({invariantParameterValuesAsString})" };
+                return new TestCaseParameters(parameterValues.ToArray()) { TestName = invariantTestName };
             }
             catch (Exception ex)
             {

diff --git a/Src/AutoFixture.NUnit3/InlineAutoDataAttribute.cs b/Src/AutoFixture.NUnit3/InlineAutoDataAttribute.cs
@@ -5,6 +5,7 @@
 using NUnit.Framework.Internal;
 using NUnit.Framework.Internal.Builders;
 using Ploeh.AutoFixture.Kernel;
+using System.Globalization;
 
 namespace Ploeh.AutoFixture.NUnit3
 {
@@ -81,9 +82,9 @@ private TestCaseParameters GetParametersForMethod(IMethodInfo method)
                 var parameters = method.GetParameters();
 
                 var parameterValues = this.GetParameterValues(parameters);
-                var invariantParameterValuesAsString = BuildInvariantParametersAsString(parameters);
+                var invariantTestName = string.Format(CultureInfo.CurrentCulture, "{{m}}({0})", BuildInvariantParametersAsString(parameters));
 
-                return new TestCaseParameters(parameterValues.ToArray()) { TestName = $"{{m}}({invariantParameterValuesAsString})" };
+                return new TestCaseParameters(parameterValues.ToArray()) { TestName = invariantTestName };
             }
             catch (Exception ex)
             {