Fix some unit tests (#340)

* Make DI resettable; do so in tests.

* Fix one ability test; don't cancel entirely out of Mod.AssignID if the object already has an ID (it might have an ID but not be in the objects collection).

* Fix a formula test

* Min range should be the specified min range of the weapon

* Fix a different weapon range test that the previous change broke

* Fix a bunch of tests where the game/mod/DI was not initialized correctly

* Fix cloaking tests, but a few of them fail when run as part of the group of tests (but pass when run alone)

FrEee.Core.Domain/Extensions/ChecksExtensions.cs

@@ -131,10 +131,6 @@ from subcloak in gj.DefaultIfEmpty()
 		int obscurationLevel = 0;
 		if (sobj.CanBeObscured)
 		{
-			if (sobj.StarSystem.Name == "Citronelle")
-			{
-
-			}
 			var so = sys.GetEmpireAbilityValue(sobj.Owner, "System - Sight Obscuration");
 			obscurationLevel = new[]
 			{
@@ -144,7 +140,9 @@ from subcloak in gj.DefaultIfEmpty()
 				sec.GetEmpireAbilityValue(sobj.Owner, "Sector - Sight Obscuration"),
 			}.Max(a => a.ToInt());
 		}
-		return (cloaks.Any() || obscurationLevel > 0) && joined.All(j => j.CloakLevel > j.SensorLevel || obscurationLevel > j.SensorLevel);
+		return (cloaks.Any() || obscurationLevel > 0) 
+			&& joined.All(j =>
+				j.CloakLevel > j.SensorLevel || obscurationLevel > j.SensorLevel);
 	}
 
 	/// <summary>

FrEee.Core.Domain/Modding/Loaders/ComponentLoader.cs

@@ -124,7 +124,7 @@ public override IEnumerable<IModObject> Load(Mod mod)
 					else
 						w.Targets = ParseWeaponTargets(rec.Get<string>("Weapon Target", c), @"\", rec);
 
-					w.MinRange = rec.Get<int>(new string[] { "Min Range", "Minimum Range", "Weapon Min Range", "Weapon Minimum Range" }, c) ?? 0;
+					w.MinRange = rec.Get<int>(new string[] { "Min Range", "Minimum Range", "Weapon Min Range", "Weapon Minimum Range" }, c) ?? 1;
 					w.MaxRange = rec.Get<int>(new string[] { "Max Range", "Maximum Range", "Weapon Max Range", "Weapon Maximum Range" }, c) ?? 20;
 					var dmgfield = rec.FindField(new string[] { "Damage", "Weapon Damage", "Damage At Rng", "Weapon Damage At Rng", "Damage At Range", "Weapon Damage At Range" }, ref index);
 					if (dmgfield.Value.StartsWith("="))
@@ -140,7 +140,7 @@ public override IEnumerable<IModObject> Load(Mod mod)
 							{
 								if (split[i].ToInt() == 0)
 									continue;
-								dict[i + 1] = split[i].ToInt();
+								dict[i + w.MinRange] = split[i].ToInt();
 							}
 
 							// HACK - SE4 doesn't explicitly specify damage at range zero so copy the damage at range one value
@@ -150,8 +150,8 @@ public override IEnumerable<IModObject> Load(Mod mod)
 								w.MinRange = 0;
 							}
 
-							w.MinRange = dict.Keys.Min();
-							w.MaxRange = dict.Keys.Max();
+							w.MinRange = dict.Where(q => q.Value != 0).Min(q => q.Key);
+							w.MaxRange = dict.Where(q => q.Value != 0).Max(q => q.Key);
 
 							w.Damage = dict.BuildMultiConditionalLessThanOrEqual(c, "range", 0);
 						}

FrEee.Core.Domain/Modding/Mod.cs

@@ -242,62 +242,68 @@ public IEnumerable<string> DesignNamesFiles
 		}
 	}
 
-	public void AssignID(IModObject mo, ICollection<string> used)
+	public void AssignID(IModObject mo, ICollection<string>? used = null)
 	{
-		if (mo.ModID != null)
-			return;
 		lock (locker)
 		{
-			var fullname = mo.GetType().Name + " " + mo.Name;
-			if (mo.Name != null && !used.Contains(fullname))
+			if (mo.ModID is null)
 			{
-				mo.ModID = fullname;
-				used.Add(mo.ModID);
-			}
-			else
-			{
-				// tack a number on
-				int lastnum;
-				string name;
-				if (mo.Name == null)
-					name = "Generic " + mo.GetType().Name;
-				else
-					name = mo.GetType().Name + " " + mo.Name;
-				var lastword = name.LastWord();
-				if (int.TryParse(lastword, out lastnum))
+				if (used is null)
 				{
-					// has a number, count from that number
+					used = Objects.Select(q => q.ModID).ToList();
 				}
-				else
+
+				var fullname = mo.GetType().Name + " " + mo.Name;
+				if (mo.Name != null && !used.Contains(fullname))
 				{
-					lastnum = -1; // no number, start from 1
+					mo.ModID = fullname;
+					used.Add(mo.ModID);
 				}
-				for (var num = lastnum + 1; num <= int.MaxValue; num++)
+				else
 				{
-					string exceptnum;
-					if (lastnum < 0 && num == 0)
+					// tack a number on
+					int lastnum;
+					string name;
+					if (mo.Name == null)
+						name = "Generic " + mo.GetType().Name;
+					else
+						name = mo.GetType().Name + " " + mo.Name;
+					var lastword = name.LastWord();
+					if (int.TryParse(lastword, out lastnum))
 					{
-						exceptnum = name;
-						num = 1;
+						// has a number, count from that number
 					}
-					else if (lastnum < 0)
-						exceptnum = name;
 					else
-						exceptnum = name.Substring(0, name.Length - lastword.Length - 1);
-					var withnextnum = exceptnum + " " + num;
-					if (!used.Contains(withnextnum))
 					{
-						mo.ModID = withnextnum;
-						used.Add(withnextnum);
-						break;
+						lastnum = -1; // no number, start from 1
+					}
+					for (var num = lastnum + 1; num <= int.MaxValue; num++)
+					{
+						string exceptnum;
+						if (lastnum < 0 && num == 0)
+						{
+							exceptnum = name;
+							num = 1;
+						}
+						else if (lastnum < 0)
+							exceptnum = name;
+						else
+							exceptnum = name.Substring(0, name.Length - lastword.Length - 1);
+						var withnextnum = exceptnum + " " + num;
+						if (!used.Contains(withnextnum))
+						{
+							mo.ModID = withnextnum;
+							used.Add(withnextnum);
+							break;
+						}
+						if (num == int.MaxValue)
+							throw new Exception("Can't assign mod ID to " + name + "; there's a gazillion other mod objects with that name.");
 					}
-					if (num == int.MaxValue)
-						throw new Exception("Can't assign mod ID to " + name + "; there's a gazillion other mod objects with that name.");
 				}
-			}
 
-			if (mo.ModID == null)
-				throw new Exception("Failed to assign mod ID to {0}: {1}".F(mo.GetType(), mo));
+				if (mo.ModID == null)
+					throw new Exception("Failed to assign mod ID to {0}: {1}".F(mo.GetType(), mo));
+			}
 
 			if (!objects.Contains(mo))
 				objects.Add(mo);

FrEee.Core.Domain/Objects/GameState/Game.cs

@@ -63,7 +63,7 @@ public Game()
 	/// <summary>
 	/// The galaxy in which this game is played.
 	/// </summary>
-	public Galaxy Galaxy { get; internal set; }
+	public Galaxy Galaxy { get; set; }
 
 	/// <summary>
 	/// The battles which have taken place this turn.

FrEee.Core.Utility/Utility/DI.cs

@@ -13,7 +13,7 @@ namespace FrEee.Utility
     /// </summary>
     public static class DI
     {
-        private static readonly HostApplicationBuilder builder = Host.CreateApplicationBuilder();
+        private static HostApplicationBuilder builder = Host.CreateApplicationBuilder();
 
         private static IHost? host;
 
@@ -27,20 +27,11 @@ public static void RegisterSingleton<TInterface, TImplementation>()
             where TInterface : class
 			where TImplementation : class, TInterface
 		{
-			Task.Run(async () =>
+			if (host is not null)
 			{
-				if (host is not null)
-				{
-					await host.StopAsync();
-				}
-
-				builder.Services.AddSingleton<TInterface, TImplementation>();
-
-				if (host is not null)
-				{
-					await Run();
-				}
-			});
+				throw new InvalidOperationException("Can't register a service while the service host is running.");
+			}
+			builder.Services.AddSingleton<TInterface, TImplementation>();
 		}
 
 		/// <summary>
@@ -53,20 +44,11 @@ public static void RegisterTransient<TInterface, TImplementation>()
 			where TInterface : class
 			where TImplementation : class, TInterface
 		{
-			Task.Run(async () =>
+			if (host is not null)
 			{
-				if (host is not null)
-				{
-					await host.StopAsync();
-				}
-
-				builder.Services.AddTransient<TInterface, TImplementation>();
-
-				if (host is not null)
-				{
-					await Run();
-				}
-			});
+				throw new InvalidOperationException("Can't register a service while the service host is running.");
+			}
+			builder.Services.AddTransient<TInterface, TImplementation>();
 		}
 
 		/// <summary>
@@ -80,6 +62,21 @@ public async static Task Run()
 			await host.RunAsync();
         }
 
+		/// <summary>
+		/// Resets the dependency injection host.
+		/// Unregisters all services.
+		/// </summary>
+		/// <returns></returns>
+		public async static Task Reset()
+		{
+			if (host is not null)
+			{
+				await host.StopAsync();
+				host = null;
+				builder = new HostApplicationBuilder();
+			}
+		}
+
 		/// <summary>
 		/// Gets an instance of a registered service.
 		/// </summary>
@@ -90,9 +87,12 @@ public static TInterface Get<TInterface>()
 		{
 			if (host is null)
 			{
-				throw new InvalidOperationException("Can't get items from DI without first calling Run.");
+				// start services (don't await, run in background)
+				Run();
 			}
-			var result = host.Services.GetService<TInterface>();
+
+			TInterface? result = host.Services.GetService<TInterface>();
+
 			return result ?? throw new InvalidOperationException($"No service of type {typeof(TInterface)} is registered.");
 		}
 	}

FrEee.Root/Configuration.cs

@@ -31,6 +31,9 @@ public static void ConfigureDI()
 	{
 		// TODO: load dependencies from configuration file in mod data so we can really modularize this thing!
 
+		// reset in case DI as already running (e.g. unit test suite)
+		DI.Reset();
+
 		// processes
 		DI.RegisterSingleton<ITurnProcessor, TurnProcessor>();
 		DI.RegisterSingleton<IBattleFactory, BattleFactory>();

FrEee.Tests/Modding/FormulaTest.cs

@@ -10,6 +10,7 @@
 using FrEee.Vehicles;
 using FrEee.Vehicles.Types;
 using FrEee.Utility;
+using FrEee.Root;
 
 namespace FrEee.Modding;
 
@@ -24,30 +25,38 @@ public class FormulaTest
 	[Test]
 	public void DynamicFormula()
 	{
+		Configuration.ConfigureDI();
 		var gal = new Game();
 		Empire emp = new Empire();
 		Mod.Current = new Mod();
+
 		var armor = new ComponentTemplate();
 		armor.Name = armor.ModID = "Armor";
 		armor.Size = 10;
 		armor.Durability = new ComputedFormula<int>("self.Size * 3", armor, true);
 		Mod.Current.ComponentTemplates.Add(armor);
+		Mod.Current.AssignID(armor);
+
 		var mount = new Mount();
 		mount.ModID = mount.Name = "Scale Mount";
 		mount.DurabilityPercent = 200;
 		mount.SizePercent = new ComputedFormula<int>("design.Hull.Size", mount, true);
 		Mod.Current.Mounts.Add(mount);
+		Mod.Current.AssignID(mount);
+
 		var hull = DIRoot.Hulls.Build(VehicleTypes.Ship);
 		hull.ModID = hull.Name = "Generic Hull";
 		hull.Size = 150;
 		Mod.Current.Hulls.Add(hull);
+		Mod.Current.AssignID(hull);
 
 		var design = DIRoot.Designs.Build(hull);
 		Game.Current.AssignID(design);
 		var mct = new MountedComponentTemplate(design, armor, mount);
 		design.Components.Add(mct);
 		mct.Container = design;
 		design.Owner = emp;
+
 		Assert.AreEqual(30, armor.Durability.Value); // 10 * 3
 		Assert.AreEqual(mct.Durability, 60); // 30 * 200%
 		Assert.AreEqual(15, mct.Size); // 10 * 150%

FrEee.Tests/Objects/Abilities/AbilityTest.cs

@@ -1,10 +1,12 @@
 using System.Drawing;
 using FrEee.Extensions;
+using FrEee.Modding;
 using FrEee.Modding.Abilities;
 using FrEee.Modding.Templates;
 using FrEee.Objects.Civilization;
 using FrEee.Objects.GameState;
 using FrEee.Objects.Space;
+using FrEee.Root;
 using FrEee.Vehicles;
 using FrEee.Vehicles.Types;
 using NUnit.Framework;
@@ -25,16 +27,19 @@ public class AbilityTest
 	[SetUp]
 	public void SetUp()
 	{
-		// create galaxy
-		TestUtilities.CreateGalaxyWithMod();
+		// configure DI
+		Configuration.ConfigureDI();
+
+		// create game
+		TestUtilities.Initialize();
 
 		// create star system
 		sys = new(0);
 		Galaxy.Current.StarSystemLocations.Add(new(sys, new Point()));
 
 		// create stuff
 		emp = TestUtilities.CreateEmpire();
-		hull = TestUtilities.CreateHull(VehicleTypes.Ship, design.Name);
+		hull = TestUtilities.CreateHull(VehicleTypes.Ship);
 		design = TestUtilities.CreateDesign(emp, hull);
 		ship = TestUtilities.CreateVehicle(design, emp);
 	}

FrEee.Tests/Objects/Orders/ConstructionTest.cs

@@ -6,6 +6,7 @@
 using FrEee.Objects.GameState;
 using FrEee.Objects.Space;
 using FrEee.Objects.Technology;
+using FrEee.Root;
 using FrEee.Utility;
 using NUnit.Framework;
 
@@ -25,9 +26,11 @@ public class ConstructionTest
 	[OneTimeSetUp]
 	public static void ClassInit()
 	{
+		// initalize DI
+		Configuration.ConfigureDI();
+
 		// initialize galaxy
-		new Game();
-		new ModLoader().Load(null);
+		TestUtilities.Initialize();
 
 		// initialize empires
 		empire = new Empire();