Code Cleanup
This commit is contained in:
@@ -1,7 +1,3 @@
|
||||
using RpgRoller.Contracts;
|
||||
using RpgRoller.Domain;
|
||||
using RpgRoller.Services;
|
||||
|
||||
namespace RpgRoller.Tests;
|
||||
|
||||
public sealed class ServiceSharedHelperTests
|
||||
@@ -13,7 +9,7 @@ public sealed class ServiceSharedHelperTests
|
||||
var characterId = Guid.NewGuid();
|
||||
var store = new GameStateStore();
|
||||
|
||||
store.CampaignsById[campaignId] = new Campaign
|
||||
store.CampaignsById[campaignId] = new()
|
||||
{
|
||||
Id = campaignId,
|
||||
GmUserId = Guid.NewGuid(),
|
||||
@@ -21,7 +17,7 @@ public sealed class ServiceSharedHelperTests
|
||||
Ruleset = RulesetKind.D6,
|
||||
Version = 1
|
||||
};
|
||||
store.CharactersById[characterId] = new Character
|
||||
store.CharactersById[characterId] = new()
|
||||
{
|
||||
Id = characterId,
|
||||
OwnerUserId = Guid.NewGuid(),
|
||||
@@ -65,7 +61,7 @@ public sealed class ServiceSharedHelperTests
|
||||
var campaignId = Guid.NewGuid();
|
||||
var store = new GameStateStore();
|
||||
|
||||
store.UsersById[adminId] = new UserAccount
|
||||
store.UsersById[adminId] = new()
|
||||
{
|
||||
Id = adminId,
|
||||
Username = "admin",
|
||||
@@ -74,7 +70,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "Admin",
|
||||
Roles = UserRoles.Admin
|
||||
};
|
||||
store.UsersById[gmId] = new UserAccount
|
||||
store.UsersById[gmId] = new()
|
||||
{
|
||||
Id = gmId,
|
||||
Username = "gm",
|
||||
@@ -83,7 +79,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "GM",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.UsersById[playerId] = new UserAccount
|
||||
store.UsersById[playerId] = new()
|
||||
{
|
||||
Id = playerId,
|
||||
Username = "player",
|
||||
@@ -92,7 +88,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "Player",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.UsersById[outsiderId] = new UserAccount
|
||||
store.UsersById[outsiderId] = new()
|
||||
{
|
||||
Id = outsiderId,
|
||||
Username = "outsider",
|
||||
@@ -112,7 +108,7 @@ public sealed class ServiceSharedHelperTests
|
||||
};
|
||||
store.CampaignsById[campaignId] = campaign;
|
||||
var playerCharacterId = Guid.NewGuid();
|
||||
store.CharactersById[playerCharacterId] = new Character
|
||||
store.CharactersById[playerCharacterId] = new()
|
||||
{
|
||||
Id = playerCharacterId,
|
||||
OwnerUserId = playerId,
|
||||
@@ -171,7 +167,7 @@ public sealed class ServiceSharedHelperTests
|
||||
var campaignId = Guid.NewGuid();
|
||||
var store = new GameStateStore();
|
||||
|
||||
store.UsersById[userId] = new UserAccount
|
||||
store.UsersById[userId] = new()
|
||||
{
|
||||
Id = userId,
|
||||
Username = "user",
|
||||
@@ -180,7 +176,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "User",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.UsersById[otherUserId] = new UserAccount
|
||||
store.UsersById[otherUserId] = new()
|
||||
{
|
||||
Id = otherUserId,
|
||||
Username = "other",
|
||||
@@ -189,13 +185,13 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "Other",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.SessionsByToken["valid"] = new UserSession
|
||||
store.SessionsByToken["valid"] = new()
|
||||
{
|
||||
Token = "valid",
|
||||
UserId = userId,
|
||||
CreatedAtUtc = DateTimeOffset.UtcNow
|
||||
};
|
||||
store.CampaignsById[campaignId] = new Campaign
|
||||
store.CampaignsById[campaignId] = new()
|
||||
{
|
||||
Id = campaignId,
|
||||
GmUserId = otherUserId,
|
||||
@@ -267,7 +263,7 @@ public sealed class ServiceSharedHelperTests
|
||||
var rollId = Guid.NewGuid();
|
||||
var store = new GameStateStore();
|
||||
|
||||
store.UsersById[gmId] = new UserAccount
|
||||
store.UsersById[gmId] = new()
|
||||
{
|
||||
Id = gmId,
|
||||
Username = "gm",
|
||||
@@ -276,7 +272,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "GM",
|
||||
Roles = UserRoles.Admin
|
||||
};
|
||||
store.UsersById[ownerId] = new UserAccount
|
||||
store.UsersById[ownerId] = new()
|
||||
{
|
||||
Id = ownerId,
|
||||
Username = "owner",
|
||||
@@ -285,7 +281,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "Owner",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.UsersById[blankOwnerId] = new UserAccount
|
||||
store.UsersById[blankOwnerId] = new()
|
||||
{
|
||||
Id = blankOwnerId,
|
||||
Username = "blank",
|
||||
@@ -294,7 +290,7 @@ public sealed class ServiceSharedHelperTests
|
||||
DisplayName = "",
|
||||
Roles = string.Empty
|
||||
};
|
||||
store.CampaignsById[campaignId] = new Campaign
|
||||
store.CampaignsById[campaignId] = new()
|
||||
{
|
||||
Id = campaignId,
|
||||
GmUserId = gmId,
|
||||
@@ -302,14 +298,14 @@ public sealed class ServiceSharedHelperTests
|
||||
Ruleset = RulesetKind.Rolemaster,
|
||||
Version = 1
|
||||
};
|
||||
store.CharactersById[characterId] = new Character
|
||||
store.CharactersById[characterId] = new()
|
||||
{
|
||||
Id = characterId,
|
||||
OwnerUserId = ownerId,
|
||||
CampaignId = campaignId,
|
||||
Name = "Scout"
|
||||
};
|
||||
store.SkillGroupsById[skillGroupId] = new SkillGroup
|
||||
store.SkillGroupsById[skillGroupId] = new()
|
||||
{
|
||||
Id = skillGroupId,
|
||||
CharacterId = characterId,
|
||||
@@ -319,7 +315,7 @@ public sealed class ServiceSharedHelperTests
|
||||
AllowFumble = false,
|
||||
FumbleRange = 5
|
||||
};
|
||||
store.SkillsById[skillId] = new Skill
|
||||
store.SkillsById[skillId] = new()
|
||||
{
|
||||
Id = skillId,
|
||||
CharacterId = characterId,
|
||||
@@ -384,4 +380,4 @@ public sealed class ServiceSharedHelperTests
|
||||
Assert.Equal("fallback", GameDtoMapper.ResolveOwnerDisplayName(store, blankOwnerId, "fallback"));
|
||||
Assert.Equal("fallback", GameDtoMapper.ResolveOwnerDisplayName(store, Guid.NewGuid(), "fallback"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user