Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5cc8f36

Browse files
Keerat Singhsaurabh500
authored andcommitted
Conditionally execute IntegratedAuthenticationTest (#27857)
* Conditionally execute IntegratedAuthenticationTest based on "TEST_INTEGRATEDSECURITY_SETUP" ENV variable. * Updated conditional fact and made requested code changes. * Revert check for Conn Str setup for LocalDBTest.
1 parent 3760763 commit 5cc8f36

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

src/System.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,9 @@ public static string GetUniqueNameForSqlServer(string prefix)
6060
return name;
6161
}
6262

63-
public static bool IsLocalDBInstalled()
64-
{
65-
string localDBInstallationFlag = Environment.GetEnvironmentVariable("TEST_LOCALDB_INSTALLED");
66-
if (!string.IsNullOrWhiteSpace(localDBInstallationFlag))
67-
{
68-
int result;
69-
if (int.TryParse(localDBInstallationFlag.Trim(), out result))
70-
{
71-
return result == 1;
72-
}
73-
}
74-
return false;
75-
}
63+
public static bool IsLocalDBInstalled() => int.TryParse(Environment.GetEnvironmentVariable("TEST_LOCALDB_INSTALLED"), out int result) ? result == 1 : false;
64+
65+
public static bool IsIntegratedSecuritySetup() => int.TryParse(Environment.GetEnvironmentVariable("TEST_INTEGRATEDSECURITY_SETUP"), out int result) ? result == 1 : false;
7666

7767
private static bool CheckException<TException>(Exception ex, string exceptionMessage, bool innerExceptionMustBeNull) where TException : Exception
7868
{

src/System.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ namespace System.Data.SqlClient.ManualTesting.Tests
1515
{
1616
public static class IntegratedAuthenticationTest
1717
{
18-
[CheckConnStrSetupFact]
18+
private static bool IsIntegratedSecurityEnvironmentSet() => DataTestUtility.IsIntegratedSecuritySetup();
19+
private static bool AreConnectionStringsSetup() => DataTestUtility.AreConnStringsSetup();
20+
21+
22+
[ConditionalFact(nameof(IsIntegratedSecurityEnvironmentSet),nameof(AreConnectionStringsSetup))]
1923
public static void IntegratedAuthenticationTestWithConnectionPooling()
2024
{
2125
SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr);
@@ -24,7 +28,7 @@ public static void IntegratedAuthenticationTestWithConnectionPooling()
2428
TryOpenConnectionWithIntegratedAuthentication(builder.ConnectionString);
2529
}
2630

27-
[CheckConnStrSetupFact]
31+
[ConditionalFact(nameof(IsIntegratedSecurityEnvironmentSet), nameof(AreConnectionStringsSetup))]
2832
public static void IntegratedAuthenticationTestWithOutConnectionPooling()
2933
{
3034
SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr);

0 commit comments

Comments
 (0)