GdsConnectionTests refactoring.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient.Tests/GdsConnectionTests.cs

@@ -1,41 +1,31 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using FirebirdSql.Data.Client.Managed;
+using NUnit.Framework;
 
 namespace FirebirdSql.Data.FirebirdClient.Tests
 {
 	[TestFixture]
-	class GdsConnectionTests
+	public class GdsConnectionTests
 	{
-		[Test, TestCaseSource(typeof(NormalizeLoginTestData), "TestCases")]
-		public string NormalizeLoginTest(string login)
+		static IEnumerable<TestCaseData> NormalizeLoginTestSource()
 		{
-			return Client.Managed.GdsConnection.NormalizeLogin(login);
+			yield return new TestCaseData("sysdba").Returns("SYSDBA");
+			yield return new TestCaseData("s").Returns("S");
+			yield return new TestCaseData("\"CaseSensitive\"").Returns("CaseSensitive");
+			yield return new TestCaseData("\"s\"").Returns("s");
+			yield return new TestCaseData("\"With\"\"EscapedQuote\"").Returns("With\"EscapedQuote");
+			yield return new TestCaseData("\"Invalid\"Escape\"").Returns("Invalid");
+			yield return new TestCaseData("\"DanglingInvalidEscape\"\"").Returns("DanglingInvalidEscape");
+			yield return new TestCaseData("\"EscapedQuoteAtEnd\"\"\"").Returns("EscapedQuoteAtEnd\"");
+			yield return new TestCaseData("\"StartNoEndQuote").Returns("\"STARTNOENDQUOTE");
+			yield return new TestCaseData("\"\"").Returns("\"\"");
+			yield return new TestCaseData("").Returns("");
+			yield return new TestCaseData(null).Returns(null);
 		}
-	}
-
-	class NormalizeLoginTestData
-	{
-		public static IEnumerable<TestCaseData> TestCases
+		[TestCaseSource(nameof(NormalizeLoginTestSource))]
+		public string NormalizeLoginTest(string login)
 		{
-			get
-			{
-				yield return new TestCaseData("sysdba").Returns("SYSDBA");
-				yield return new TestCaseData("s").Returns("S");
-				yield return new TestCaseData("\"CaseSensitive\"").Returns("CaseSensitive");
-				yield return new TestCaseData("\"s\"").Returns("s");
-				yield return new TestCaseData("\"With\"\"EscapedQuote\"").Returns("With\"EscapedQuote");
-				yield return new TestCaseData("\"Invalid\"Escape\"").Returns("Invalid");
-				yield return new TestCaseData("\"DanglingInvalidEscape\"\"").Returns("DanglingInvalidEscape");
-				yield return new TestCaseData("\"EscapedQuoteAtEnd\"\"\"").Returns("EscapedQuoteAtEnd\"");
-				yield return new TestCaseData("\"StartNoEndQuote").Returns("\"STARTNOENDQUOTE");
-				yield return new TestCaseData("\"\"").Returns("\"\"");
-				yield return new TestCaseData("").Returns("");
-				yield return new TestCaseData(null).Returns(null);
-			}
+			return GdsConnection.NormalizeLogin(login);
 		}
 	}
 }