Comments

Author: jjxtra

IPBanCore/Core/IPBan/IPBanService.cs

@@ -535,6 +535,7 @@ public override DateTime FromSystemTime(DateTime systemTime)
         public static T CreateAndStartIPBanTestService<T>(string directory = null, string configFileName = null, string defaultBannedIPAddressHandlerUrl = null,
             Func<string, string> configFileModifier = null, bool cleanup = true) where T : IPBanService
         {
+            // if not running tests, do nothing
             if (!UnitTestDetector.Running)
             {
                 return default;
@@ -603,6 +604,7 @@ public static T CreateAndStartIPBanTestService<T>(string directory = null, strin
         /// </summary>
         public static void CleanupIPBanTestFiles()
         {
+            // if not running tests, do nothing
             if (!UnitTestDetector.Running)
             {
                 return;
@@ -623,6 +625,7 @@ public static void CleanupIPBanTestFiles()
         /// <param name="service">Service to dispose</param>
         public static void DisposeIPBanTestService(IPBanService service)
         {
+            // if not running tests, do nothing
             if (!UnitTestDetector.Running)
             {
                 return;

IPBanCore/Core/Interfaces/IBannedIPAddressHandler.cs

@@ -78,6 +78,7 @@ public async Task HandleBannedIPAddress(string ipAddress, string source, string
 
 #if DEBUG
 
+            // don't run this when debugging app locally outside tests
             if (!UnitTestDetector.Running)
             {
                 return;

IPBanCore/Core/Utility/ExtensionMethods.cs

@@ -930,7 +930,7 @@ public static IReadOnlyCollection<Type> GetAllTypes()
                 prefix = prefix[..pos];
             }
 
-            // no filter if running unit tests
+            // no filter if running unit tests, need to scan all assemblies
             if (UnitTestDetector.Running)
             {
                 prefix = null;

IPBanCore/Core/Utility/UnitTestDetector.cs

@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 
 using System;
+using System.Linq;
 
 namespace DigitalRuby.IPBanCore
 {
@@ -43,19 +44,16 @@ static UnitTestDetector()
         {
             try
             {
+                // test host
                 if ((System.Reflection.Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty).StartsWith("testhost", StringComparison.OrdinalIgnoreCase))
                 {
                     Running = true;
-                    return;
                 }
-
-                foreach (System.Reflection.Assembly assem in AppDomain.CurrentDomain.GetAssemblies())
+                else
                 {
-                    if (assem.FullName.ToLowerInvariant().StartsWith("nunit.framework"))
-                    {
-                        Running = true;
-                        break;
-                    }
+                    // nunit
+                    Running = AppDomain.CurrentDomain.GetAssemblies()
+                        .Any(a => a.FullName.Equals("nunit.framework", StringComparison.OrdinalIgnoreCase));
                 }
             }
             catch (Exception ex)