diff --git a/Directory.Packages.props b/Directory.Packages.props index 00b5162..2b310a7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,25 +6,25 @@ - - - - - - - - - + + + + + + + + + - - + + - - - - - - + + + + + + \ No newline at end of file diff --git a/src/RDMG.Core/ConfigureServices.cs b/src/RDMG.Core/ConfigureServices.cs index ba5052a..22bb9ed 100644 --- a/src/RDMG.Core/ConfigureServices.cs +++ b/src/RDMG.Core/ConfigureServices.cs @@ -3,7 +3,7 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Generator; using RDMG.Core.Services; -using System; +using RDMG.Core.Services.Automapper; namespace RDMG.Core; @@ -22,8 +22,7 @@ this IServiceCollection services .AddScoped() .AddScoped(); - services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; } - , AppDomain.CurrentDomain.GetAssemblies()); + services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; }, typeof(DungeonProfile)); return services; } diff --git a/src/RDMG.Infrastructure/ConfigureServices.cs b/src/RDMG.Infrastructure/ConfigureServices.cs index d5825bf..b701770 100644 --- a/src/RDMG.Infrastructure/ConfigureServices.cs +++ b/src/RDMG.Infrastructure/ConfigureServices.cs @@ -12,8 +12,10 @@ using System; using System.IO; using System.Reflection; +using RDMG.Infrastructure.Repository.Automapper; namespace RDMG.Infrastructure; + public static class ConfigureServices { public static IServiceCollection AddInfrastructureServices( @@ -26,10 +28,11 @@ public static IServiceCollection AddInfrastructureServices( services.AddDbContext((sp, options) => { options.UseSqlServer(configuration.GetConnectionString(AppDbContext.Rdmg), - sqlServerOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(typeof(SqlServerContext).GetTypeInfo().Assembly.GetName().Name); - }) + sqlServerOptionsAction: sqlOptions => + { + sqlOptions.MigrationsAssembly(typeof(SqlServerContext).GetTypeInfo().Assembly.GetName() + .Name); + }) .AddInterceptors( ActivatorUtilities.CreateInstance(sp)); }); @@ -44,10 +47,11 @@ public static IServiceCollection AddInfrastructureServices( services.AddDbContext((sp, options) => { options.UseSqlite(connString?.Replace(SqliteContext.HomeToken, home), - sqliteOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(typeof(SqliteContext).GetTypeInfo().Assembly.GetName().Name); - }) + sqliteOptionsAction: sqlOptions => + { + sqlOptions.MigrationsAssembly(typeof(SqliteContext).GetTypeInfo().Assembly.GetName() + .Name); + }) .AddInterceptors( ActivatorUtilities.CreateInstance(sp)); }); @@ -58,7 +62,8 @@ public static IServiceCollection AddInfrastructureServices( break; default: throw new ServiceException( - string.Format(Resources.Error.DbProviderError, configuration.GetConnectionString(AppDbContext.DbProvider))); + string.Format(Resources.Error.DbProviderError, + configuration.GetConnectionString(AppDbContext.DbProvider))); } Configure(services, configuration); @@ -74,6 +79,7 @@ private static void Configure(IServiceCollection services, IConfiguration config .AddScoped() .AddScoped() .AddScoped(); + services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; }, typeof(DungeonProfile)); } public static IServiceCollection AddTestInfrastructureServices(this IServiceCollection services, @@ -83,10 +89,10 @@ public static IServiceCollection AddTestInfrastructureServices(this IServiceColl services.AddDbContext((sp, options) => { options.UseSqlite(connection, - sqliteOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(typeof(SqliteContext).GetTypeInfo().Assembly.GetName().Name); - }) + sqliteOptionsAction: sqlOptions => + { + sqlOptions.MigrationsAssembly(typeof(SqliteContext).GetTypeInfo().Assembly.GetName().Name); + }) .AddInterceptors(ActivatorUtilities.CreateInstance(sp)); }); services.AddScoped(sp => diff --git a/src/RDMG.Web/ConfigureServices.cs b/src/RDMG.Web/ConfigureServices.cs index db68268..b5455b7 100644 --- a/src/RDMG.Web/ConfigureServices.cs +++ b/src/RDMG.Web/ConfigureServices.cs @@ -2,6 +2,7 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Abstractions.Services.Exceptions; using RDMG.Infrastructure.Data; +using RDMG.Web.Automapper; using RDMG.Web.Services; using Serilog; @@ -16,7 +17,7 @@ public static IServiceCollection AddWebServices(this IServiceCollection services services.Configure(options => { // This lambda determines whether user consent for non-essential cookies is needed for a given request. - options.CheckConsentNeeded = _ => true; + options.CheckConsentNeeded = _ => true; options.MinimumSameSitePolicy = SameSiteMode.None; }); services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) @@ -25,7 +26,7 @@ public static IServiceCollection AddWebServices(this IServiceCollection services options.LoginPath = new PathString("/Auth/Login"); options.AccessDeniedPath = new PathString("/Auth/Forbidden/"); }); - + services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; }, typeof(AuthProfile)); services.AddMemoryCache(); services.AddMvc() @@ -56,7 +57,7 @@ public static IHostBuilder AddSerilog(this IHostBuilder host, default: throw new ServiceException( string.Format(Resources.Error.DbProviderError, - configuration.GetConnectionString(AppDbContext.DbProvider))); + configuration.GetConnectionString(AppDbContext.DbProvider))); } return host; diff --git a/src/RDMG.Web/RDMG.Web.csproj b/src/RDMG.Web/RDMG.Web.csproj index aaf7ef1..ba2b9a8 100644 --- a/src/RDMG.Web/RDMG.Web.csproj +++ b/src/RDMG.Web/RDMG.Web.csproj @@ -5,7 +5,7 @@ enable true true - 1.0.2.0 + 1.0.3.0 b2a492d1-90ea-4e42-b3e5-5d962495bef1 diff --git a/src/RDMG.Web/Views/Home/Privacy.cshtml b/src/RDMG.Web/Views/Home/Privacy.cshtml deleted file mode 100644 index bba9b06..0000000 --- a/src/RDMG.Web/Views/Home/Privacy.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Privacy Policy"; -} -

@ViewData["Title"]

- -

Use this page to detail your site's privacy policy.

diff --git a/src/RDMG.Web/Views/Shared/_CookieConsentPartial.cshtml b/src/RDMG.Web/Views/Shared/_CookieConsentPartial.cshtml deleted file mode 100644 index fd744b8..0000000 --- a/src/RDMG.Web/Views/Shared/_CookieConsentPartial.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@using Microsoft.AspNetCore.Http.Features - -@{ - var consentFeature = Context.Features.Get(); - var showBanner = !consentFeature?.CanTrack ?? false; - var cookieString = consentFeature?.CreateConsentCookie(); -} - -@if (showBanner) -{ - - -} \ No newline at end of file diff --git a/src/RDMG.Web/Views/Shared/_Layout.cshtml b/src/RDMG.Web/Views/Shared/_Layout.cshtml index fc44111..f6f98d9 100644 --- a/src/RDMG.Web/Views/Shared/_Layout.cshtml +++ b/src/RDMG.Web/Views/Shared/_Layout.cshtml @@ -1,54 +1,57 @@  - - + + @ViewData["Title"] - RDMG - + -
- -
+ + + +
+
+ @RenderBody() +
+
+ +
- -
- @RenderBody() -
+ © @DateTime.Now.Year @Resources.Common.Copyright - @System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString()
+
-
-
- © @DateTime.Now.Year @Resources.Common.Copyright - @System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString() - @Resources.Common.Privacy -
-
- - + - - @RenderSection("Scripts", required: false) + +@await RenderSectionAsync("Scripts", required: false) diff --git a/src/RDMG.Web/Views/Shared/_Login.cshtml b/src/RDMG.Web/Views/Shared/_Login.cshtml index f83edba..613613f 100644 --- a/src/RDMG.Web/Views/Shared/_Login.cshtml +++ b/src/RDMG.Web/Views/Shared/_Login.cshtml @@ -1,11 +1,12 @@ @using RDMG.Web.Helpers -@if (User?.Identity?.IsAuthenticated == true) +@if (User.Identity?.IsAuthenticated == true) {
  • -
    diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs index f50c4d3..1c64a54 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Xunit; @@ -38,30 +37,26 @@ public async Task CreateDungeonOptionAsync_WithOptionModel_ReturnsNewEntityId() Corridor = false, UserId = 1 }; - using var source = new CancellationTokenSource(); - var token = source.Token; - var result = await _dungeonService.CreateDungeonOptionAsync(optionsModel, token); + + var result = + await _dungeonService.CreateDungeonOptionAsync(optionsModel, TestContext.Current.CancellationToken); result.ShouldBeGreaterThan(0); } [Fact] public async Task AddDungeonAsync_WithDungeonModel_ReturnsNewEntityId() { - using var source = new CancellationTokenSource(); - var token = source.Token; - - var optionsModel = (await _dungeonService.GetAllDungeonOptionsForUserAsync(1, token)).First(); + var optionsModel = + (await _dungeonService.GetAllDungeonOptionsForUserAsync(1, TestContext.Current.CancellationToken)).First(); var dungeon = await _dungeonService.GenerateDungeonAsync(optionsModel); - var result = await _dungeonService.AddDungeonAsync(dungeon, token); + var result = await _dungeonService.AddDungeonAsync(dungeon, TestContext.Current.CancellationToken); result.ShouldBeGreaterThan(1); } [Fact] public async Task CreateOrUpdateDungeonAsync_WithInvalidModel_ReturnsServiceAggregateException() { - using var source = new CancellationTokenSource(); - var token = source.Token; var optionsModel = new DungeonOptionModel { DungeonName = string.Empty, @@ -75,23 +70,21 @@ public async Task CreateOrUpdateDungeonAsync_WithInvalidModel_ReturnsServiceAggr var act = async () => { - await _dungeonService.CreateOrUpdateDungeonAsync(optionsModel, false, 1, token); + await _dungeonService.CreateOrUpdateDungeonAsync(optionsModel, false, 1, + TestContext.Current.CancellationToken); }; var result = await act.ShouldThrowAsync(); result.GetInnerExceptions() - .Select(se => se.Message) - .OrderBy(s => s) - .SequenceEqual(expectedErrors.OrderBy(s => s)) - .ShouldBeTrue(); + .Select(se => se.Message) + .OrderBy(s => s) + .SequenceEqual(expectedErrors.OrderBy(s => s)) + .ShouldBeTrue(); } [Fact] public async Task CreateOrUpdateDungeonAsync_WithValidNewModel_CreateOptionAndReturnsDungeonModel() { - using var source = new CancellationTokenSource(); - var token = source.Token; - var optionsModel = new DungeonOptionModel { DungeonName = "UT Dungeon 2", @@ -111,22 +104,28 @@ public async Task CreateOrUpdateDungeonAsync_WithValidNewModel_CreateOptionAndRe Corridor = false, UserId = 1 }; - var result = await _dungeonService.CreateOrUpdateDungeonAsync(optionsModel, false, 1, token); + var result = + await _dungeonService.CreateOrUpdateDungeonAsync(optionsModel, false, 1, + TestContext.Current.CancellationToken); result.ShouldNotBeNull(); result.RoamingMonsterDescription.ShouldBe(Constants.Empty); } [Fact] - public async Task CreateOrUpdateDungeonAsync_WithValidExistingModel_AddsDungeonToExistingOptionAndReturnsDungeonModel() + public async Task + CreateOrUpdateDungeonAsync_WithValidExistingModel_AddsDungeonToExistingOptionAndReturnsDungeonModel() { - using var source = new CancellationTokenSource(); const int userId = 1; const int levelNumber = 2; - var token = source.Token; - var existingDungeonOption = (await _dungeonService.GetAllDungeonOptionsForUserAsync(userId, token)).First(); - var currentDungeonCount = (await _dungeonService.ListUserDungeonsByNameAsync(existingDungeonOption.DungeonName, userId, token)).Count(); - var result = await _dungeonService.CreateOrUpdateDungeonAsync(existingDungeonOption, true, levelNumber, token); - var newDungeonCount = (await _dungeonService.ListUserDungeonsByNameAsync(existingDungeonOption.DungeonName, userId, token)).Count(); + var existingDungeonOption = + (await _dungeonService.GetAllDungeonOptionsForUserAsync(userId, TestContext.Current.CancellationToken)) + .First(); + var currentDungeonCount = (await _dungeonService.ListUserDungeonsByNameAsync(existingDungeonOption.DungeonName, + userId, TestContext.Current.CancellationToken)).Count(); + var result = await _dungeonService.CreateOrUpdateDungeonAsync(existingDungeonOption, true, levelNumber, + TestContext.Current.CancellationToken); + var newDungeonCount = (await _dungeonService.ListUserDungeonsByNameAsync(existingDungeonOption.DungeonName, + userId, TestContext.Current.CancellationToken)).Count(); result.ShouldNotBeNull(); result.Level.ShouldBe(levelNumber); newDungeonCount.ShouldBeGreaterThan(currentDungeonCount); diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs index b243ddf..6081f82 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Services; using Shouldly; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Xunit; @@ -15,12 +14,10 @@ public class Delete(TestFixture fixture) : IClassFixture public async Task DeleteDungeonOptionAsync_WithValidId_ReturnsTrue() { const int toDeleteId = 1; - using var source = new CancellationTokenSource(); - var token = source.Token; - var result = await _dungeonService.DeleteDungeonOptionAsync(toDeleteId, token); + var result = await _dungeonService.DeleteDungeonOptionAsync(toDeleteId, TestContext.Current.CancellationToken); result.ShouldBeTrue(); - var list = await _dungeonService.GetAllDungeonOptionsAsync(token); + var list = await _dungeonService.GetAllDungeonOptionsAsync(TestContext.Current.CancellationToken); list.Any(o => o.Id == toDeleteId).ShouldBeFalse(); } @@ -28,9 +25,7 @@ public async Task DeleteDungeonOptionAsync_WithValidId_ReturnsTrue() public async Task DeleteDungeonAsync_WithValidId_ReturnsTrue() { const int toDeleteId = 2; - using var source = new CancellationTokenSource(); - var token = source.Token; - var result = await _dungeonService.DeleteDungeonAsync(toDeleteId, token); + var result = await _dungeonService.DeleteDungeonAsync(toDeleteId, TestContext.Current.CancellationToken); result.ShouldBeTrue(); } } \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs index 4acb169..da87f81 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Services; using Shouldly; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Xunit; @@ -14,10 +13,8 @@ public class Get(TestFixture fixture) : IClassFixture [Fact] public async Task GetAllDungeonOptionsAsync_ReturnsDungeonOptionModelList() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int expectedCount = 4; - var result = (await _dungeonService.GetAllDungeonOptionsAsync(token)).ToList(); + var result = (await _dungeonService.GetAllDungeonOptionsAsync(TestContext.Current.CancellationToken)).ToList(); result.ShouldNotBeEmpty(); result.Count.ShouldBe(expectedCount); } @@ -25,20 +22,18 @@ public async Task GetAllDungeonOptionsAsync_ReturnsDungeonOptionModelList() [Fact] public async Task GetAllDungeonOptionsForUserAsync_WithNotExistingUserId_ReturnsEmptyList() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int userId = 3; - var result = await _dungeonService.GetAllDungeonOptionsForUserAsync(userId, token); + var result = + await _dungeonService.GetAllDungeonOptionsForUserAsync(userId, TestContext.Current.CancellationToken); result.ShouldBeEmpty(); } [Fact] public async Task GetDungeonOptionByNameAsync_WithValidName_ReturnsDungeonOptionModel() { - using var source = new CancellationTokenSource(); - var token = source.Token; - var option = (await _dungeonService.GetAllDungeonOptionsAsync(token)).First(); - var result = await _dungeonService.GetDungeonOptionByNameAsync(option.DungeonName, option.UserId, token); + var option = (await _dungeonService.GetAllDungeonOptionsAsync(TestContext.Current.CancellationToken)).First(); + var result = await _dungeonService.GetDungeonOptionByNameAsync(option.DungeonName, option.UserId, + TestContext.Current.CancellationToken); result.ShouldNotBeNull(); result.ShouldBeEquivalentTo(option); } @@ -46,10 +41,8 @@ public async Task GetDungeonOptionByNameAsync_WithValidName_ReturnsDungeonOption [Fact] public async Task GetDungeonAsync_WithValidDungeonId_ReturnsDungeonModel() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int id = 1; - var result = await _dungeonService.GetDungeonAsync(id, token); + var result = await _dungeonService.GetDungeonAsync(id, TestContext.Current.CancellationToken); result.Id.ShouldBe(id); } } \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs index aa419ed..c696105 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Services; using Shouldly; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Xunit; @@ -15,21 +14,20 @@ public class List(TestFixture fixture) : IClassFixture [Fact] public async Task ListUserDungeonsAsync_WithValidUserIdWithDungeons_ReturnsDungeonModelList() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int expectedCount = 2; - var result = await _dungeonService.ListUserDungeonsAsync(UserId, token); + var result = await _dungeonService.ListUserDungeonsAsync(UserId, TestContext.Current.CancellationToken); result.Count().ShouldBe(expectedCount); } [Fact] public async Task ListUserDungeonsByNameAsync_WithValidNameAndUserId_ReturnsDungeonModelList() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int expectedCount = 1; - var dungeonName = (await _dungeonService.GetAllDungeonOptionsAsync(token)).First().DungeonName; - var result = await _dungeonService.ListUserDungeonsByNameAsync(dungeonName, UserId, token); + var dungeonName = (await _dungeonService.GetAllDungeonOptionsAsync(TestContext.Current.CancellationToken)) + .First().DungeonName; + var result = + await _dungeonService.ListUserDungeonsByNameAsync(dungeonName, UserId, + TestContext.Current.CancellationToken); result.Count().ShouldBe(expectedCount); } } \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs index 13c91fa..894a295 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Generator; using Shouldly; -using System.Threading; using System.Threading.Tasks; using Xunit; @@ -14,16 +13,14 @@ public class Update(TestFixture fixture) : IClassFixture [Fact] public async Task UpdateDungeonAsync_WithValidDungeonModel_UpdatesExistingDungeon() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int dungeonId = 4; - var oldDungeon = await _dungeonService.GetDungeonAsync(dungeonId, token); + var oldDungeon = await _dungeonService.GetDungeonAsync(dungeonId, TestContext.Current.CancellationToken); oldDungeon.DungeonTiles = Constants.Empty; oldDungeon.TrapDescription = Constants.Empty; oldDungeon.RoomDescription = Constants.Empty; oldDungeon.RoamingMonsterDescription = Constants.Empty; - await _dungeonService.UpdateDungeonAsync(oldDungeon, token); - var result = await _dungeonService.GetDungeonAsync(dungeonId, token); + await _dungeonService.UpdateDungeonAsync(oldDungeon, TestContext.Current.CancellationToken); + var result = await _dungeonService.GetDungeonAsync(dungeonId, TestContext.Current.CancellationToken); result.ShouldNotBeNull(); result.RoamingMonsterDescription.ShouldBe(Constants.Empty); result.TrapDescription.ShouldBe(Constants.Empty); @@ -34,13 +31,12 @@ public async Task UpdateDungeonAsync_WithValidDungeonModel_UpdatesExistingDungeo [Fact] public async Task RenameDungeonAsync_WithValidOptionIdAndUserId_RenamesExistingDungeon() { - using var source = new CancellationTokenSource(); - var token = source.Token; const int id = 1; const string newName = "New Name"; - var existingOption = await _dungeonService.GetDungeonOptionAsync(id, token); - await _dungeonService.RenameDungeonAsync(existingOption.Id, existingOption.UserId, newName, token); - var renamed = await _dungeonService.GetDungeonOptionAsync(id, token); + var existingOption = await _dungeonService.GetDungeonOptionAsync(id, TestContext.Current.CancellationToken); + await _dungeonService.RenameDungeonAsync(existingOption.Id, existingOption.UserId, newName, + TestContext.Current.CancellationToken); + var renamed = await _dungeonService.GetDungeonOptionAsync(id, TestContext.Current.CancellationToken); renamed.DungeonName.ShouldBe(newName); } } \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs index bb3c8b7..f14fede 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs @@ -2,7 +2,6 @@ using Shouldly; using System.Linq; using Xunit; -using Xunit.Abstractions; namespace RDMG.Core.Tests.GeneratorTests; diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs index 33421bf..4381cde 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs @@ -2,7 +2,6 @@ using Shouldly; using System.Linq; using Xunit; -using Xunit.Abstractions; namespace RDMG.Core.Tests.GeneratorTests; diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs index 04ab45e..4705961 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs @@ -3,7 +3,7 @@ using RDMG.Core.Domain; using System.Collections.Generic; using System.Text; -using Xunit.Abstractions; +using Xunit; namespace RDMG.Core.Tests.GeneratorTests; @@ -13,6 +13,7 @@ public abstract class DungeonTestBase private readonly StringBuilder _stringBuilder = new(); protected readonly IDungeon Dungeon; protected readonly IDungeonNoCorridor DungeonNoCorridor; + protected DungeonTestBase(ITestOutputHelper output) { var env = new TestEnvironment(); @@ -27,6 +28,7 @@ protected void Draw(IEnumerable dungeonTiles) { PrintRow(row); } + _output.WriteLine(" "); } @@ -73,6 +75,7 @@ private void PrintRow(IEnumerable row) break; } } + _output.WriteLine(_stringBuilder.ToString()); _stringBuilder.Clear(); } diff --git a/tests/RDMG.Core.Tests/OptionServiceTests/List.cs b/tests/RDMG.Core.Tests/OptionServiceTests/List.cs index 52cd555..8d7a404 100644 --- a/tests/RDMG.Core.Tests/OptionServiceTests/List.cs +++ b/tests/RDMG.Core.Tests/OptionServiceTests/List.cs @@ -17,18 +17,20 @@ public class List(TestFixture fixture) : IClassFixture [Fact] public async Task ListOptionsAsync_WithNoFilter_ReturnsAllOptions() { - var expectedCount = (await _optionRepository.ListAsync()).Count(); - var result = await _optionService.ListOptionsAsync(); + var expectedCount = + (await _optionRepository.ListAsync(cancellationToken: TestContext.Current.CancellationToken)).Count(); + var result = await _optionService.ListOptionsAsync(cancellationToken: TestContext.Current.CancellationToken); result.Count().ShouldBe(expectedCount); } public static TheoryData GetOptionKeys() { var result = new TheoryData(); - foreach (OptionKey key in Enum.GetValues(typeof(OptionKey))) + foreach (var key in Enum.GetValues()) { result.Add(key); } + return result; } @@ -36,8 +38,8 @@ public static TheoryData GetOptionKeys() [MemberData(nameof(GetOptionKeys), MemberType = typeof(List))] public async Task ListOptionsAsync_WithFilter_ReturnsFilteredOptions(OptionKey filter) { - var expectedCount = (await _optionRepository.ListAsync(filter)).Count(); - var result = await _optionService.ListOptionsAsync(filter); + var expectedCount = (await _optionRepository.ListAsync(filter, TestContext.Current.CancellationToken)).Count(); + var result = await _optionService.ListOptionsAsync(filter, TestContext.Current.CancellationToken); result.Count().ShouldBe(expectedCount); } } \ No newline at end of file diff --git a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj index a675150..e6ff6dc 100644 --- a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj +++ b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj @@ -4,6 +4,7 @@ enable false true + Exe @@ -20,7 +21,7 @@ - +