Skip to content

Commit 25d5a6d

Browse files
committed
Fix failing tests
1 parent c6e3e20 commit 25d5a6d

File tree

4 files changed

+26
-8
lines changed

4 files changed

+26
-8
lines changed

ImperatorToCK3.UnitTests/CK3/Characters/CharacterCollectionTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,14 @@ public void ImperatorCountriesGoldCanBeDistributedAmongRulerAndVassals() {
273273
ruler_term={ character=1000 start_date=440.10.1 }
274274
");
275275
var country = Country.Parse(countryReader, 589);
276+
277+
imperatorWorld.Provinces[1].OwnerCountry = country;
278+
imperatorWorld.Provinces[2].OwnerCountry = country;
279+
imperatorWorld.Provinces[3].OwnerCountry = country;
280+
imperatorWorld.Provinces[4].OwnerCountry = country;
281+
imperatorWorld.Provinces[5].OwnerCountry = country;
282+
imperatorWorld.Provinces[6].OwnerCountry = country;
283+
276284
Assert.Equal(200, country.Currencies.Gold);
277285
imperatorWorld.Countries.Add(country);
278286
imperatorWorld.Characters.LinkCountries(imperatorWorld.Countries);

ImperatorToCK3.UnitTests/CK3/Titles/LandedTitlesTests.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,22 +235,33 @@ public void GovernorshipsCanBeRecognizedAsCountyLevel() {
235235
var config = new Configuration { ImperatorPath = "TestFiles/LandedTitlesTests/Imperator" };
236236
var imperatorWorld = new TestImperatorWorld(config);
237237

238-
imperatorWorld.Provinces.Add(new Province(1));
239-
imperatorWorld.Provinces.Add(new Province(2));
240-
imperatorWorld.Provinces.Add(new Province(3));
238+
var irProv1 = new Province(1);
239+
var irProv2 = new Province(2);
240+
var irProv3 = new Province(3);
241+
imperatorWorld.Provinces.Add(irProv1);
242+
imperatorWorld.Provinces.Add(irProv2);
243+
imperatorWorld.Provinces.Add(irProv3);
241244

242245
var governor = new ImperatorToCK3.Imperator.Characters.Character(25212);
243246
imperatorWorld.Characters.Add(governor);
244247

245248
var countryReader = new BufferedReader("tag=PRY capital=1");
246249
var country = Country.Parse(countryReader, 589);
250+
irProv1.OwnerCountry = country;
251+
irProv2.OwnerCountry = country;
252+
irProv3.OwnerCountry = country;
253+
country.RegisterProvince(irProv1);
254+
country.RegisterProvince(irProv2);
255+
country.RegisterProvince(irProv3);
247256
imperatorWorld.Countries.Add(country);
248257

249258
imperatorWorld.Areas.LoadAreas(imperatorWorld.ModFS, imperatorWorld.Provinces);
250259
var irRegionMapper = new ImperatorRegionMapper(imperatorWorld.Areas, irMapData);
251260
irRegionMapper.LoadRegions(imperatorWorld.ModFS, new ColorFactory());
252261
Assert.True(irRegionMapper.RegionNameIsValid("galatia_area"));
253262
Assert.True(irRegionMapper.RegionNameIsValid("galatia_region"));
263+
Assert.True(irRegionMapper.ProvinceIsInRegion(2, "galatia_region"));
264+
Assert.True(irRegionMapper.ProvinceIsInRegion(3, "galatia_region"));
254265
var ck3RegionMapper = new CK3RegionMapper();
255266

256267
var reader = new BufferedReader(
@@ -335,14 +346,14 @@ public void GovernorshipsCanBeRecognizedAsCountyLevel() {
335346
title => Assert.Equal("d_IRTOCK3_PRY", title.Id)
336347
);
337348

338-
var provinces = new ProvinceCollection(ck3ModFS);
349+
var ck3Provinces = new ProvinceCollection(ck3ModFS);
339350
var ck3MapData = new MapData(ck3ModFS);
340351
ck3MapData.ProvinceDefinitions.Add(new(1));
341352
ck3MapData.ProvinceDefinitions.Add(new(2));
342353
ck3MapData.ProvinceDefinitions.Add(new(3));
343-
provinces.ImportImperatorProvinces(imperatorWorld, ck3MapData, titles, cultureMapper, religionMapper, provinceMapper, conversionDate, config);
354+
ck3Provinces.ImportImperatorProvinces(imperatorWorld, ck3MapData, titles, cultureMapper, religionMapper, provinceMapper, conversionDate, config);
344355
// Country 589 is imported as duchy-level title, so its governorship of galatia_region will be county level.
345-
titles.ImportImperatorGovernorships(imperatorWorld, provinces, tagTitleMapper, irLocDB, ck3LocDB, config, provinceMapper, definiteFormMapper, irRegionMapper, coaMapper, countyLevelGovernorships);
356+
titles.ImportImperatorGovernorships(imperatorWorld, ck3Provinces, tagTitleMapper, irLocDB, ck3LocDB, config, provinceMapper, definiteFormMapper, irRegionMapper, coaMapper, countyLevelGovernorships);
346357

347358
Assert.Collection(titles,
348359
title => Assert.Equal("c_county1", title.Id),

ImperatorToCK3/Configuration.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using ImperatorToCK3.CommonUtils;
77
using System;
88
using System.Collections.Generic;
9-
using System.Globalization;
109
using System.IO;
1110
using System.Linq;
1211

ImperatorToCK3/Imperator/Jobs/Governorship.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public int GetIRProvinceCount(ProvinceCollection irProvinces) {
4848
int provinceCount = 0;
4949
foreach (var province in irProvinces) {
5050
if (province.OwnerCountry == Country && Region.ContainsProvince(province.Id)) {
51-
provinceCount++;
51+
++provinceCount;
5252
}
5353
}
5454

0 commit comments

Comments
 (0)