From bc53361ff95d81d055f3f6aaa852b4907181a18b Mon Sep 17 00:00:00 2001
From: soul <s@x>
Date: Thu, 22 Oct 2026 00:41:10 +0200
Subject: [PATCH] Census tests: sold hulls are LoadoutGenerator.SoldHulls; a
 hull's asset is its Prefab or its mod-ship Visual record

Ruling census-tests-read-the-owners.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../HardpointOwnershipTests.cs                |  4 +---
 .../RestoredHullsTests.cs                     | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/Aetheria.Shared.Tests/HardpointOwnershipTests.cs b/tests/Aetheria.Shared.Tests/HardpointOwnershipTests.cs
index 12daaee32..2650b8009 100644
--- a/tests/Aetheria.Shared.Tests/HardpointOwnershipTests.cs
+++ b/tests/Aetheria.Shared.Tests/HardpointOwnershipTests.cs
@@ -261,9 +261,7 @@ public sealed partial class RunStartTests
     [Fact]
     public void GeneratedLoadoutsGiveEveryReaderItsHardpoint()
     {
-        var sold = _cache.GetAll<FactionProductData>().Select(p => p.Design.Key).ToHashSet();
-        var shipHulls = _cache.GetAll<HullData>()
-            .Where(h => h.HullType == HullType.Ship && sold.Contains(_cache.RefOf(h).Key)).Select(h => h.Name).ToList();
+        var shipHulls = LoadoutGenerator.SoldHulls(_cache).Where(h => h.HullType == HullType.Ship).Select(h => h.Name).ToList();
         var generator = new LoadoutGenerator(ref _items.Random, _items, _galaxy, _galaxy.Entrance, _protagonist, .5f);
         var packs = shipHulls.SelectMany(name => Enumerable.Range(0, 2).Select(_ => generator.GenerateShipLoadout(h => h.Name == name)))
             .Concat(Enumerable.Range(0, 4).Select(_ => generator.GenerateStationLoadout()))
diff --git a/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs b/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs
index 8b0065f93..6dd235551 100644
--- a/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs
+++ b/tests/Aetheria.Shared.Tests/RestoredHullsTests.cs
@@ -187,9 +187,21 @@ public sealed class RestoredHullsTests
 
         using var cache = OpenCatalog();
         var missing = new List<string>();
+        // A hull names one body (ShipAuthoringStore.RequireOneBody): a Unity prefab, or a mod ship's visual record, which
+        // must be in the catalog under its own mod-ship key.
         foreach (var hull in cache.GetAll<HullData>())
-            if (!assetGuids.Contains(hull.Prefab ?? ""))
+        {
+            if (hull.Visual.IsSet())
+            {
+                var visual = cache.Get(hull.Visual);
+                if (visual == null || !hull.Visual.Key.Equals(ShipModCatalog.AuthoringKey(visual.Id)))
+                    missing.Add($"{hull.Name}.Visual = {hull.Visual.Key.Value}");
+                if (!string.IsNullOrWhiteSpace(hull.Prefab))
+                    missing.Add($"{hull.Name} names both Prefab {hull.Prefab} and Visual {hull.Visual.Key.Value}");
+            }
+            else if (!assetGuids.Contains(hull.Prefab ?? ""))
                 missing.Add($"{hull.Name}.Prefab = {hull.Prefab ?? "null"}");
+        }
         foreach (var design in cache.GetAll<EquippableItemData>())
         {
             foreach (var thruster in design.Behaviors.OfType<ThrusterData>())
@@ -245,14 +257,13 @@ public sealed class RestoredHullsTests
     }
 
     // The dock intro dereferences the ship's VelocityLimit unguarded (ActionGameManager), so every ship hull the catalog
-    // sells carries exactly one, with a top speed that is a finite positive number. After the retirement
+    // sells (LoadoutGenerator.SoldHulls) carries exactly one, with a top speed that is a finite positive number. After the retirement
     // (ruling retire-longinusx) the shipped ship hulls are the Longinus and the Djinni.
     [Fact]
     public void EveryShippedShipHullHasATopSpeed()
     {
         using var cache = OpenCatalog();
-        var sold = cache.GetAll<FactionProductData>().Select(product => product.Design.Key).ToHashSet();
-        var ships = cache.GetAll<HullData>().Where(h => h.HullType == HullType.Ship && sold.Contains(cache.RefOf(h).Key)).OrderBy(h => h.Name, StringComparer.Ordinal).ToArray();
+        var ships = LoadoutGenerator.SoldHulls(cache).Where(h => h.HullType == HullType.Ship).OrderBy(h => h.Name, StringComparer.Ordinal).ToArray();
         Assert.Equal(new[] { "Djinni", "Longinus" }, ships.Select(h => h.Name));
         foreach (var hull in ships)
         {