Move unit tests to root namespace to avoid the need for so many using…

… statements
ekolis · Jun 29, 2024 · 8fa29ab · 8fa29ab
1 parent 184b290
commit 8fa29ab
Show file tree

Hide file tree

Showing 26 changed files with 107 additions and 138 deletions.
diff --git a/FrEee.Tests/FrEee.Tests.csproj b/FrEee.Tests/FrEee.Tests.csproj
@@ -23,5 +23,6 @@
 	</ItemGroup>
 	<PropertyGroup>
 		<EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
+		<RootNamespace>FrEee</RootNamespace>
 	</PropertyGroup>
 </Project>
diff --git a/FrEee.Tests/Modding/FormulaTest.cs b/FrEee.Tests/Modding/FormulaTest.cs
@@ -2,14 +2,13 @@
 using FrEee.Processes.Combat;
 using FrEee.Objects.Technology;
 using FrEee.Objects.Vehicles;
-using FrEee.Modding;
 using FrEee.Modding.Templates;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.Linq;
 using FrEee.Objects.GameState;
 
-namespace FrEee.Tests.Modding;
+namespace FrEee.Modding;
 
 /// <summary>
 /// Tests data file formulas.

diff --git a/FrEee.Tests/Modding/Loaders/ComponentLoaderTest.cs b/FrEee.Tests/Modding/Loaders/ComponentLoaderTest.cs
@@ -1,8 +1,7 @@
-using FrEee.Modding;
-using FrEee.Extensions;
+using FrEee.Extensions;
 using NUnit.Framework;
 
-namespace FrEee.Tests.Modding.Loaders;
+namespace FrEee.Modding.Loaders;
 
 /// <summary>
 /// Summary description for ComponentLoaderTest
@@ -36,4 +35,4 @@ public void WeaponRangeBlindSpot()
 		Assert.AreEqual(2, w.WeaponInfo.MinRange.Value);
 		Assert.AreEqual(3, w.WeaponInfo.MaxRange.Value);
 	}
-}
+}
diff --git a/FrEee.Tests/Modding/Loaders/LoaderTest.cs b/FrEee.Tests/Modding/Loaders/LoaderTest.cs
@@ -1,7 +1,6 @@
-using FrEee.Modding;
-using NUnit.Framework;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Modding.Loaders;
+namespace FrEee.Modding.Loaders;
 
 /// <summary>
 /// Tests mod loaders.
@@ -26,4 +25,4 @@ public void LoadStockModWithoutErrors()
 		Mod.Load(null);
 		Assert.AreEqual(0, Mod.Errors.Count);
 	}
-}
+}
diff --git a/FrEee.Tests/Modding/ScriptEngineTest.cs b/FrEee.Tests/Modding/ScriptEngineTest.cs
@@ -1,8 +1,7 @@
-using FrEee.Modding;
+using System.Collections.Generic;
 using NUnit.Framework;
-using System.Collections.Generic;
 
-namespace FrEee.Tests.Modding;
+namespace FrEee.Modding;
 
 //[System.Security.Permissions.PermissionSet(System.Security.Permissions.SecurityAction.Demand, Name = "FullTrust")]
 public class ScriptEngineTest
@@ -23,4 +22,4 @@ public void EvaluateExpression()
 		variables.Add("y", 7);
 		Assert.AreEqual(42, PythonScriptEngine.EvaluateExpression<int>(expr, variables));
 	}
-}
+}
diff --git a/FrEee.Tests/Modding/StockMod.cs b/FrEee.Tests/Modding/StockMod.cs
@@ -1,6 +1,4 @@
-using FrEee.Modding;
-
-namespace FrEee.Tests.Modding;
+namespace FrEee.Modding;
 
 /// <summary>
 /// The stock FrEee mod.
@@ -18,4 +16,4 @@ public static Mod Instance
 	}
 
 	private static Mod instance;
-}
+}
diff --git a/FrEee.Tests/Modding/Templates/GalaxyTemplateTest.cs b/FrEee.Tests/Modding/Templates/GalaxyTemplateTest.cs
@@ -1,8 +1,7 @@
-using FrEee.Modding.Templates;
+using System.Drawing;
 using NUnit.Framework;
-using System.Drawing;
 
-namespace FrEee.Tests.Modding;
+namespace FrEee.Modding.Templates;
 
 /// <summary>
 /// Tests galaxy templates.
@@ -95,4 +94,4 @@ public void WarpPointAngularDistance()
 		Assert.IsFalse(GalaxyTemplate.AngleIsInRangeExclusive(-90, -30, 60));
 		Assert.IsFalse(GalaxyTemplate.AngleIsInRangeExclusive(270, -30, 60));
 	}
-}
+}
diff --git a/FrEee.Tests/Objects/Abilities/AbilityTest.cs b/FrEee.Tests/Objects/Abilities/AbilityTest.cs
@@ -1,15 +1,15 @@
+using System.Drawing;
+using FrEee.Extensions;
+using FrEee.Modding.Abilities;
+using FrEee.Modding.Templates;
 using FrEee.Objects.Civilization;
+using FrEee.Objects.GameState;
 using FrEee.Objects.Space;
+using FrEee.Objects.Technology;
 using FrEee.Objects.Vehicles;
-using FrEee.Modding.Templates;
-using FrEee.Extensions;
 using NUnit.Framework;
-using System.Drawing;
-using FrEee.Objects.Technology;
-using FrEee.Objects.GameState;
-using FrEee.Modding.Abilities;
 
-namespace FrEee.Tests.Objects.Abilities;
+namespace FrEee.Objects.Abilities;
 
 /// <summary>
 /// Tests abilities and ability rules.

diff --git a/FrEee.Tests/Objects/Orders/ConstructionTest.cs b/FrEee.Tests/Objects/Orders/ConstructionTest.cs
@@ -1,12 +1,12 @@
-using FrEee.Objects.Civilization;
+using FrEee.Extensions;
+using FrEee.Modding;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.GameState;
 using FrEee.Objects.Space;
 using FrEee.Objects.Technology;
-using FrEee.Modding;
-using FrEee.Extensions;
 using NUnit.Framework;
-using FrEee.Objects.GameState;
 
-namespace FrEee.Tests.Objects.Orders;
+namespace FrEee.Objects.Orders;
 
 /// <summary>
 /// Tests construction queue capabilities.
@@ -63,4 +63,4 @@ public void NoPopNoBuild()
 	}
 
 	// TODO - test construction of facilities/units/ships
-}
+}
diff --git a/FrEee.Tests/Objects/Space/MemoryTest.cs b/FrEee.Tests/Objects/Space/MemoryTest.cs
@@ -1,13 +1,12 @@
-using FrEee.Objects.Civilization;
-using FrEee.Objects.Space;
-using FrEee.Objects.Vehicles;
-using FrEee.Modding;
+using System.Drawing;
 using FrEee.Extensions;
-using NUnit.Framework;
-using System.Drawing;
+using FrEee.Modding;
+using FrEee.Objects.Civilization;
 using FrEee.Objects.GameState;
+using FrEee.Objects.Vehicles;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Objects.Space;
+namespace FrEee.Objects.Space;
 
 /// <summary>
 /// Tests memory sight / fog of war.
@@ -143,4 +142,4 @@ private void ReturnSubmarine()
 	}
 
 	// TODO - create test for fogged ship reappearing
-}
+}
diff --git a/FrEee.Tests/Objects/Technology/TechnologyTest.cs b/FrEee.Tests/Objects/Technology/TechnologyTest.cs
@@ -1,13 +1,12 @@
+using FrEee.Extensions;
+using FrEee.Modding;
 using FrEee.Objects.Civilization;
 using FrEee.Objects.Commands;
+using FrEee.Objects.GameState;
 using FrEee.Processes;
-using FrEee.Modding;
-using FrEee.Extensions;
 using NUnit.Framework;
-using FrEee.Objects.GameState;
-using FrEee.Objects.Technology;
 
-namespace FrEee.Tests.Objects.Technology;
+namespace FrEee.Objects.Technology;
 
 public class TechnologyTest
 {

diff --git a/FrEee.Tests/Objects/Technology/WeaponInfoTest.cs b/FrEee.Tests/Objects/Technology/WeaponInfoTest.cs
@@ -1,10 +1,10 @@
-using FrEee.Processes.Combat;
+using System.Linq;
 using FrEee.Modding;
-using NUnit.Framework;
-using System.Linq;
 using FrEee.Objects.GameState;
+using FrEee.Processes.Combat;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Objects.Technology;
+namespace FrEee.Objects.Technology;
 
 /// <summary>
 /// Tests weapon info.
@@ -50,4 +50,4 @@ public void NonFormulaDamage()
 		Assert.AreEqual(20, ct.WeaponInfo.GetDamage(new Shot(null, comp, null, 4)));
 		Assert.AreEqual(0, ct.WeaponInfo.GetDamage(new Shot(null, comp, null, 6)));
 	}
-}
+}
diff --git a/FrEee.Tests/Objects/Vehicles/CloakingTest.cs b/FrEee.Tests/Objects/Vehicles/CloakingTest.cs
@@ -1,15 +1,14 @@
-using FrEee.Objects.Civilization;
-using FrEee.Objects.Space;
-using FrEee.Objects.Vehicles;
-using FrEee.Modding;
+using System.Drawing;
 using FrEee.Extensions;
-using NUnit.Framework;
-using System.Drawing;
-using FrEee.Objects.Technology;
-using FrEee.Objects.GameState;
+using FrEee.Modding;
 using FrEee.Modding.Abilities;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.GameState;
+using FrEee.Objects.Space;
+using FrEee.Objects.Technology;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Objects.Vehicles;
+namespace FrEee.Objects.Vehicles;
 
 /// <summary>
 /// Tests cloaking of vehicles.
@@ -220,4 +219,4 @@ private void AddSensorAbility(IHull hull, string sightType, int level)
 		a.Values.Add(sightType);
 		a.Values.Add(level.ToString());
 	}
-}
+}
diff --git a/FrEee.Tests/Objects/Vehicles/DamageTest.cs b/FrEee.Tests/Objects/Vehicles/DamageTest.cs
@@ -1,18 +1,15 @@
-using FrEee.Modding.Abilities;
-using FrEee.Objects.Civilization;
-using FrEee.Objects.Space;
-using FrEee.Objects.Technology;
-using FrEee.Objects.Vehicles;
+using System.Collections.Generic;
+using System.Linq;
+using FrEee.Extensions;
 using FrEee.Modding;
+using FrEee.Modding.Abilities;
 using FrEee.Modding.Templates;
-using FrEee.Extensions;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Linq;
+using FrEee.Objects.Civilization;
 using FrEee.Objects.GameState;
-using FrEee.Extensions;
+using FrEee.Objects.Technology;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Objects.Vehicles;
+namespace FrEee.Objects.Vehicles;
 
 /// <summary>
 /// Tests damage to vehicles.
@@ -113,4 +110,4 @@ private int GetExpectedSpeed(Ship ship)
 			+ ship.Components.Where(c => c.Hitpoints > 0).MaxOrDefault(c => c.GetAbilityValue("Extra Movement Generation").ToInt())
 			+ ship.Components.Where(c => c.Hitpoints > 0).MaxOrDefault(c => c.GetAbilityValue("Vehicle Speed").ToInt());
 	}
-}
+}
diff --git a/FrEee.Tests/Objects/Vehicles/ResupplyTest.cs b/FrEee.Tests/Objects/Vehicles/ResupplyTest.cs
@@ -1,15 +1,14 @@
-using FrEee.Objects.Civilization;
-using FrEee.Objects.Space;
-using FrEee.Objects.Technology;
-using FrEee.Objects.Vehicles;
+using System.Drawing;
+using FrEee.Extensions;
 using FrEee.Modding;
 using FrEee.Modding.Templates;
-using FrEee.Extensions;
-using NUnit.Framework;
-using System.Drawing;
+using FrEee.Objects.Civilization;
 using FrEee.Objects.GameState;
+using FrEee.Objects.Space;
+using FrEee.Objects.Technology;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Objects.Vehicles;
+namespace FrEee.Objects.Vehicles;
 
 /// <summary>
 /// Tests resupply of vehicles.
@@ -87,4 +86,4 @@ public void FleetResupply()
 	// TODO - test resupply depots
 
 	// TODO - test system wide resupply
-}
+}
diff --git a/FrEee.Tests/Processes/Combat/DamageTypesTest.cs b/FrEee.Tests/Processes/Combat/DamageTypesTest.cs
@@ -1,14 +1,12 @@
-using FrEee.Processes.Combat;
-using FrEee.Objects.Vehicles;
-using FrEee.Modding;
-using FrEee.Extensions;
-using NUnit.Framework;
-using System;
+using System;
 using System.Linq;
+using FrEee.Extensions;
+using FrEee.Modding;
 using FrEee.Objects.GameState;
-using FrEee.Processes.Combat;
+using FrEee.Objects.Vehicles;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Processes.Combat;
+namespace FrEee.Processes.Combat;
 
 public class DamageTypesTest
 {
@@ -176,4 +174,4 @@ private void TestDamage(Ship attacker, IDamageable defender, int dmg, int expect
         else
             Assert.IsTrue(defender.IsDestroyed);
     }
-}
+}
diff --git a/FrEee.Tests/Setup/GameSetupTest.cs b/FrEee.Tests/Setup/GameSetupTest.cs
@@ -1,9 +1,9 @@
 using FrEee.Modding;
-using NUnit.Framework;
 using FrEee.Objects.GameState;
 using FrEee.Processes.Setup;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Setup;
+namespace FrEee.Setup;
 
 public class GameSetupTest
 {
@@ -15,4 +15,4 @@ public void Quickstart()
 		Mod.Current = Mod.Load(null);
 		Galaxy.Initialize(setup, null);
 	}
-}
+}
diff --git a/FrEee.Tests/TestUtilities.cs b/FrEee.Tests/TestUtilities.cs
@@ -4,7 +4,7 @@
 using FrEee.Modding;
 using FrEee.Objects.GameState;
 
-namespace FrEee.Tests;
+namespace FrEee;
 
 public static class TestUtilities
 {

diff --git a/FrEee.Tests/Utility/DataTest.cs b/FrEee.Tests/Utility/DataTest.cs
@@ -1,12 +1,9 @@
-using FrEee.Utility;
-using FrEee.Serialization;
+using System.Collections.Generic;
 using FrEee.Extensions;
-using NUnit.Framework;
-using System.Collections.Generic;
 using FrEee.Serialization;
-using FrEee.Utility;
+using NUnit.Framework;
 
-namespace FrEee.Tests.Utility;
+namespace FrEee.Utility;
 
 /// <summary>
 /// Tests data operations.
@@ -199,4 +196,4 @@ public string SayHi()
 			return $"Hi, I'm {Name ?? "nobody"}!";
 		}
 	}
-}
+}