Fix unit test failed due to localized culture and line ending (#7779) (#8021)

* Fix unit test failed due to localized culture and line ending (#7779)

Author: lyndaidaii

tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj

@@ -115,6 +115,7 @@
     <Compile Include="Services\CloudBlobCoreFileStorageServiceIntegrationTests.cs" />
     <Compile Include="Services\CorePackageFileServiceFacts.cs" />
     <Compile Include="Services\CorePackageServiceFacts.cs" />
+    <Compile Include="TestUtils\UseInvariantCultureAttribute.cs" />
     <Compile Include="TestUtils\CoreMockExtensions.cs" />
     <Compile Include="TestUtils\PackageServiceUtility.cs" />
     <Compile Include="TestUtils\TestPackage.cs" />

tests/NuGetGallery.Core.Facts/Packaging/PackageMetadataFacts.cs

@@ -3,12 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Threading;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
+using NuGetGallery.TestUtils;
 using Xunit;
 
 namespace NuGetGallery.Packaging
@@ -215,7 +218,8 @@ public void ThrowsWhenInvalidMinClientVersion(bool strict)
 
             // Act & Assert
             var ex = Assert.Throws<ArgumentException>(() => PackageMetadata.FromNuspecReader(nuspec, strict));
-            Assert.Equal("'bad' is not a valid version string.\r\nParameter name: value", ex.Message);
+            Assert.StartsWith("'bad' is not a valid version string.", ex.Message);
+            Assert.Equal("value", ex.ParamName);
         }
 
         [Fact]
@@ -249,6 +253,7 @@ public void ThrowsPackagingExceptionWhenEmptyAndNonEmptyDuplicateMetadataElement
         }
 
         [Fact]
+        [UseInvariantCultureAttribute]
         public void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataElementsDetectedAndParsingIsNotStrict()
         {
             // Arrange
@@ -260,9 +265,10 @@ public void ThrowsForEmptyAndNonEmptyDuplicatesWhenDuplicateMetadataElementsDete
             var ex = Assert.Throws<ArgumentException>(() => PackageMetadata.FromNuspecReader(
                 nuspec,
                 strict: false));
+
             Assert.Equal(
-                "An item with the same key has already been added.",
-                ex.Message);
+               "An item with the same key has already been added.",
+               ex.Message);
         }
 
         [Fact]

tests/NuGetGallery.Core.Facts/TestUtils/UseInvariantCultureAttribute.cs

@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Threading;
+using Xunit.Sdk;
+
+namespace NuGetGallery.TestUtils
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class UseInvariantCultureAttribute : BeforeAfterTestAttribute
+    {
+        private CultureInfo originalUICulture;
+
+        public override void Before(MethodInfo methodUnderTest)
+        {
+            originalUICulture = Thread.CurrentThread.CurrentUICulture;
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
+        }
+
+        public override void After(MethodInfo methodUnderTest)
+        {
+            Thread.CurrentThread.CurrentUICulture = this.originalUICulture;
+        }
+    }
+}

tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs

@@ -838,8 +838,8 @@ public async Task GivenPasswordCredential_ItThrowsArgumentException()
                 var ex = await Assert.ThrowsAsync<ArgumentException>(async () => await _authenticationService.Authenticate(cred));
 
                 // Assert
-                Assert.Equal(
-                    Strings.PasswordCredentialsCannotBeUsedHere + Environment.NewLine + "Parameter name: credential",
+                Assert.StartsWith(
+                    Strings.PasswordCredentialsCannotBeUsedHere,
                     ex.Message);
                 Assert.Equal("credential", ex.ParamName);
             }

tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs

@@ -11,6 +11,7 @@
 using System.Linq.Expressions;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Caching;
@@ -41,7 +42,9 @@
 using NuGetGallery.Security;
 using NuGetGallery.Services;
 using NuGetGallery.Services.Helpers;
+using NuGetGallery.TestUtils;
 using Xunit;
+using Xunit.Sdk;
 
 namespace NuGetGallery
 {
@@ -216,7 +219,7 @@ private static PackagesController CreateController(
                 featureFlagService = new Mock<IFeatureFlagService>();
                 featureFlagService.SetReturnsDefault<bool>(true);
             }
-            
+
             renameService = renameService ?? new Mock<IPackageRenameService>();
             if (deprecationService == null)
             {
@@ -826,8 +829,8 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()
                 var deprecationService = new Mock<IPackageDeprecationService>();
                 var controller = CreateController(
                     GetConfigurationService(),
-                    packageService: packageService, 
-                    indexingService: indexingService, 
+                    packageService: packageService,
+                    indexingService: indexingService,
                     deprecationService: deprecationService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -905,8 +908,8 @@ public async Task GivenAnAbsoluteLatestVersionAndNoLatestSemVer2ItFiltersTheList
                 var deprecationService = new Mock<IPackageDeprecationService>();
                 var controller = CreateController(
                     GetConfigurationService(),
-                    packageService: packageService, 
-                    indexingService: indexingService, 
+                    packageService: packageService,
+                    indexingService: indexingService,
                     deprecationService: deprecationService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1066,8 +1069,8 @@ private async Task<ActionResult> GetResultWithReadMe(string readMeHtml, bool has
                 var fileService = new Mock<IPackageFileService>();
                 var controller = CreateController(
                     GetConfigurationService(),
-                    packageService: packageService, 
-                    indexingService: indexingService, 
+                    packageService: packageService,
+                    indexingService: indexingService,
                     packageFileService: fileService,
                     deprecationService: deprecationService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
@@ -1126,9 +1129,9 @@ public async Task GetsValidationIssues()
 
                 var controller = CreateController(
                     GetConfigurationService(),
-                    packageService: packageService, 
-                    indexingService: indexingService, 
-                    packageFileService: fileService, 
+                    packageService: packageService,
+                    indexingService: indexingService,
+                    packageFileService: fileService,
                     validationService: validationService,
                     deprecationService: deprecationService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
@@ -1803,7 +1806,7 @@ public async Task WhenCacheIsOccupiedGetProperPackageDependent()
 
                 var result = await controller.DisplayPackage(id, version: null);
                 var model = ResultAssert.IsView<DisplayPackageViewModel>(result);
-                
+
                 Assert.Same(pd, model.PackageDependents);
                 packageService
                     .Verify(iup => iup.GetPackageDependents(It.IsAny<string>()), Times.Never());
@@ -1933,7 +1936,7 @@ protected override void Dispose(bool disposing)
 
                 base.Dispose(disposing);
             }
-        
+
             private class TestIssue : ValidationIssue
             {
                 private readonly string _message;
@@ -3809,7 +3812,7 @@ public void UsesProperIconUrl(User currentUser, User owner)
             }
 
 
-            private ActionResult GetDeleteSymbolsResult(User currentUser, User owner, out PackagesController controller, Mock<IIconUrlProvider> iconUrlProvider = null)  
+            private ActionResult GetDeleteSymbolsResult(User currentUser, User owner, out PackagesController controller, Mock<IIconUrlProvider> iconUrlProvider = null)
             {
                 _packageRegistration.Owners.Add(owner);
 
@@ -4327,7 +4330,7 @@ public async Task WhenPackageRegistrationIsLockedReturns403()
                     .Returns(package);
 
                 var controller = CreateController(
-                    GetConfigurationService(), 
+                    GetConfigurationService(),
                     packageService: packageService,
                     packageUpdateService: packageUpdateService);
 
@@ -6027,6 +6030,7 @@ public async Task WillShowViewWithErrorsIfEnsureValidThrowsExceptionMessage(Type
             }
 
             [Fact]
+            [UseInvariantCultureAttribute]
             public async Task WillRejectBrokenZipFiles()
             {
                 // Arrange
@@ -6041,7 +6045,7 @@ public async Task WillRejectBrokenZipFiles()
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;
-
+                
                 Assert.NotNull(result);
                 Assert.Equal("Central Directory corrupt.", (result.Data as JsonValidationMessage[])[0].PlainTextMessage);
             }
@@ -6075,6 +6079,7 @@ public async Task WillShowViewWithErrorsIfPackageIdIsInvalid(string packageId)
             [Theory]
             [InlineData("Contains#Invalid$Characters!@#$%^&*")]
             [InlineData("Contains#Invalid$Characters!@#$%^&*EndsOnValidCharacter")]
+            [UseInvariantCultureAttribute]
             public async Task WillShowViewWithErrorsIfPackageIdIsBreaksParsing(string packageId)
             {
                 // Arrange
@@ -9000,7 +9005,7 @@ public async Task ReturnsProperResponseModelWhenSucceeds()
 
                 readmeService
                     .Setup(rs => rs.GetReadMeHtmlAsync(request, It.IsAny<Encoding>()))
-                    .ReturnsAsync(new RenderedReadMeResult { Content = html } );
+                    .ReturnsAsync(new RenderedReadMeResult { Content = html });
 
                 var result = await controller.PreviewReadMe(request);
 

tests/NuGetGallery.Facts/TestUtils/ContractAssert.cs

@@ -38,17 +38,17 @@ public static void ThrowsArgException(Action act, string paramName, string messa
         {
             var argEx = Assert.Throws<ArgumentException>(() => act());
             Assert.Equal(paramName, argEx.ParamName);
-            Assert.Equal(
-                message + Environment.NewLine + $"Parameter name: {paramName}",
+            Assert.StartsWith(
+                message,
                 argEx.Message);
         }
 
         public static async void ThrowsArgExceptionAsync(Func<Task> act, string paramName, string message = "")
         {
             var argEx = await Assert.ThrowsAsync<ArgumentException>(async () => await act());
             Assert.Equal(paramName, argEx.ParamName);
-            Assert.Equal(
-                message + Environment.NewLine + $"Parameter name: {paramName}",
+            Assert.StartsWith(
+                message,
                 argEx.Message);
         }
     }