From 2a1eda0d38dc578d29b56bdb98fd2cf6fa3b428f Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 12 May 2021 01:57:03 +0200
Subject: [PATCH] Fix tests

---
 Robust.UnitTesting/RobustUnitTest.cs          |  3 +--
 .../GameObjects/Components/Container_Test.cs  |  2 +-
 .../ThrowingEntityDeletion_Test.cs            |  8 ++++----
 .../Server/Maps/MapLoaderTest.cs              |  2 +-
 .../Server/RobustServerSimulation.cs          | 19 +++++--------------
 .../ComponentDependencies_Tests.cs            | 18 +++++++++---------
 .../GameObjects/ComponentFactory_Tests.cs     |  2 +-
 .../Shared/Localization/LocalizationTests.cs  |  2 +-
 .../Prototypes/PrototypeManager_Test.cs       |  2 +-
 9 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/Robust.UnitTesting/RobustUnitTest.cs b/Robust.UnitTesting/RobustUnitTest.cs
index cfe98565f6..c0c2fd14a9 100644
--- a/Robust.UnitTesting/RobustUnitTest.cs
+++ b/Robust.UnitTesting/RobustUnitTest.cs
@@ -88,8 +88,7 @@ namespace Robust.UnitTesting
             var compFactory = IoCManager.Resolve<IComponentFactory>();
             if (!compFactory.AllRegisteredTypes.Contains(typeof(MetaDataComponent)))
             {
-                compFactory.Register<MetaDataComponent>();
-                compFactory.RegisterReference<MetaDataComponent, IMetaDataComponent>();
+                compFactory.RegisterClass<MetaDataComponent>();
             }
 
             if(entMan.EventBus == null)
diff --git a/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs b/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
index e305657aea..3a9d27cf95 100644
--- a/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
+++ b/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
@@ -16,7 +16,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
         {
             var sim = RobustServerSimulation
                 .NewSimulation()
-                .RegisterComponents(factory => { factory.RegisterClass<ContainerManagerComponent>(); factory.RegisterReference<ContainerManagerComponent, IContainerManager>(); })
+                .RegisterComponents(factory => { factory.RegisterClass<ContainerManagerComponent>(); })
                 .RegisterPrototypes(protoMan => protoMan.LoadString(PROTOTYPES))
                 .InitializeInstance();
 
diff --git a/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs b/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs
index 2d0b62727a..98d48f3c68 100644
--- a/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs
+++ b/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs
@@ -38,10 +38,10 @@ namespace Robust.UnitTesting.Server.GameObjects
         {
             _componentFactory = IoCManager.Resolve<IComponentFactory>();
 
-            _componentFactory.Register<ThrowsInAddComponent>();
-            _componentFactory.Register<ThrowsInInitializeComponent>();
-            _componentFactory.Register<ThrowsInStartupComponent>();
-            
+            _componentFactory.RegisterClass<ThrowsInAddComponent>();
+            _componentFactory.RegisterClass<ThrowsInInitializeComponent>();
+            _componentFactory.RegisterClass<ThrowsInStartupComponent>();
+
             EntityManager = IoCManager.Resolve<IServerEntityManager>();
             MapManager = IoCManager.Resolve<IMapManager>();
 
diff --git a/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs b/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs
index dbdedaf9b3..c0765e06a3 100644
--- a/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs
+++ b/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs
@@ -83,7 +83,7 @@ entities:
         public void Setup()
         {
             var compFactory = IoCManager.Resolve<IComponentFactory>();
-            compFactory.Register<MapDeserializeTestComponent>();
+            compFactory.RegisterClass<MapDeserializeTestComponent>();
             IoCManager.Resolve<ISerializationManager>().Initialize();
 
             var resourceManager = IoCManager.Resolve<IResourceManagerInternal>();
diff --git a/Robust.UnitTesting/Server/RobustServerSimulation.cs b/Robust.UnitTesting/Server/RobustServerSimulation.cs
index f295f7af43..408198e93e 100644
--- a/Robust.UnitTesting/Server/RobustServerSimulation.cs
+++ b/Robust.UnitTesting/Server/RobustServerSimulation.cs
@@ -193,20 +193,11 @@ namespace Robust.UnitTesting.Server
 
             var compFactory = container.Resolve<IComponentFactory>();
 
-            compFactory.Register<MetaDataComponent>();
-            compFactory.RegisterReference<MetaDataComponent, IMetaDataComponent>();
-
-            compFactory.Register<TransformComponent>();
-            compFactory.RegisterReference<TransformComponent, ITransformComponent>();
-
-            compFactory.Register<MapComponent>();
-            compFactory.RegisterReference<MapComponent, IMapComponent>();
-
-            compFactory.Register<MapGridComponent>();
-            compFactory.RegisterReference<MapGridComponent, IMapGridComponent>();
-
-            compFactory.Register<PhysicsComponent>();
-            compFactory.RegisterReference<PhysicsComponent, IPhysBody>();
+            compFactory.RegisterClass<MetaDataComponent>();
+            compFactory.RegisterClass<TransformComponent>();
+            compFactory.RegisterClass<MapComponent>();
+            compFactory.RegisterClass<MapGridComponent>();
+            compFactory.RegisterClass<PhysicsComponent>();
 
             _regDelegate?.Invoke(compFactory);
 
diff --git a/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs
index 1fb5bf69ea..927eaba545 100644
--- a/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs
+++ b/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs
@@ -114,6 +114,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
 
         private interface ITestInterfaceUnreferenced : IComponent { }
 
+        [ComponentReference(typeof(ITestInterfaceInterface))]
         private class TestInterfaceComponent : Component, ITestInterfaceInterface, ITestInterfaceUnreferenced
         {
             public override string Name => "TestInterface";
@@ -155,15 +156,14 @@ namespace Robust.UnitTesting.Shared.GameObjects
         public void Setup()
         {
             var componentFactory = IoCManager.Resolve<IComponentFactory>();
-            componentFactory.Register<TestOneComponent>();
-            componentFactory.Register<TestTwoComponent>();
-            componentFactory.Register<TestThreeComponent>();
-            componentFactory.Register<TestInterfaceComponent>();
-            componentFactory.RegisterReference<TestInterfaceComponent, ITestInterfaceInterface>();
-            componentFactory.Register<TestFourComponent>();
-            componentFactory.Register<TestFiveComponent>();
-            componentFactory.Register<TestSixComponent>();
-            componentFactory.Register<TestSevenComponent>();
+            componentFactory.RegisterClass<TestOneComponent>();
+            componentFactory.RegisterClass<TestTwoComponent>();
+            componentFactory.RegisterClass<TestThreeComponent>();
+            componentFactory.RegisterClass<TestInterfaceComponent>();
+            componentFactory.RegisterClass<TestFourComponent>();
+            componentFactory.RegisterClass<TestFiveComponent>();
+            componentFactory.RegisterClass<TestSixComponent>();
+            componentFactory.RegisterClass<TestSevenComponent>();
 
             IoCManager.Resolve<ISerializationManager>().Initialize();
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
diff --git a/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs
index 441f7a49b2..ab5629a381 100644
--- a/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs
+++ b/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs
@@ -17,7 +17,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            IoCManager.Resolve<IComponentFactory>().Register<TestComponent>();
+            IoCManager.Resolve<IComponentFactory>().RegisterClass<TestComponent>();
         }
 
         [Test]
diff --git a/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs b/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs
index 6dc827eae2..e8bcd97fd8 100644
--- a/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs
+++ b/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs
@@ -19,7 +19,7 @@ namespace Robust.UnitTesting.Shared.Localization
         public void Setup()
         {
             IoCManager.Resolve<ISerializationManager>().Initialize();
-            IoCManager.Resolve<IComponentFactory>().Register<GrammarComponent>();
+            IoCManager.Resolve<IComponentFactory>().RegisterClass<GrammarComponent>();
 
             var res = IoCManager.Resolve<IResourceManagerInternal>();
             res.MountString("/Locale/en-US/a.ftl", FluentCode);
diff --git a/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs b/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs
index e28ff2ccfc..3c4ac98547 100644
--- a/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs
+++ b/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs
@@ -22,7 +22,7 @@ namespace Robust.UnitTesting.Shared.Prototypes
         public void Setup()
         {
             var factory = IoCManager.Resolve<IComponentFactory>();
-            factory.Register<TestBasicPrototypeComponent>();
+            factory.RegisterClass<TestBasicPrototypeComponent>();
             factory.RegisterClass<PointLightComponent>();
 
             IoCManager.Resolve<ISerializationManager>().Initialize();