Unit tests for the DoctrineCategory class (#2725)

Author: IhateTrains

ImperatorToCK3.UnitTests/CK3/Religions/DoctrineCategoryTests.cs

@@ -0,0 +1,50 @@
+using ImperatorToCK3.CK3.Religions;
+using commonItems;
+using System.Collections.Generic;
+using Xunit;
+
+namespace ImperatorToCK3.UnitTests.CK3.Religions;
+
+public class DoctrineCategoryTests {
+	[Fact]
+	public void Constructor_SetsId() {
+		var reader = new BufferedReader("");
+		var category = new DoctrineCategory("test_id", reader);
+		Assert.Equal("test_id", category.Id);
+	}
+
+	[Fact]
+	public void Constructor_ParsesGroupId() {
+		var reader = new BufferedReader("group = test_group");
+		var category = new DoctrineCategory("cat", reader);
+		Assert.Equal("test_group", category.GroupId);
+	}
+
+	[Fact]
+	public void Constructor_ParsesNumberOfPicks() {
+		var reader = new BufferedReader("number_of_picks = 3");
+		var category = new DoctrineCategory("cat", reader);
+		Assert.Equal(3, category.NumberOfPicks);
+	}
+
+	[Fact]
+	public void Constructor_DefaultsNumberOfPicksTo1() {
+		var reader = new BufferedReader("");
+		var category = new DoctrineCategory("cat", reader);
+		Assert.Equal(1, category.NumberOfPicks);
+	}
+
+	[Fact]
+	public void Constructor_ParsesDoctrineIds() {
+		var reader = new BufferedReader("doctrine1={} doctrine2={} doctrine3={}");
+		var category = new DoctrineCategory("cat", reader);
+		Assert.Equal(["doctrine1", "doctrine2", "doctrine3"], category.DoctrineIds);
+	}
+
+	[Fact]
+	public void DoctrineIds_IsReadOnly() {
+		var reader = new BufferedReader("doctrine1");
+		var category = new DoctrineCategory("cat", reader);
+		Assert.IsType<IReadOnlyCollection<string>>(category.DoctrineIds, exactMatch: false);
+	}
+}

ImperatorToCK3/CK3/Characters/Character.cs

@@ -96,9 +96,9 @@ public string GetAgeSex(Date date) {
 	public Date BirthDate {
 		get => History.Fields["birth"].DateToEntriesDict.AsValueEnumerable().First().Key;
 		set {
-			var field = History.Fields["birth"];
-			field.RemoveAllEntries();
-			field.AddEntryToHistory(value, "birth", true);
+			var historyField = History.Fields["birth"];
+			historyField.RemoveAllEntries();
+			historyField.AddEntryToHistory(value, "birth", true);
 		}
 	}
 
@@ -108,10 +108,10 @@ public Date? DeathDate {
 			return entriesDict.Count == 0 ? null : entriesDict.AsValueEnumerable().First().Key;
 		}
 		set {
-			var field = History.Fields["death"];
-			field.RemoveAllEntries();
+			var historyField = History.Fields["death"];
+			historyField.RemoveAllEntries();
 			if (value is not null) {
-				field.AddEntryToHistory(value, "death", true);
+				historyField.AddEntryToHistory(value, "death", true);
 			}
 		}
 	}
@@ -596,8 +596,8 @@ public void UpdateChildrenCacheOfParents() {
 
 	public string? MotherId {
 		get {
-			var field = History.Fields["mother"];
-			var entries = field.InitialEntries;
+			var historyField = History.Fields["mother"];
+			var entries = historyField.InitialEntries;
 			if (entries.Count == 0) {
 				return null;
 			}
@@ -614,8 +614,8 @@ public string? MotherId {
 			}
 
 			idStr = idStr.RemQuotes();
-			field.RemoveAllEntries();
-			field.AddEntryToHistory(null, "mother", idStr);
+			historyField.RemoveAllEntries();
+			historyField.AddEntryToHistory(null, "mother", idStr);
 			return idStr;
 		}
 	}
@@ -644,8 +644,8 @@ public Character? Mother {
 
 	public string? FatherId {
 		get {
-			var field = History.Fields["father"];
-			var entries = field.InitialEntries;
+			var historyField = History.Fields["father"];
+			var entries = historyField.InitialEntries;
 			if (entries.Count == 0) {
 				return null;
 			}
@@ -662,8 +662,8 @@ public string? FatherId {
 			}
 
 			idStr = idStr.RemQuotes();
-			field.RemoveAllEntries();
-			field.AddEntryToHistory(null, "father", idStr);
+			historyField.RemoveAllEntries();
+			historyField.AddEntryToHistory(null, "father", idStr);
 			return idStr;
 		}
 	}

ImperatorToCK3/CK3/Religions/Religion.cs

@@ -11,7 +11,7 @@ namespace ImperatorToCK3.CK3.Religions;
 
 internal sealed class Religion : IIdentifiable<string>, IPDXSerializable {
 	public string Id { get; }
-	public OrderedSet<string> DoctrineIds { get; } = new();
+	public OrderedSet<string> DoctrineIds { get; } = [];
 
 	public ReligionCollection ReligionCollection { get; }
 
@@ -43,7 +43,7 @@ public Religion(string id, BufferedReader religionReader, ReligionCollection rel
 				            $"{string.Join(", ", doctrinesInCategory)}. Keeping the last {category.NumberOfPicks} of them.");
 
 				DoctrineIds.ExceptWith(doctrinesInCategory);
-				foreach (var doctrine in doctrinesInCategory.Reverse().Take(category.NumberOfPicks)) {
+				foreach (var doctrine in Enumerable.Reverse(doctrinesInCategory).Take(category.NumberOfPicks)) {
 					DoctrineIds.Add(doctrine);
 				}
 			}

ImperatorToCK3/CommonUtils/EnumerableExtensions.cs

@@ -12,7 +12,7 @@ public static class EnumerableExtensions {
 			return null;
 		}
 
-		foreach (var element in enumerable.Reverse()) {
+		foreach (var element in Enumerable.Reverse(enumerable)) {
 			if (predicate(element)) {
 				return element;
 			}

ImperatorToCK3/ImperatorToCK3.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <RuntimeIdentifiers>win-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
         <ApplicationIcon>thumbnail.ico</ApplicationIcon>
-        <LangVersion>13</LangVersion>
+        <LangVersion>latest</LangVersion>
         <CETCompat>false</CETCompat> <!-- see https://github.com/ParadoxGameConverters/ImperatorToCK3/issues/2638 -->
     </PropertyGroup>