Skip to content

Commit 5cb2181

Browse files
cheenamalhotracheenamalhotra
authored
Tests | Cleanup CheckConnStrSetupfact (#569)
1 parent 3ca3984 commit 5cb2181

File tree

36 files changed

+125
-142
lines changed

36 files changed

+125
-142
lines changed

‎src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
1212
public static class DDAsyncTest
1313
{
1414
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
15-
[CheckConnStrSetupFact]
15+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
1616
public static void OpenConnection_WithAsyncTrue_ThrowsNotSupportedException()
1717
{
1818
//Fails on NetCore
@@ -21,7 +21,7 @@ public static void OpenConnection_WithAsyncTrue_ThrowsNotSupportedException()
2121
}
2222

2323
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)]
24-
[CheckConnStrSetupFact]
24+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
2525
public static void OpenConnection_WithAsyncTrue()
2626
{
2727
// Passes on NetFx
@@ -30,7 +30,7 @@ public static void OpenConnection_WithAsyncTrue()
3030
}
3131

3232
#region <<ExecuteCommand_WithNewConnection>>
33-
[CheckConnStrSetupFact]
33+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
3434
public static void ExecuteCommand_WithNewConnection_ShouldPerformAsyncByDefault()
3535
{
3636
var executedProcessList = new List<string>();
@@ -75,7 +75,7 @@ private static async Task ExecuteCommandWithNewConnectionAsync(string processNam
7575
#endregion
7676

7777
#region <<ExecuteCommand_WithSharedConnection>>
78-
[CheckConnStrSetupFact]
78+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
7979
public static void ExecuteCommand_WithSharedConnection_ShouldPerformAsyncByDefault()
8080
{
8181
var executedProcessList = new List<string>();

‎src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
1212
{
1313
public static class DDDataTypesTest
1414
{
15-
[CheckConnStrSetupFact]
15+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
1616
public static void XmlTest()
1717
{
1818
string tempTable = "xml_" + Guid.NewGuid().ToString().Replace('-', '_');
@@ -73,7 +73,7 @@ public static void XmlTest()
7373
}
7474
}
7575

76-
[CheckConnStrSetupFact]
76+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
7777
public static void MaxTypesTest()
7878
{
7979
string tempTable = "max_" + Guid.NewGuid().ToString().Replace('-', '_');

‎src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
88
{
99
public static class DDMARSTest
1010
{
11-
[CheckConnStrSetupFact]
11+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
1212
public static void TestMain()
1313
{
1414
string connstr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true }).ConnectionString;

‎src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/CheckConnStrSetupFactAttribute.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategyCspExt.cs" />
5959
<Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
6060
<Compile Include="DataCommon\AADUtility.cs" />
61-
<Compile Include="DataCommon\CheckConnStrSetupFactAttribute.cs" />
6261
<Compile Include="SQL\DataClassificationTest\DataClassificationTest.cs" />
6362
<Compile Include="TracingTests\EventSourceTest.cs" />
6463
<Compile Include="SQL\AdapterTest\AdapterTest.cs" />

‎src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class MultipleResultsTest
1818
private StringBuilder _outputBuilder;
1919
private string[] _outputFilter;
2020

21-
[CheckConnStrSetupFact]
21+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
2222
public void TestMain()
2323
{
2424
Assert.True(RunTestCoreAndCompareWithBaseline());

‎src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
1111
{
1212
public static class ReaderTest
1313
{
14-
[CheckConnStrSetupFact]
14+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
1515
public static void TestMain()
1616
{
1717
string connectionString = DataTestUtility.TCPConnectionString;

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public AdapterTest()
6464
InitDataValues();
6565
}
6666

67-
[CheckConnStrSetupFact]
67+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
6868
public void SimpleFillTest()
6969
{
7070
using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -85,7 +85,7 @@ public void SimpleFillTest()
8585
}
8686
}
8787

88-
[CheckConnStrSetupFact]
88+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
8989
public void PrepUnprepTest()
9090
{
9191
// share the connection
@@ -171,7 +171,7 @@ public void PrepUnprepTest()
171171
}
172172
}
173173

174-
[CheckConnStrSetupFact]
174+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
175175
public void SqlVariantTest()
176176
{
177177
string tableName = DataTestUtility.GenerateObjectName();
@@ -265,7 +265,7 @@ public void SqlVariantTest()
265265
}
266266
}
267267

268-
[CheckConnStrSetupFact]
268+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
269269
public void ParameterTest_AllTypes()
270270
{
271271
string procName = DataTestUtility.GenerateObjectName();
@@ -477,7 +477,7 @@ public void ParameterTest_AllTypes()
477477
}
478478
}
479479

480-
[CheckConnStrSetupFact]
480+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
481481
public void ParameterTest_InOut()
482482
{
483483
string procName = DataTestUtility.GetUniqueName("P");
@@ -574,7 +574,7 @@ public void ParameterTest_InOut()
574574
}
575575
}
576576

577-
[CheckConnStrSetupFact]
577+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
578578
public void UpdateTest()
579579
{
580580
using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -658,7 +658,7 @@ public void UpdateTest()
658658

659659
// these next texts verify that 'bulk' operations work. If each command type modifies more than three rows, then we do a Prep/Exec instead of
660660
// adhoc ExecuteSql.
661-
[CheckConnStrSetupFact]
661+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
662662
public void BulkUpdateTest()
663663
{
664664
using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -755,7 +755,7 @@ public void BulkUpdateTest()
755755

756756
// Makes sure that we can refresh an identity column in the dataSet
757757
// for a newly inserted row
758-
[CheckConnStrSetupFact]
758+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
759759
public void UpdateRefreshTest()
760760
{
761761
string createIdentTable =
@@ -849,7 +849,7 @@ public void UpdateRefreshTest()
849849
}
850850
}
851851

852-
[CheckConnStrSetupFact]
852+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
853853
public void UpdateNullTest()
854854
{
855855
string tableName = DataTestUtility.GenerateObjectName();
@@ -905,7 +905,7 @@ public void UpdateNullTest()
905905
}
906906
}
907907

908-
[CheckConnStrSetupFact]
908+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
909909
public void UpdateOffsetTest()
910910
{
911911
string tableName = DataTestUtility.GenerateObjectName();
@@ -977,7 +977,7 @@ public void UpdateOffsetTest()
977977
}
978978
}
979979

980-
[CheckConnStrSetupFact]
980+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
981981
public void SelectAllTest()
982982
{
983983
// Test exceptions
@@ -990,7 +990,7 @@ public void SelectAllTest()
990990
}
991991

992992
// AutoGen test
993-
[CheckConnStrSetupFact]
993+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
994994
public void AutoGenUpdateTest()
995995
{
996996
using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -1061,7 +1061,7 @@ public void AutoGenUpdateTest()
10611061
}
10621062
}
10631063

1064-
[CheckConnStrSetupFact]
1064+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
10651065
public void AutoGenErrorTest()
10661066
{
10671067
string createIdentTable =
@@ -1106,7 +1106,7 @@ public void AutoGenErrorTest()
11061106

11071107
// These next tests verify that 'bulk' operations work. If each command type modifies more than three rows, then we do a Prep/Exec instead of
11081108
// adhoc ExecuteSql.
1109-
[CheckConnStrSetupFact]
1109+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
11101110
public void AutoGenBulkUpdateTest()
11111111
{
11121112
using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -1195,7 +1195,7 @@ public void AutoGenBulkUpdateTest()
11951195
}
11961196
}
11971197

1198-
[CheckConnStrSetupFact]
1198+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
11991199
public void TestDeriveParameters()
12001200
{
12011201
string procName = "Test_EmployeeSalesByCountry_" + _randomGuid + "";
@@ -1256,7 +1256,7 @@ public void TestDeriveParameters()
12561256
}
12571257
}
12581258

1259-
[CheckConnStrSetupFact]
1259+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
12601260
public void TestReadOnlyColumnMetadata()
12611261
{
12621262
using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
1111
public static class AsyncTest
1212
{
1313
[ActiveIssue(5533)]
14-
[CheckConnStrSetupFact]
14+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
1515
public static void TestReadAsyncTimeConsumed()
1616
{
1717
const string sql = "SET NOCOUNT ON"

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private static string GenerateCommandText()
3030
return commandText;
3131
}
3232

33-
[CheckConnStrSetupFact]
33+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
3434
public static void ExecuteTest()
3535
{
3636
using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -68,7 +68,7 @@ public static void ExecuteTest()
6868
}
6969
}
7070

71-
[CheckConnStrSetupFact]
71+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
7272
public static void FailureTest()
7373
{
7474
using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))

0 commit comments

Comments
 (0)