Skip to content

Commit 6895dac

Browse files
SocolinSocolin
committed
Use new notation to define static arrays
1 parent a517a18 commit 6895dac

11 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎backend/tests/Naheulbook.Core.Tests.Unit/Features/Item/ItemTemplateServiceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public async Task SearchItemTemplateAsync_ShouldTryToFindItemsInDatabaseWithMore
250250

251251
var actualItemTemplates = await _service.SearchItemTemplateAsync(filter, 40, null);
252252

253-
actualItemTemplates.Should().BeEquivalentTo(new[] {item1, item2, item3});
253+
actualItemTemplates.Should().BeEquivalentTo([item1, item2, item3]);
254254
}
255255

256256
[Test]

‎backend/tests/Naheulbook.Core.Tests.Unit/Features/Item/ItemTemplateUtilTests.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ public void ApplyChangesFromRequest_UpdateSlotList()
109109

110110
_util.ApplyChangesFromRequest(itemTemplate, request);
111111

112-
itemTemplate.Slots.Should().BeEquivalentTo(new[]
113-
{
112+
itemTemplate.Slots.Should().BeEquivalentTo([
114113
new ItemTemplateSlotEntity
115114
{
116115
SlotId = 2,
@@ -119,7 +118,8 @@ public void ApplyChangesFromRequest_UpdateSlotList()
119118
{
120119
SlotId = 3,
121120
},
122-
});
121+
]
122+
);
123123
}
124124

125125
[Test]
@@ -172,8 +172,7 @@ public void ApplyChangesFromRequest_UpdateRequirements()
172172

173173
_util.ApplyChangesFromRequest(itemTemplate, request);
174174

175-
itemTemplate.Requirements.Should().BeEquivalentTo(new[]
176-
{
175+
itemTemplate.Requirements.Should().BeEquivalentTo([
177176
new ItemTemplateRequirementEntity
178177
{
179178
StatName = "some-stat-name-2",
@@ -186,7 +185,8 @@ public void ApplyChangesFromRequest_UpdateRequirements()
186185
MinValue = 4,
187186
MaxValue = 12,
188187
},
189-
});
188+
]
189+
);
190190
}
191191

192192

@@ -243,8 +243,7 @@ public void ApplyChangesFromRequest_UpdateModifiers()
243243

244244
_util.ApplyChangesFromRequest(itemTemplate, request);
245245

246-
itemTemplate.Modifiers.Should().BeEquivalentTo(new[]
247-
{
246+
itemTemplate.Modifiers.Should().BeEquivalentTo([
248247
new ItemTemplateModifierEntity
249248
{
250249
StatName = "some-stat-name-2",
@@ -261,7 +260,8 @@ public void ApplyChangesFromRequest_UpdateModifiers()
261260
Value = 3,
262261
Special = "some-special-3",
263262
},
264-
});
263+
]
264+
);
265265
}
266266

267267
[Test]
@@ -300,16 +300,16 @@ public void ApplyChangesFromRequest_UpdateSkills()
300300

301301
_util.ApplyChangesFromRequest(itemTemplate, request);
302302

303-
itemTemplate.Skills.Should().BeEquivalentTo(new[]
304-
{
303+
itemTemplate.Skills.Should().BeEquivalentTo([
305304
new ItemTemplateSkillEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000004")},
306305
new ItemTemplateSkillEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000005")},
307-
});
308-
itemTemplate.UnSkills.Should().BeEquivalentTo(new[]
309-
{
306+
]
307+
);
308+
itemTemplate.UnSkills.Should().BeEquivalentTo([
310309
new ItemTemplateSkillEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000006")},
311310
new ItemTemplateSkillEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000007")},
312-
});
311+
]
312+
);
313313
}
314314

315315

@@ -339,11 +339,11 @@ public void ApplyChangesFromRequest_UpdateSkillModifiers()
339339

340340
_util.ApplyChangesFromRequest(itemTemplate, request);
341341

342-
itemTemplate.SkillModifiers.Should().BeEquivalentTo(new[]
343-
{
342+
itemTemplate.SkillModifiers.Should().BeEquivalentTo([
344343
new ItemTemplateSkillModifierEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000004"), Value = 3},
345344
new ItemTemplateSkillModifierEntity {SkillId = new Guid("00000000-0000-0000-0000-000000000005"), Value = 4},
346-
});
345+
]
346+
);
347347
}
348348

349349
[Test]

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/EffectRepositoryTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public async Task CanGetEffectCategories()
2828

2929
var actualEffectCategories = await _effectRepository.GetCategoriesAsync();
3030

31-
AssertEntitiesAreLoaded(actualEffectCategories, new[] {effectCategory});
32-
AssertEntitiesAreLoaded(actualEffectCategories.Single().SubCategories, new[] {effectSubCategory1, effectSubCategory2});
31+
AssertEntitiesAreLoaded(actualEffectCategories, [effectCategory]);
32+
AssertEntitiesAreLoaded(actualEffectCategories.Single().SubCategories, [effectSubCategory1, effectSubCategory2]);
3333
}
3434

3535
#endregion
@@ -48,8 +48,8 @@ public async Task CanGetEffectBySubCategoryWithModifiers()
4848

4949
var actualEffects = await _effectRepository.GetBySubCategoryWithModifiersAsync(effectSubCategory.Id);
5050

51-
AssertEntitiesAreLoaded(actualEffects, new[] {effect});
52-
AssertEntitiesAreLoaded(actualEffects.Single().Modifiers, new[] {effectModifier});
51+
AssertEntitiesAreLoaded(actualEffects, [effect]);
52+
AssertEntitiesAreLoaded(actualEffects.Single().Modifiers, [effectModifier]);
5353
}
5454

5555
#endregion

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/GroupRepositoryTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public async Task GetGroupsOwnedByAsync_ItShouldLoadGroupsWithCharacterList()
3434

3535
var groups = await _repository.GetGroupsOwnedByAsync(user.Id);
3636

37-
AssertEntitiesAreLoaded(groups, new[] {group1, group2});
38-
AssertEntitiesAreLoaded(groups.Single(x => x.Id == group1.Id).Characters, new[] {character1, character2});
39-
AssertEntitiesAreLoaded(groups.Single(x => x.Id == group2.Id).Characters, new[] {character3, character4});
37+
AssertEntitiesAreLoaded(groups, [group1, group2]);
38+
AssertEntitiesAreLoaded(groups.Single(x => x.Id == group1.Id).Characters, [character1, character2]);
39+
AssertEntitiesAreLoaded(groups.Single(x => x.Id == group2.Id).Characters, [character3, character4]);
4040
}
4141

4242
[Test]
@@ -78,17 +78,17 @@ public async Task GetGroupsWithDetailsAsync_ShouldLoadGroupWithAllRequiredData()
7878
var actualGroup = await _repository.GetGroupsWithDetailsAsync(group.Id);
7979

8080
AssertEntityIsLoaded(actualGroup, group);
81-
AssertEntitiesAreLoaded(actualGroup.Characters, new[] {characterInGroup});
82-
AssertEntitiesAreLoaded(actualGroup.Invites, new[] {groupInvite1, groupInvite2});
81+
AssertEntitiesAreLoaded(actualGroup.Characters, [characterInGroup]);
82+
AssertEntitiesAreLoaded(actualGroup.Invites, [groupInvite1, groupInvite2]);
8383
var actualInvitedCharacter1 = actualGroup.Invites.Single(x => x.CharacterId == invitedCharacter1.Id).Character;
8484
AssertEntityIsLoaded(actualInvitedCharacter1, invitedCharacter1);
8585
AssertEntityIsLoaded(actualInvitedCharacter1.Origin, origin);
86-
AssertEntitiesAreLoaded(actualInvitedCharacter1.Jobs, new [] {characterJob1});
86+
AssertEntitiesAreLoaded(actualInvitedCharacter1.Jobs, [characterJob1]);
8787
AssertEntityIsLoaded(actualInvitedCharacter1.Jobs.Single().Job, job);
8888
var actualInvitedCharacter2 = actualGroup.Invites.Single(x => x.CharacterId == invitedCharacter2.Id).Character;
8989
AssertEntityIsLoaded(actualInvitedCharacter2, invitedCharacter2);
9090
AssertEntityIsLoaded(actualInvitedCharacter2.Origin, origin);
91-
AssertEntitiesAreLoaded(actualInvitedCharacter2.Jobs, new [] {characterJob2});
91+
AssertEntitiesAreLoaded(actualInvitedCharacter2.Jobs, [characterJob2]);
9292
AssertEntityIsLoaded(actualInvitedCharacter2.Jobs.Single().Job, job);
9393
}
9494

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/ItemRepository.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public async Task GetWithAllDataAsync_ShouldLoadAllRelatedData()
4444

4545
AssertEntityIsLoaded(actualItem, item);
4646
AssertEntityIsLoaded(actualItem.ItemTemplate, itemTemplate);
47-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Requirements, new[] {itemTemplateRequirement});
48-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Modifiers, new[] {itemTemplateModifier});
49-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Skills, new[] {itemTemplateSkill});
50-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.UnSkills, new[] {itemTemplateUnSkill});
51-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.SkillModifiers, new[] {itemTemplateSkillModifier});
52-
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Slots, new[] {itemTemplateSlot});
47+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Requirements, [itemTemplateRequirement]);
48+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Modifiers, [itemTemplateModifier]);
49+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Skills, [itemTemplateSkill]);
50+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.UnSkills, [itemTemplateUnSkill]);
51+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.SkillModifiers, [itemTemplateSkillModifier]);
52+
AssertEntitiesAreLoaded(actualItem.ItemTemplate.Slots, [itemTemplateSlot]);
5353
AssertEntityIsLoaded(actualItem.ItemTemplate.Slots.Single().Slot, itemSlot);
5454
}
5555

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/ItemTemplateRepositoryTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public async Task GetWithModifiersWithRequirementsWithSkillsWithSkillModifiersWi
3939
var actual = await _itemTemplateRepository.GetWithModifiersWithRequirementsWithSkillsWithSkillModifiersWithSlotsWithUnSkillsAsync(itemTemplate.Id);
4040

4141
AssertEntityIsLoaded(actual, itemTemplate);
42-
AssertEntitiesAreLoaded(actual.Requirements, new[] {itemTemplateRequirement});
43-
AssertEntitiesAreLoaded(actual.Modifiers, new[] {itemTemplateModifier});
44-
AssertEntitiesAreLoaded(actual.Skills, new[] {itemTemplateSkill});
45-
AssertEntitiesAreLoaded(actual.UnSkills, new[] {itemTemplateUnSkill});
46-
AssertEntitiesAreLoaded(actual.SkillModifiers, new[] {itemTemplateSkillModifier});
47-
AssertEntitiesAreLoaded(actual.Slots, new[] {itemTemplateSlot});
42+
AssertEntitiesAreLoaded(actual.Requirements, [itemTemplateRequirement]);
43+
AssertEntitiesAreLoaded(actual.Modifiers, [itemTemplateModifier]);
44+
AssertEntitiesAreLoaded(actual.Skills, [itemTemplateSkill]);
45+
AssertEntitiesAreLoaded(actual.UnSkills, [itemTemplateUnSkill]);
46+
AssertEntitiesAreLoaded(actual.SkillModifiers, [itemTemplateSkillModifier]);
47+
AssertEntitiesAreLoaded(actual.Slots, [itemTemplateSlot]);
4848
AssertEntityIsLoaded(actual.Slots.Single().Slot, itemSlot);
4949
}
5050

@@ -95,16 +95,16 @@ public async Task GetByIdsAsync_LoadRelatedEntities()
9595
.AddItemTemplateSkillModifier(out var itemTemplateSkillModifier, modifiedSkill)
9696
.AddItemTemplateSlot(out var itemTemplateSlot);
9797

98-
var actualEntities = await _itemTemplateRepository.GetByIdsAsync(new[] {itemTemplate.Id});
98+
var actualEntities = await _itemTemplateRepository.GetByIdsAsync([itemTemplate.Id]);
9999

100100
var actualItemTemplate = actualEntities.Single();
101101
AssertEntityIsLoaded(actualItemTemplate, itemTemplate);
102-
AssertEntitiesAreLoaded(actualItemTemplate.Requirements, new[] {itemTemplateRequirement});
103-
AssertEntitiesAreLoaded(actualItemTemplate.Modifiers, new[] {itemTemplateModifier});
104-
AssertEntitiesAreLoaded(actualItemTemplate.Skills, new[] {itemTemplateSkill});
105-
AssertEntitiesAreLoaded(actualItemTemplate.UnSkills, new[] {itemTemplateUnSkill});
106-
AssertEntitiesAreLoaded(actualItemTemplate.SkillModifiers, new[] {itemTemplateSkillModifier});
107-
AssertEntitiesAreLoaded(actualItemTemplate.Slots, new[] {itemTemplateSlot});
102+
AssertEntitiesAreLoaded(actualItemTemplate.Requirements, [itemTemplateRequirement]);
103+
AssertEntitiesAreLoaded(actualItemTemplate.Modifiers, [itemTemplateModifier]);
104+
AssertEntitiesAreLoaded(actualItemTemplate.Skills, [itemTemplateSkill]);
105+
AssertEntitiesAreLoaded(actualItemTemplate.UnSkills, [itemTemplateUnSkill]);
106+
AssertEntitiesAreLoaded(actualItemTemplate.SkillModifiers, [itemTemplateSkillModifier]);
107+
AssertEntitiesAreLoaded(actualItemTemplate.Slots, [itemTemplateSlot]);
108108
AssertEntityIsLoaded(actualItemTemplate.Slots.Single().Slot, itemSlot);
109109
}
110110

@@ -118,9 +118,9 @@ public async Task GetByIdsAsync_LoadAllEntitiesMatchingGivenIds()
118118
.AddItemTemplate(out var itemTemplate2)
119119
.AddItemTemplate();
120120

121-
var actualEntities = await _itemTemplateRepository.GetByIdsAsync(new[] {itemTemplate1.Id, itemTemplate2.Id});
121+
var actualEntities = await _itemTemplateRepository.GetByIdsAsync([itemTemplate1.Id, itemTemplate2.Id]);
122122

123-
AssertEntitiesAreLoaded(actualEntities, new[] {itemTemplate1, itemTemplate2});
123+
AssertEntitiesAreLoaded(actualEntities, [itemTemplate1, itemTemplate2]);
124124
}
125125

126126
#endregion

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/JobRepositoryTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public async Task CanGetAllWithAllData()
3232

3333
var actualJobs = await _jobRepository.GetAllWithAllDataAsync();
3434

35-
AssertEntitiesAreLoaded(actualJobs, new[] {job});
35+
AssertEntitiesAreLoaded(actualJobs, [job]);
3636
var actualJob = actualJobs.Single();
37-
AssertEntitiesAreLoaded(actualJob.Bonuses, new[] {jobBonus});
38-
AssertEntitiesAreLoaded(actualJob.Requirements, new[] {jobRequirement});
39-
AssertEntitiesAreLoaded(actualJob.Restrictions, new[] {jobRestriction});
40-
AssertEntitiesAreLoaded(actualJob.Skills, new[] {jobSkill1, jobSkill2});
37+
AssertEntitiesAreLoaded(actualJob.Bonuses, [jobBonus]);
38+
AssertEntitiesAreLoaded(actualJob.Requirements, [jobRequirement]);
39+
AssertEntitiesAreLoaded(actualJob.Restrictions, [jobRestriction]);
40+
AssertEntitiesAreLoaded(actualJob.Skills, [jobSkill1, jobSkill2]);
4141
AssertEntityIsLoaded(actualJob.Skills.Single(x => x.SkillId == jobSkill1.SkillId), jobSkill1);
4242
AssertEntityIsLoaded(actualJob.Skills.Single(x => x.SkillId == jobSkill2.SkillId), jobSkill2);
43-
AssertEntitiesAreLoaded(actualJob.Specialities, new[] {speciality});
43+
AssertEntitiesAreLoaded(actualJob.Specialities, [speciality]);
4444
}
4545
}

‎backend/tests/Naheulbook.Data.Tests.Integration/Repositories/UserRepositoryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public async Task SearchUser_ShouldReturnsMatchingUsers()
6565

6666
var actualEntities = await _userRepository.SearchUsersAsync(user.DisplayName!);
6767

68-
AssertEntitiesAreLoaded(actualEntities, new[] {user});
68+
AssertEntitiesAreLoaded(actualEntities, [user]);
6969
}
7070

7171
[Test]

‎backend/tests/Naheulbook.Tests.Functional/Code/SpecificSteps/MapStep.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public void GivenXMapWithAllData(string amount)
2222
for (var i = 0; i < StepArgumentUtil.ParseQuantity(amount); i++)
2323
testDataUtil.AddMap(x =>
2424
{
25-
x.Layers = new[]
26-
{
25+
x.Layers =
26+
[
2727
new MapLayerEntity
2828
{
2929
Name = "some-layer-name",
@@ -48,7 +48,7 @@ public void GivenXMapWithAllData(string amount)
4848
},
4949
},
5050
},
51-
};
51+
];
5252
});
5353
}
5454

@@ -58,8 +58,8 @@ public void GivenXMapWithAMarker(string amount)
5858
for (var i = 0; i < StepArgumentUtil.ParseQuantity(amount); i++)
5959
testDataUtil.AddMap(x =>
6060
{
61-
x.Layers = new[]
62-
{
61+
x.Layers =
62+
[
6363
new MapLayerEntity
6464
{
6565
Name = "some-layer-name",
@@ -77,7 +77,7 @@ public void GivenXMapWithAMarker(string amount)
7777
},
7878
},
7979
},
80-
};
80+
];
8181
});
8282
}
8383

@@ -87,14 +87,14 @@ public void GivenXMapWithALayer(string amount)
8787
for (var i = 0; i < StepArgumentUtil.ParseQuantity(amount); i++)
8888
testDataUtil.AddMap(x =>
8989
{
90-
x.Layers = new[]
91-
{
90+
x.Layers =
91+
[
9292
new MapLayerEntity
9393
{
9494
Name = "some-layer-name",
9595
Source = "official",
9696
},
97-
};
97+
];
9898
});
9999
}
100100
}

‎backend/tests/Naheulbook.Tests.Functional/Code/Transforms/JTokenTransform.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public JToken ReplaceJToken(string input)
2929
}
3030
catch (JsonReaderException ex)
3131
{
32-
var splitJson = expandedJson.Split(new[] {'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries);
32+
var splitJson = expandedJson.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
3333

3434
var showErrorOutput = new StringBuilder();
3535
var contextSize = 3;

0 commit comments

Comments
 (0)