diff --git a/MainProject.Tests/Utils/ProgramUtils_Tests.cs b/MainProject.Tests/Utils/ProgramUtils_Tests.cs index 4e2ba0d..5970c3c 100644 --- a/MainProject.Tests/Utils/ProgramUtils_Tests.cs +++ b/MainProject.Tests/Utils/ProgramUtils_Tests.cs @@ -21,7 +21,7 @@ namespace BasicDotnetTemplate.MainProject.Tests; public class ProgramUtils_Tests { [TestMethod] - public void IstantiateAppSettingsOpenApi_NoOpenApiConfig_Valid() + public void NoOpenApiConfig_Valid() { try { @@ -57,7 +57,7 @@ public class ProgramUtils_Tests } [TestMethod] - public void IstantiateAppSettingsOpenApi_OpenApiConfig_NotNull() + public void OpenApiConfig_NotNull() { try { @@ -73,8 +73,8 @@ public class ProgramUtils_Tests }; WebApplicationBuilder builder = WebApplication.CreateBuilder(Array.Empty()); - AppSettings realAppSettings = ProgramUtils.AddConfiguration(ref builder, "D:\\Users\\Simona\\Documents\\Projects\\BasicDotnetTemplate\\MainProject.Tests\\JsonData", "completeAppSettings.json"); - OpenApiInfo realOpenApiInfo = ProgramUtils.CreateOpenApiInfo(realAppSettings); + AppSettings appSettings = ProgramUtils.AddConfiguration(ref builder, "D:\\Users\\Simona\\Documents\\Projects\\BasicDotnetTemplate\\MainProject.Tests\\JsonData", "completeAppSettings.json"); + OpenApiInfo realOpenApiInfo = ProgramUtils.CreateOpenApiInfo(appSettings); var areEquals = expectedOpenApiInfo.Title == realOpenApiInfo.Title && expectedOpenApiInfo.Description == realOpenApiInfo.Description && @@ -92,6 +92,30 @@ public class ProgramUtils_Tests } } + [TestMethod] + public void AddOpenApi_Valid() + { + try + { + WebApplicationBuilder builder = WebApplication.CreateBuilder(Array.Empty()); + AppSettings appSettings = ProgramUtils.AddConfiguration(ref builder, "D:\\Users\\Simona\\Documents\\Projects\\BasicDotnetTemplate\\MainProject.Tests\\JsonData"); + ProgramUtils.AddOpenApi(ref builder, appSettings); + AppSettings _appSettings = new AppSettings(); + builder.Configuration.GetSection("AppSettings").Bind(_appSettings); + var areEquals = appSettings.OpenApiSettings?.OpenApiContact?.Name == _appSettings.OpenApiSettings?.OpenApiContact?.Name && + appSettings.OpenApiSettings?.OpenApiContact?.Url == _appSettings.OpenApiSettings?.OpenApiContact?.Url && + appSettings.OpenApiSettings?.OpenApiLicense?.Name == _appSettings.OpenApiSettings?.OpenApiLicense?.Name && + appSettings.OpenApiSettings?.OpenApiLicense?.Url == _appSettings.OpenApiSettings?.OpenApiLicense?.Url && + appSettings.OpenApiSettings?.TermsOfServiceUrl == _appSettings.OpenApiSettings?.TermsOfServiceUrl; + Assert.IsTrue(areEquals); + } + catch (Exception ex) + { + Console.WriteLine(ex.InnerException); + Assert.Fail($"An exception was thrown: {ex.Message}"); + } + } + } diff --git a/MainProject/Utils/ProgramUtils.cs b/MainProject/Utils/ProgramUtils.cs index d2bc078..4d35c56 100644 --- a/MainProject/Utils/ProgramUtils.cs +++ b/MainProject/Utils/ProgramUtils.cs @@ -28,13 +28,13 @@ public static class ProgramUtils PrivateSettings privateSettings = new PrivateSettings(); _configuration.GetSection("PrivateSettings").Bind(privateSettings); - builder.Services.Configure(_configuration.GetSection("AppSettings")); - builder.Services.Configure(_configuration.GetSection("PrivateSettings")); - AppSettings appSettings = new AppSettings(); appSettings.PrivateSettings = privateSettings; _configuration.GetSection("AppSettings").Bind(appSettings); + builder.Services.Configure(_configuration.GetSection("AppSettings")); + builder.Services.Configure(_configuration.GetSection("PrivateSettings")); + Logger.Info("[ProgramUtils][AddConfiguration] Ended configuration"); return appSettings;