From fe3b5ea4dd35f20a2731319db3413ecd3cccaf1f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 4 Aug 2017 15:14:29 -0700 Subject: [PATCH] Fixup namespaces --- .../LocalizationSampleTest.cs | 1 - .../LocalizationTest.cs | 1 - ...AcceptLanguageHeaderRequestCultureProviderTest.cs | 2 +- .../CookieRequestCultureProviderTest.cs | 2 +- .../CustomRequestCultureProviderTest.cs | 2 +- .../QueryStringRequestCultureProviderTest.cs | 2 +- .../RequestLocalizationOptionsTest.cs | 3 +-- .../LocalizationServiceCollectionExtensionsTest.cs | 4 ++-- .../ResourceManagerStringLocalizerFactoryTest.cs | 1 + .../ResourceManagerStringLocalizerTest.cs | 12 +++--------- test/ResourcesClassLibraryNoAttribute/Model.cs | 3 --- test/ResourcesClassLibraryWithAttribute/Model.cs | 3 --- 12 files changed, 11 insertions(+), 25 deletions(-) diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs index 1adc19cb89..c97859f21b 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs @@ -4,7 +4,6 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Localization.FunctionalTests diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs index cf0717be4e..8c0015da4d 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs @@ -4,7 +4,6 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Localization.FunctionalTests diff --git a/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs index c5c2a7722e..49a40f0a24 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.TestHost; using Xunit; -namespace Microsoft.Extensions.Localization.Tests +namespace Microsoft.Extensions.Localization { public class AcceptLanguageHeaderRequestCultureProviderTest { diff --git a/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs index 316ab69d57..eaa6ab345e 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Net.Http.Headers; using Xunit; -namespace Microsoft.Extensions.Localization.Tests +namespace Microsoft.Extensions.Localization { public class CookieRequestCultureProviderTest { diff --git a/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs index f48f63243c..2cd5cf7177 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.TestHost; using Xunit; -namespace Microsoft.Extensions.Localization.Tests +namespace Microsoft.Extensions.Localization { public class CustomRequestCultureProviderTest { diff --git a/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs index 113d54c90e..9ad34e32e2 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.TestHost; using Xunit; -namespace Microsoft.Extensions.Localization.Tests +namespace Microsoft.Extensions.Localization { public class QueryStringRequestCultureProviderTest { diff --git a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs index d10f6b690f..c74c9704d5 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs @@ -3,11 +3,10 @@ using System; using System.Globalization; -using System.Threading; using Microsoft.AspNetCore.Builder; using Xunit; -namespace Microsoft.AspNetCore.Localization.Tests +namespace Microsoft.AspNetCore.Localization { public class RequestLocalizationOptionsTest : IDisposable { diff --git a/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs index 24ba3c7ad9..dd32fb665f 100644 --- a/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.Extensions.Localization.Test +namespace Microsoft.Extensions.DependencyInjection { public class LocalizationServiceCollectionExtensionsTest { diff --git a/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerFactoryTest.cs b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerFactoryTest.cs index 19a1429e47..017110c43b 100644 --- a/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerFactoryTest.cs +++ b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerFactoryTest.cs @@ -10,6 +10,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; +// This namespace intentionally matches the default assembly namespace. namespace Microsoft.Extensions.Localization.Tests { public class TestResourceManagerStringLocalizerFactory : ResourceManagerStringLocalizerFactory diff --git a/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs index ed681114bc..78f0de9439 100644 --- a/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs +++ b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.Extensions.Localization.Tests +namespace Microsoft.Extensions.Localization { public class ResourceManagerStringLocalizerTest { @@ -38,7 +38,7 @@ namespace Microsoft.Extensions.Localization.Tests logger); // Act - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { localizer1.GetAllStrings().ToList(); localizer2.GetAllStrings().ToList(); @@ -229,13 +229,7 @@ namespace Microsoft.Extensions.Localization.Tests private TestSink Sink { get; } = new TestSink(); - private ILogger Logger - { - get - { - return new TestLoggerFactory(Sink, true).CreateLogger(); - } - } + private ILogger Logger => new TestLoggerFactory(Sink, enabled: true).CreateLogger(); public class TestResourceManager : ResourceManager { diff --git a/test/ResourcesClassLibraryNoAttribute/Model.cs b/test/ResourcesClassLibraryNoAttribute/Model.cs index dc85c2440c..9921388c89 100644 --- a/test/ResourcesClassLibraryNoAttribute/Model.cs +++ b/test/ResourcesClassLibraryNoAttribute/Model.cs @@ -5,8 +5,5 @@ namespace ResourcesClassLibraryNoAttribute { public class Model { - public Model() - { - } } } diff --git a/test/ResourcesClassLibraryWithAttribute/Model.cs b/test/ResourcesClassLibraryWithAttribute/Model.cs index f0007e0139..c6ca99afa8 100644 --- a/test/ResourcesClassLibraryWithAttribute/Model.cs +++ b/test/ResourcesClassLibraryWithAttribute/Model.cs @@ -5,8 +5,5 @@ namespace ResourcesClassLibraryWithAttribute { public class Model { - public Model() - { - } } }