tests: fix unhooking of some functions in tests

Author: roflmuffin

managed/CounterStrikeSharp.Tests.Native/ListenerTests.cs

@@ -53,26 +53,31 @@ public async Task TakeDamageListenersAreFired()
 
         var postCallback = FunctionReference.Create((IntPtr entityPtr, IntPtr damageInfoPtr) => { postCallCount++; });
 
-        NativeAPI.AddListener("OnEntityTakeDamagePre", preCallback);
-        NativeAPI.AddListener("OnEntityTakeDamagePost", postCallback);
+        try
+        {
+            NativeAPI.AddListener("OnEntityTakeDamagePre", preCallback);
+            NativeAPI.AddListener("OnEntityTakeDamagePost", postCallback);
 
-        // Spawn a bot and deal damage to it
-        NativeAPI.IssueServerCommand("bot_kick");
-        NativeAPI.IssueServerCommand("bot_add");
-        await WaitOneFrame();
+            // Spawn a bot and deal damage to it
+            NativeAPI.IssueServerCommand("bot_kick");
+            NativeAPI.IssueServerCommand("bot_add");
+            await WaitOneFrame();
 
-        var player = Utilities.GetPlayers().FirstOrDefault(p => p.IsBot);
-        var playerHealth = player.PlayerPawn.Value.Health;
-        DealDamageFunc(player, player, 10);
+            var player = Utilities.GetPlayers().FirstOrDefault(p => p.IsBot);
+            var playerHealth = player.PlayerPawn.Value.Health;
+            DealDamageFunc(player, player, 10);
 
-        await WaitOneFrame();
-        Assert.Equal(player.PlayerPawn.Value.Health, playerHealth - 10);
+            await WaitOneFrame();
+            Assert.Equal(playerHealth - 10, player.PlayerPawn.Value.Health);
 
-        Assert.Equal(1, preCallCount);
-        Assert.Equal(1, postCallCount);
-
-        NativeAPI.RemoveListener("OnEntityTakeDamagePre", preCallback);
-        NativeAPI.RemoveListener("OnEntityTakeDamagePost", postCallback);
+            Assert.Equal(1, preCallCount);
+            Assert.Equal(1, postCallCount);
+        }
+        finally
+        {
+            NativeAPI.RemoveListener("OnEntityTakeDamagePre", preCallback);
+            NativeAPI.RemoveListener("OnEntityTakeDamagePost", postCallback);
+        }
     }
 
     [Fact]
@@ -95,28 +100,33 @@ public async Task TakeDamageListenerCanBeCancelled()
 
         Listeners.OnEntityTakeDamagePost postCallback = (entity, damageInfo, damageResult) => { postCallCount++; };
 
-        NativeAPI.AddListener("OnEntityTakeDamagePre", preCallback);
-        NativeAPI.AddListener("OnEntityTakeDamagePre", secondCallback);
-        NativeAPI.AddListener("OnEntityTakeDamagePost", postCallback);
-
-        // Spawn a bot and deal damage to it
-        NativeAPI.IssueServerCommand("bot_kick");
-        NativeAPI.IssueServerCommand("bot_add");
-        await WaitOneFrame();
-
-        var player = Utilities.GetPlayers().FirstOrDefault(p => p.IsBot);
-        var playerHealth = player.PlayerPawn.Value.Health;
-        DealDamageFunc(player, player, 10);
-
-        await WaitOneFrame();
-        Assert.Equal(player.PlayerPawn.Value.Health, playerHealth);
-
-        Assert.Equal(1, preCallCount);
-        Assert.Equal(0, postCallCount);
-
-        NativeAPI.RemoveListener("OnEntityTakeDamagePre", preCallback);
-        NativeAPI.RemoveListener("OnEntityTakeDamagePre", secondCallback);
-        NativeAPI.RemoveListener("OnEntityTakeDamagePost", postCallback);
+        try
+        {
+            NativeAPI.AddListener("OnEntityTakeDamagePre", preCallback);
+            NativeAPI.AddListener("OnEntityTakeDamagePre", secondCallback);
+            NativeAPI.AddListener("OnEntityTakeDamagePost", postCallback);
+
+            // Spawn a bot and deal damage to it
+            NativeAPI.IssueServerCommand("bot_kick");
+            NativeAPI.IssueServerCommand("bot_add");
+            await WaitOneFrame();
+
+            var player = Utilities.GetPlayers().FirstOrDefault(p => p.IsBot);
+            var playerHealth = player.PlayerPawn.Value.Health;
+            DealDamageFunc(player, player, 10);
+
+            await WaitOneFrame();
+            Assert.Equal(player.PlayerPawn.Value.Health, playerHealth);
+
+            Assert.Equal(1, preCallCount);
+            Assert.Equal(0, postCallCount);
+        }
+        finally
+        {
+            NativeAPI.RemoveListener("OnEntityTakeDamagePre", preCallback);
+            NativeAPI.RemoveListener("OnEntityTakeDamagePre", secondCallback);
+            NativeAPI.RemoveListener("OnEntityTakeDamagePost", postCallback);
+        }
     }
 
     private static void DealDamageFunc(CCSPlayerController attacker, CCSPlayerController victim, int damage,

managed/CounterStrikeSharp.Tests.Native/VirtualFunctionTests.cs

@@ -55,10 +55,18 @@ public async Task ShouldPreventPostHooks()
             return HookResult.Continue;
         };
 
-        VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Hook(preHookHandler, HookMode.Pre);
-        VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Hook(postHookHandler, HookMode.Post);
+        try
+        {
+            VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Hook(preHookHandler, HookMode.Pre);
+            VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Hook(postHookHandler, HookMode.Post);
 
-        await WaitOneFrame();
-        mock.Verify(s => s(), Times.Never, "Post hook should not be called if pre hook returns Stop.");
+            await WaitOneFrame();
+            mock.Verify(s => s(), Times.Never, "Post hook should not be called if pre hook returns Stop.");
+        }
+        finally
+        {
+            VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Unhook(preHookHandler, HookMode.Pre);
+            VirtualFunctions.CCSPlayerPawnBase_PostThinkFunc.Unhook(postHookHandler, HookMode.Post);
+        }
     }
 }