Refactor CSharp version 12 (#21)

* Refactor CS12
NetLah · May 31, 2024 · 3a0dda6 · 3a0dda6
1 parent 964d6e1
commit 3a0dda6
Show file tree

Hide file tree

Showing 26 changed files with 108 additions and 125 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,6 +3,8 @@
 # All files
 [*]
 indent_style = space
+spelling_languages = en-us
+spelling_exclusion_path = .\exclusion.dic
 
 # Xml files
 [{*.xml,*.csproj,*.props,*.targets}]

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
     <!-- Embed source files that are not tracked by the source control manager in the PDB -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/NetLah.SpaServices.sln b/NetLah.SpaServices.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.targets = Directory.Build.targets
 		docker-build.ps1 = docker-build.ps1
 		docker-compose.yml = docker-compose.yml
+		exclusion.dic = exclusion.dic
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/exclusion.dic b/exclusion.dic
@@ -0,0 +1,13 @@
+buildtime
+ffff
+fffff
+ffffff
+fffffff
+fffzzz
+healthz
+hsts
+subpath
+testhost
+urls
+yaml
+yyyy
diff --git a/src/Hosting/AppFileVersionParser.cs b/src/Hosting/AppFileVersionParser.cs
@@ -4,10 +4,16 @@
 
 namespace NetLah.Extensions.SpaServices.Hosting;
 
-internal class AppFileVersionParser
+internal partial class AppFileVersionParser
 {
-    private static readonly Regex KeyValueRegex = new("^\\s*(?<key>app|version|buildTime|description)\\s*:(?<value>.{1,100})$",
-        RegexOptions.Compiled | RegexOptions.IgnoreCase);
+#if NET7_0_OR_GREATER
+    private static readonly Regex KeyValueRegex = KeyValueRegexClass();
+
+    [GeneratedRegex("^\\s*(?<key>app|version|buildTime|description)\\s*:(?<value>.{1,100})$", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")]
+    private static partial Regex KeyValueRegexClass();
+#else
+    private static readonly Regex KeyValueRegex = new("^\\s*(?<key>app|version|buildTime|description)\\s*:(?<value>.{1,100})$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+#endif
 
 #pragma warning disable CA1822 // Mark members as static
     public AppFileVersionInfo? Parse(TextReader reader)
@@ -22,8 +28,8 @@ internal class AppFileVersionParser
         {
             if (!string.IsNullOrWhiteSpace(line))
             {
-                if (line.IndexOf(":") is { } index &&
-                    index > 0 &&
+                var index = line.IndexOf(':');
+                if (index > 0 &&
                     KeyValueRegex.Match(line) is { } m &&
                     m.Success)
                 {

diff --git a/src/Hosting/AppFileVersionParserExentions.cs → ...Hosting/AppFileVersionParserExtensions.cs b/src/Hosting/AppFileVersionParserExentions.cs → ...Hosting/AppFileVersionParserExtensions.cs
@@ -1,6 +1,6 @@
 namespace NetLah.Extensions.SpaServices.Hosting;
 
-internal static class AppFileVersionParserExentions
+internal static class AppFileVersionParserExtensions
 {
     public static AppFileVersionInfo? ParseFolder(this AppFileVersionParser parser, string folderName)
     {

diff --git a/src/Hosting/ApplicationInsightsExtensions.cs b/src/Hosting/ApplicationInsightsExtensions.cs
@@ -15,22 +15,22 @@ public static class ApplicationInsightsExtensions
 
     public static WebApplicationBuilder CustomApplicationInsightsTelemetry(this WebApplicationBuilder builder, Func<TokenCredential> tokenCredentialFactory, ILogger? logger = null)
     {
-        bool isDisabled = builder.Configuration.GetValue<bool>("ApplicationInsights:IsDisabled");
+        var isDisabled = builder.Configuration.GetValue<bool>("ApplicationInsights:IsDisabled");
         if (!isDisabled)
         {
             logger ??= _loggerLazy.Value!;
             logger?.LogDebug("ApplicationInsights configured");
             builder.Services.AddApplicationInsightsTelemetry(builder.Configuration);
 
-            string? apiKey = builder.Configuration["ApplicationInsights:AuthenticationApiKey"];
+            var apiKey = builder.Configuration["ApplicationInsights:AuthenticationApiKey"];
             if (!string.IsNullOrEmpty(apiKey))
             {
                 logger?.LogDebug("ApplicationInsights Live Metrics with AuthenticationApiKey");
                 builder.Services.ConfigureTelemetryModule<QuickPulseTelemetryModule>((module, opt) => module.AuthenticationApiKey = apiKey);
             }
             else
             {
-                bool isEnabledLiveMetrics = builder.Configuration.GetValue<bool>("ApplicationInsights:IsEnabledLiveMetrics");
+                var isEnabledLiveMetrics = builder.Configuration.GetValue<bool>("ApplicationInsights:IsEnabledLiveMetrics");
                 if (isEnabledLiveMetrics)
                 {
                     logger?.LogDebug("ApplicationInsights Live Metrics with Azure AD");

diff --git a/src/Hosting/BuildTimeHelper.cs b/src/Hosting/BuildTimeHelper.cs
@@ -7,7 +7,7 @@ internal static class BuildTimeHelper
     public static DateTimeOffset? ParseBuildTime(string? value)
         => !string.IsNullOrEmpty(value) &&
             DateTimeOffset.TryParseExact(value,
-                new string[] {
+                [
                     "yyyy-MM-ddTHH:mm:ss.fffffff", "yyyy-MM-ddTHH:mm:ss.fffffffZ",
                     "yyyy-MM-ddTHH:mm:ss.fff", "yyyy-MM-ddTHH:mm:ss.fffZ",
 
@@ -18,7 +18,7 @@ internal static class BuildTimeHelper
                     "yyyy-MM-ddTHH:mm:ss.ffff", "yyyy-MM-ddTHH:mm:ss.ffffZ",
                     "yyyy-MM-ddTHH:mm:ss.fffff", "yyyy-MM-ddTHH:mm:ss.fffffZ",
                     "yyyy-MM-ddTHH:mm:ss.ffffff", "yyyy-MM-ddTHH:mm:ss.ffffffZ"
-                },
+                ],
                 CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var result) ?
             result :
             null;

diff --git a/src/Hosting/Controllers/GeneralController.cs b/src/Hosting/Controllers/GeneralController.cs
@@ -5,14 +5,9 @@ namespace NetLah.Extensions.SpaServices.Hosting.Controllers;
 //[Route("api/v1/[controller]/[action]")]
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 [ApiExplorerSettings(IgnoreApi = true)]
-public class GeneralController : ControllerBase
+public class GeneralController(IAppInfo appInfo) : ControllerBase
 {
-    private readonly IAppInfo _appInfo;
-
-    public GeneralController(IAppInfo appInfo)
-    {
-        _appInfo = appInfo;
-    }
+    private readonly IAppInfo _appInfo = appInfo;
 
     public string Version() => _appInfo.Version;
 

diff --git a/src/Hosting/DecoratorAndExtensions.cs b/src/Hosting/DecoratorAndExtensions.cs
@@ -7,36 +7,26 @@ public interface IDecorator<out TService>
     TService Instance { get; }
 }
 
-internal class Decorator<TService> : IDecorator<TService>
+internal class Decorator<TService>(TService instance) : IDecorator<TService>
 {
-    public TService Instance { get; }
-
-    public Decorator(TService instance)
-    {
-        Instance = instance;
-    }
+    public TService Instance { get; } = instance;
 }
 
-internal class Decorator<TService, TImplementation> : Decorator<TService>
+internal class Decorator<TService, TImplementation>(TImplementation instance) : Decorator<TService>(instance)
     where TImplementation : class, TService
 {
-    public Decorator(TImplementation instance) : base(instance) { }
 }
 
-internal sealed class DisposableDecorator<TService> : Decorator<TService>, IDisposable
+internal sealed class DisposableDecorator<TService>(TService instance) : Decorator<TService>(instance), IDisposable
 {
-    public DisposableDecorator(TService instance) : base(instance) { }
-
     public void Dispose()
     {
         (Instance as IDisposable)?.Dispose();
     }
 }
 
-internal sealed class AsyncDisposableDecorator<TService> : Decorator<TService>, IAsyncDisposable
+internal sealed class AsyncDisposableDecorator<TService>(TService instance) : Decorator<TService>(instance), IAsyncDisposable
 {
-    public AsyncDisposableDecorator(TService instance) : base(instance) { }
-
     public ValueTask DisposeAsync()
     {
         return Instance is IAsyncDisposable asyncDisposable ? asyncDisposable.DisposeAsync() : ValueTask.CompletedTask;

diff --git a/src/Hosting/InfoCollector.cs b/src/Hosting/InfoCollector.cs
@@ -5,7 +5,7 @@ namespace NetLah.Extensions.SpaServices.Hosting;
 
 public class InfoCollector : IInfoCollector
 {
-    public List<string> Logs { get; } = new List<string>();
+    public List<string> Logs { get; } = [];
 
     public IInfoCollector Add<T>(string key, T value)
     {
@@ -24,8 +24,8 @@ public static IInfoCollector CreateInstance(IWebHostEnvironment env, IAppInfo ap
             .Add("HostFramework", appInfo.HostFrameworkName)
             .Add("HostBuildTime", appInfo.HostBuildTimestampLocal)
             .Add("Environment", env.EnvironmentName)
-            .Add("Timezone", TimeZoneInfo.Local)
-            .Add("TimezoneSG", TimeZoneLocalHelper.GetSingaporeOrCustomTimeZone())
+            .Add("TimeZone", TimeZoneInfo.Local)
+            .Add("TimeZoneSG", TimeZoneLocalHelper.GetSingaporeOrCustomTimeZone())
             .Add("ContentRootPath", env.ContentRootPath)
             .Add("RootPath (PWD)", Directory.GetCurrentDirectory())
             .Add("BaseDirectory", AppDomain.CurrentDomain.BaseDirectory)

diff --git a/src/Hosting/MountSpaStaticFileProvider.cs b/src/Hosting/MountSpaStaticFileProvider.cs
@@ -3,14 +3,9 @@
 
 namespace NetLah.Extensions.SpaServices.Hosting;
 
-internal class MountSpaStaticFileProvider : ISpaStaticFileProvider
+internal class MountSpaStaticFileProvider(IDecorator<ISpaStaticFileProvider> decorator, MountFileProviderOptions options) : ISpaStaticFileProvider
 {
-    public MountSpaStaticFileProvider(IDecorator<ISpaStaticFileProvider> decorator, MountFileProviderOptions options)
-    {
-        FileProvider = decorator.Instance.FileProvider == null
-            ? decorator.Instance.FileProvider
-            : new MountFileProvider(decorator.Instance.FileProvider, options);
-    }
-
-    public IFileProvider? FileProvider { get; }
+    public IFileProvider? FileProvider { get; } = decorator.Instance.FileProvider == null
+        ? decorator.Instance.FileProvider
+        : new MountFileProvider(decorator.Instance.FileProvider, options);
 }
diff --git a/src/Hosting/ResponseHeadersHandler.cs b/src/Hosting/ResponseHeadersHandler.cs
@@ -21,7 +21,7 @@ public ResponseHeadersHandler(ILogger logger, ResponseHeadersOptions responseHea
             .Select(kv => new KeyValuePair<string, StringValues>(kv.Key, new StringValues(kv.Value)))
             .ToList();
 
-        if (!responseHeaders.IsEnabled || !_headers.Any())
+        if (!responseHeaders.IsEnabled || _headers.Count == 0)
         {
             _matchStatusCode = _ => false;
             _matchContentType = _ => false;
@@ -30,9 +30,9 @@ public ResponseHeadersHandler(ILogger logger, ResponseHeadersOptions responseHea
         else
         {
             if (responseHeaders.FilterHttpStatusCode is { } listHttpStatusCode
-                && listHttpStatusCode.Any())
+                && listHttpStatusCode.Count != 0)
             {
-                _statusCodes = listHttpStatusCode.ToHashSet();
+                _statusCodes = [.. listHttpStatusCode];
                 _matchStatusCode = statusCode => _statusCodes.Contains(statusCode);
                 logger.LogInformation("ResponseHeadersHandler StatusCode in list");
             }
@@ -51,7 +51,7 @@ public ResponseHeadersHandler(ILogger logger, ResponseHeadersOptions responseHea
             else
             {
                 _contentTypeHashSet = listContentType.ToHashSet(StringComparer.InvariantCultureIgnoreCase);
-                _contentTypeList = _contentTypeHashSet.ToList();
+                _contentTypeList = [.. _contentTypeHashSet];
 
                 if (responseHeaders.IsContentTypeContainsMatch)
                 {

diff --git a/src/Hosting/ResponseHeadersOptions.cs b/src/Hosting/ResponseHeadersOptions.cs
@@ -8,7 +8,7 @@ public class ResponseHeadersOptions
 
     public bool IsAnyContentType { get; set; } = false;
 
-    public Dictionary<string, string?> Headers { get; set; } = new Dictionary<string, string?>();
+    public Dictionary<string, string?> Headers { get; set; } = [];
 
     public List<string?>? FilterContentType { get; set; }
 

diff --git a/src/Hosting/WebApplicationExtensions.cs b/src/Hosting/WebApplicationExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Builder;
 
 public static class WebApplicationExtensions
 {
-    private static readonly string[] DefaultHttpMethods = new[] { "GET" };
+    private static readonly string[] DefaultHttpMethods = ["GET"];
 
     public static WebApplication UseSpaApp(this WebApplication app, ILogger? logger = null, Action<WebApplication>? action = null)
     {

diff --git a/test/Hosting.Test/AppFileVersionParserTest.cs b/test/Hosting.Test/AppFileVersionParserTest.cs
@@ -23,9 +23,7 @@ public void ParseStreamSuccess()
     {
         var stream = TestHelper.GetEmbeddedResourceStream("public1..version");
 
-#pragma warning disable CS8604 // Possible null reference argument.
-        var appFileVersionInfo = new AppFileVersionParser().ParseStream(stream);
-#pragma warning restore CS8604 // Possible null reference argument.
+        var appFileVersionInfo = new AppFileVersionParser().ParseStream(stream!);
 
         TestHelper.AssertPublic1_Version(appFileVersionInfo);
     }
@@ -34,11 +32,7 @@ public void ParseStreamSuccess()
     public void ParseSuccess2()
     {
         var fileContent = TestHelper.GetEmbeddedTemplateContent("public1..version");
-
-#pragma warning disable CS8604 // Possible null reference argument.
         var appFileVersionInfo = new AppFileVersionParser().Parse(fileContent);
-#pragma warning restore CS8604 // Possible null reference argument.
-
         TestHelper.AssertPublic1_Version(appFileVersionInfo);
     }
 

diff --git a/test/Hosting.Test/BuildTimeHelperTest.cs b/test/Hosting.Test/BuildTimeHelperTest.cs
@@ -2,43 +2,45 @@
 
 public class BuildTimeHelperTest
 {
-    public static IEnumerable<object?[]> DateTimeFormats =>
-        new List<object?[]>
+    public class TestData : TheoryData<string, DateTimeOffset?>
+    {
+        public TestData()
         {
-        new object?[] { "2021-05-08T05:25:59", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.1", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 100, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.1Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 100, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.12", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 120, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.12Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 120, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.123", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 123, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.123Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 123, TimeSpan.Zero) },
-        new object?[] { "2021-05-08T05:25:59.1234", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.4D)) },
-        new object?[] { "2021-05-08T05:25:59.1234Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.4D)) },
-        new object?[] { "2021-05-08T05:25:59.12345", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.45D)) },
-        new object?[] { "2021-05-08T05:25:59.12345Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.45D)) },
-        new object?[] { "2021-05-08T05:25:59.123456", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.456D)) },
-        new object?[] { "2021-05-08T05:25:59.123456Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.456D)) },
-        new object?[] { "2021-05-08T05:25:59.1234567", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.4567D)) },
-        new object?[] { "2021-05-08T05:25:59.1234567Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds( 123.4567D)) },
-        new object?[] { "2021-05-08T05:25:59:1", null },
-        new object?[] { "2021-05-08T05:25:59:1Z", null },
-        new object?[] { "2021-05-08T05:25:59:12", null },
-        new object?[] { "2021-05-08T05:25:59:12Z", null },
-        new object?[] { "2021-05-08T05:25:59:123", null },
-        new object?[] { "2021-05-08T05:25:59:123Z", null },
-        new object?[] { "2021-05-08T05:25:59:1234", null },
-        new object?[] { "2021-05-08T05:25:59:1234Z", null },
-        new object?[] { "2021-05-08T05:25:59:12345", null },
-        new object?[] { "2021-05-08T05:25:59:12345Z", null },
-        new object?[] { "2021-05-08T05:25:59:123456", null },
-        new object?[] { "2021-05-08T05:25:59:123456Z", null },
-        new object?[] { "2021-05-08T05:25:59:1234567", null },
-        new object?[] { "2021-05-08T05:25:59:1234567Z", null },
-        };
+            Add("2021-05-08T05:25:59", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.1", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 100, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.1Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 100, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.12", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 120, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.12Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 120, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.123", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 123, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.123Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, 123, TimeSpan.Zero));
+            Add("2021-05-08T05:25:59.1234", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.4D)));
+            Add("2021-05-08T05:25:59.1234Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.4D)));
+            Add("2021-05-08T05:25:59.12345", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.45D)));
+            Add("2021-05-08T05:25:59.12345Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.45D)));
+            Add("2021-05-08T05:25:59.123456", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.456D)));
+            Add("2021-05-08T05:25:59.123456Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.456D)));
+            Add("2021-05-08T05:25:59.1234567", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.4567D)));
+            Add("2021-05-08T05:25:59.1234567Z", new DateTimeOffset(2021, 5, 8, 5, 25, 59, TimeSpan.Zero).Add(TimeSpan.FromMilliseconds(123.4567D)));
+            Add("2021-05-08T05:25:59:1", null);
+            Add("2021-05-08T05:25:59:1Z", null);
+            Add("2021-05-08T05:25:59:12", null);
+            Add("2021-05-08T05:25:59:12Z", null);
+            Add("2021-05-08T05:25:59:123", null);
+            Add("2021-05-08T05:25:59:123Z", null);
+            Add("2021-05-08T05:25:59:1234", null);
+            Add("2021-05-08T05:25:59:1234Z", null);
+            Add("2021-05-08T05:25:59:12345", null);
+            Add("2021-05-08T05:25:59:12345Z", null);
+            Add("2021-05-08T05:25:59:123456", null);
+            Add("2021-05-08T05:25:59:123456Z", null);
+            Add("2021-05-08T05:25:59:1234567", null);
+            Add("2021-05-08T05:25:59:1234567Z", null);
+        }
+    }
 
     [Theory]
-    [MemberData(nameof(DateTimeFormats))]
+    [ClassData(typeof(TestData))]
     public void ParseDateTimeUtcToDateTimeOffsetSuccess(string value, DateTimeOffset? expected)
     {
         var buildTime = BuildTimeHelper.ParseBuildTime(value);

diff --git a/test/WebApp.Test/BasePagesTest.cs b/test/WebApp.Test/BasePagesTest.cs
@@ -2,12 +2,9 @@
 
 namespace WebApp.Test;
 
-public abstract class BasePagesTest<TEntryPoint> where TEntryPoint : class
+public abstract class BasePagesTest<TEntryPoint>(WebApplicationFactory<TEntryPoint> factory) where TEntryPoint : class
 {
-    protected readonly HttpClient _client;
-
-    protected BasePagesTest(WebApplicationFactory<TEntryPoint> factory)
-        => _client = factory.CreateClientNoAutoRedirect();
+    protected readonly HttpClient _client = factory.CreateClientNoAutoRedirect();
 
     protected Task AssertIndexHtmlNotFoundAsync(string url) => TestHelper.AssertIndexHtmlNotFoundAsync(_client, url);
 

diff --git a/test/WebApp.Test/GeneralControllerTest.cs b/test/WebApp.Test/GeneralControllerTest.cs
@@ -102,8 +102,8 @@ public async Task GeneralSysUrl()
         Assert.Contains("HostFramework: ", content);
         Assert.Contains("HostBuildTime: ", content);
         Assert.Contains("Environment: Testing", content);
-        Assert.Contains("Timezone: ", content);
-        Assert.Contains("TimezoneSG: ", content);
+        Assert.Contains("TimeZone: ", content);
+        Assert.Contains("TimeZoneSG: ", content);
         Assert.Contains("ContentRootPath: ", content);
         Assert.Contains("RootPath (PWD): ", content);
         Assert.Contains("BaseDirectory: ", content);