Fixed IsAlive calculation in FbConnectionPoolManager.Pool.IsAlive

Author: kmdtkg

.gitignore

@@ -7,4 +7,5 @@ obj
 packages
 DDEX/installer/out/
 DDEX/installer/in/
-Provider/deploy/out/
+Provider/deploy/out/
+.idea

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionPoolManager.cs

@@ -128,7 +128,7 @@ public void CleanupPool()
 					var available = _available.ToArray();
 					if (available.Count() <= _connectionString.MinPoolSize)
 						return;
-					var keep = available.Where(x => IsAlive(_connectionString.ConnectionLifeTime, x.Created, now)).ToArray();
+					var keep = available.Where(x => ConnectionPoolLifetimeHelper.IsAlive(_connectionString.ConnectionLifeTime, x.Created, now)).ToArray();
 					var keepCount = keep.Count();
 					if (keepCount < _connectionString.MinPoolSize)
 					{
@@ -159,13 +159,6 @@ static FbConnectionInternal CreateNewConnection(FbConnectionString connectionStr
 				return result;
 			}
 
-			static bool IsAlive(long connectionLifeTime, long created, long now)
-			{
-				if (connectionLifeTime == 0)
-					return true;
-				return (now - created) > (connectionLifeTime * 1000);
-			}
-
 			static long GetTicks()
 			{
 				var ticks = Environment.TickCount;
@@ -267,4 +260,14 @@ void CheckDisposed()
 				throw new ObjectDisposedException(nameof(FbConnectionPoolManager));
 		}
 	}
+
+	internal static class ConnectionPoolLifetimeHelper
+	{
+		internal static bool IsAlive(long connectionLifeTime, long created, long now)
+		{
+			if (connectionLifeTime == 0)
+				return true;
+			return (now - created) < (connectionLifeTime * 1000);
+		}
+	}
 }

Provider/src/FirebirdSql.Data.UnitTests/FbConnectionPoolManagerTest.cs

@@ -0,0 +1,28 @@
+using System;
+using FirebirdSql.Data.FirebirdClient;
+using NUnit.Framework;
+
+namespace FirebirdSql.Data.UnitTests
+{
+	[TestFixture()]
+	public class ConnectionPoolLifetimeHelperTest
+	{
+		[Test]
+		public void IsAliveTrueIfLifetimeNotExceed()
+		{
+			var timeAgo = Environment.TickCount - (10 * 1000); //10 seconds
+			var now = Environment.TickCount;
+			var isAlive = ConnectionPoolLifetimeHelper.IsAlive(20, timeAgo, now);
+			Assert.IsTrue(isAlive);
+		}
+
+		[Test]
+		public void IsAliveFalseIfLifetimeIsExceed()
+		{
+			var timeAgo = Environment.TickCount  - (30 * 1000); //30 seconds
+			var now = Environment.TickCount;
+			var isAlive = ConnectionPoolLifetimeHelper.IsAlive(20, timeAgo, now);
+			Assert.IsFalse(isAlive);
+		}
+	}
+}

Provider/src/FirebirdSql.Data.UnitTests/FirebirdSql.Data.UnitTests_NET45.csproj

@@ -57,6 +57,7 @@
 		<Compile Include="FbBooleanSupportTests.cs" />
 		<Compile Include="FbConnectionStringTests.cs" />
 		<Compile Include="FbConnectionStringBuilderTests.cs" />
+		<Compile Include="FbConnectionPoolManagerTest.cs" />
 		<Compile Include="FbExceptionTests.cs" />
 		<Compile Include="FbRemoteEventTests.cs" />
 		<Compile Include="FbTestFixtureAttribute.cs" />