Remove lambdas, add tests

Author: xPaw

SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs

@@ -121,12 +121,12 @@ public void AddHandler( ClientMsgHandler handler )
         {
             ArgumentNullException.ThrowIfNull( handler );
 
-            var type = handler.GetType();
-            var msgIndex = handlers.FindIndex( h => h.GetType() == type );
-
-            if ( msgIndex > -1 )
+            foreach ( var h in handlers )
             {
-                throw new InvalidOperationException( string.Format( "A handler of type \"{0}\" is already registered.", handler.GetType() ) );
+                if ( h.GetType() == handler.GetType() )
+                {
+                    throw new InvalidOperationException( $"A handler of type \"{handler.GetType()}\" is already registered." );
+                }
             }
 
             AddHandlerCore( handler );
@@ -144,11 +144,13 @@ private void AddHandlerCore( ClientMsgHandler handler )
         /// <param name="handler">The handler name to remove.</param>
         public void RemoveHandler( Type handler )
         {
-            var msgIndex = handlers.FindIndex( h => h.GetType() == handler );
-
-            if ( msgIndex > -1 )
+            for ( var i = 0; i < handlers.Count; i++ )
             {
-                handlers.RemoveAt( msgIndex );
+                if ( handlers[ i ].GetType() == handler )
+                {
+                    handlers.RemoveAt( i );
+                    return;
+                }
             }
         }
 
@@ -171,9 +173,15 @@ public void RemoveHandler( ClientMsgHandler handler )
         public T? GetHandler<T>()
             where T : ClientMsgHandler
         {
-            Type type = typeof( T );
+            foreach ( var handler in handlers )
+            {
+                if ( handler.GetType() == typeof( T ) )
+                {
+                    return ( T )handler;
+                }
+            }
 
-            return handlers.Find( h => h.GetType() == type ) as T;
+            return null;
         }
 
         /// <summary>

SteamKit2/Tests/SteamClientFacts.cs

@@ -26,6 +26,7 @@ public void ConstructorSetsInitialHandlers()
             Assert.NotNull(steamClient.GetHandler<SteamMatchmaking>());
             Assert.NotNull(steamClient.GetHandler<SteamNetworking>());
             Assert.NotNull(steamClient.GetHandler<SteamContent>());
+            Assert.NotNull(steamClient.GetHandler<SteamAuthTicket>());
         }
 
         [Fact]
@@ -62,6 +63,43 @@ public void RemoveHandlerRemovesHandlerByInstance()
             Assert.Null(steamClient.GetHandler<TestMsgHandler>());
         }
 
+        [Fact]
+        public void AddHandlerThrowsOnDuplicateHandler()
+        {
+            var steamClient = new SteamClient();
+            steamClient.AddHandler(new TestMsgHandler());
+
+            Assert.Throws<InvalidOperationException>(() => steamClient.AddHandler(new TestMsgHandler()));
+        }
+
+        [Fact]
+        public void RemoveHandlerByTypeDoesNothingWhenNotRegistered()
+        {
+            var steamClient = new SteamClient();
+            Assert.Null(steamClient.GetHandler<TestMsgHandler>());
+
+            steamClient.RemoveHandler(typeof(TestMsgHandler));
+            Assert.Null(steamClient.GetHandler<TestMsgHandler>());
+        }
+
+        [Fact]
+        public void GetRequiredHandlerReturnsHandler()
+        {
+            var steamClient = new SteamClient();
+            var handler = steamClient.GetRequiredHandler<SteamUser>();
+
+            Assert.NotNull(handler);
+            Assert.IsType<SteamUser>(handler);
+        }
+
+        [Fact]
+        public void GetRequiredHandlerThrowsWhenNotRegistered()
+        {
+            var steamClient = new SteamClient();
+
+            Assert.Throws<InvalidOperationException>(() => steamClient.GetRequiredHandler<TestMsgHandler>());
+        }
+
         [Fact]
         public void GetNextJobIDIsThreadsafe()
         {