PR cleanup.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Common/ConnectionPoolLifetimeHelper.cs

@@ -0,0 +1,32 @@
+/*
+ *  Firebird ADO.NET Data provider for .NET and Mono
+ *
+ *     The contents of this file are subject to the Initial
+ *     Developer's Public License Version 1.0 (the "License");
+ *     you may not use this file except in compliance with the
+ *     License. You may obtain a copy of the License at
+ *     http://www.firebirdsql.org/index.php?op=doc&id=idpl
+ *
+ *     Software distributed under the License is distributed on
+ *     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ *     express or implied.  See the License for the specific
+ *     language governing rights and limitations under the License.
+ *
+ *  Copyright (c) 2017 @realic, Jiri Cincura (jiri@cincura.net)
+ *  All Rights Reserved.     
+ */
+
+using System;
+
+namespace FirebirdSql.Data.Common
+{
+	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.FirebirdClient/FirebirdClient/FbConnectionPoolManager.cs

@@ -260,14 +260,4 @@ 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/ConnectionPoolLifetimeHelperTests.cs

@@ -0,0 +1,47 @@
+/*
+ *  Firebird ADO.NET Data provider for .NET and Mono
+ *
+ *     The contents of this file are subject to the Initial
+ *     Developer's Public License Version 1.0 (the "License");
+ *     you may not use this file except in compliance with the
+ *     License. You may obtain a copy of the License at
+ *     http://www.firebirdsql.org/index.php?op=doc&id=idpl
+ *
+ *     Software distributed under the License is distributed on
+ *     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ *     express or implied.  See the License for the specific
+ *     language governing rights and limitations under the License.
+ *
+ *  Copyright (c) 2017 @realic, Jiri Cincura (jiri@cincura.net)
+ *  All Rights Reserved.     
+ */
+
+ using System;
+using FirebirdSql.Data.Common;
+using FirebirdSql.Data.FirebirdClient;
+using NUnit.Framework;
+
+namespace FirebirdSql.Data.UnitTests
+{
+	[TestFixture]
+	public class ConnectionPoolLifetimeHelperTests
+	{
+		[Test]
+		public void IsAliveTrueIfLifetimeNotExceed()
+		{
+			var now = 1_000_000;
+			var timeAgo = now - (10 * 1000);
+			var isAlive = ConnectionPoolLifetimeHelper.IsAlive(20, timeAgo, now);
+			Assert.IsTrue(isAlive);
+		}
+
+		[Test]
+		public void IsAliveFalseIfLifetimeIsExceed()
+		{
+			var now = 1_000_000;
+			var timeAgo = now - (30 * 1000);
+			var isAlive = ConnectionPoolLifetimeHelper.IsAlive(20, timeAgo, now);
+			Assert.IsFalse(isAlive);
+		}
+	}
+}

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

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