[4.1][Tests] Remove NoneVBS connection string from test setup (dotnet#1569)

Johnny Pham · web-flow · commit 7cf528612832 · 2022-03-31T11:12:37.000-07:00
* Update DataTestUtility.cs

* Update TcpDefaultForAzureTest.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -153,7 +153,6 @@ static DataTestUtility()
                 if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))
                 {
                     AEConnStrings.Add(TCPConnectionStringNoneVBS);
-                    AEConnStringsSetup.Add(TCPConnectionStringNoneVBS);
                 }
 
                 if (!string.IsNullOrEmpty(TCPConnectionStringAASSGX))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs
@@ -42,7 +42,11 @@ static TcpDefaultForAzureTest()
         public static void NonAzureNoProtocolConnectionTestWindows()
         {
             builder.DataSource = InvalidHostname;
+#if NETFRAMEWORK
+            CheckConnectionFailure(builder.ConnectionString, NP);
+#else
             CheckConnectionFailure(builder.ConnectionString, DataTestUtility.IsUsingManagedSNI() ? TCP : NP);
+#endif
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ static DataTestUtility()`
`153`	`153`	`if (!string.IsNullOrEmpty(TCPConnectionStringNoneVBS))`
`154`	`154`	`{`
`155`	`155`	`AEConnStrings.Add(TCPConnectionStringNoneVBS);`
`156`		`- AEConnStringsSetup.Add(TCPConnectionStringNoneVBS);`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`if (!string.IsNullOrEmpty(TCPConnectionStringAASSGX))`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ static TcpDefaultForAzureTest()`
`42`	`42`	`public static void NonAzureNoProtocolConnectionTestWindows()`
`43`	`43`	`{`
`44`	`44`	`builder.DataSource = InvalidHostname;`
	`45`	`+#if NETFRAMEWORK`
	`46`	`+ CheckConnectionFailure(builder.ConnectionString, NP);`
	`47`	`+#else`
`45`	`48`	`CheckConnectionFailure(builder.ConnectionString, DataTestUtility.IsUsingManagedSNI() ? TCP : NP);`
	`49`	`+#endif`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]`