diff --git a/build.proj b/build.proj index b8ac7d44ed..0530733298 100644 --- a/build.proj +++ b/build.proj @@ -339,13 +339,13 @@ TestSet Applies to: TestSqlClientManual Description: Used to select a set of tests to run from the SqlClient manual tests project. If not - specified, all tests will be executed. + specified, all manual tests will be executed. In the manual test target, this + value is converted into a Set trait filter and combined with any TestFilters. Default value: [blank] Allowed values: ([1][2][3][AE]) Examples: "1", "12", "AE", "12AE" --> - -p:TestSet="$(TestSet)" @@ -650,14 +650,27 @@ $(LogFilePrefix)-$(TestFramework) $(LogFilePrefix)-$(TestSet) + + $(TestSet.ToUpper()) + Set=1 + $(TestSetFilter)|Set=2 + $(TestSetFilter)|Set=3 + $(TestSetFilter)|Set=AE + $(TestSetFilter.Trim('|')) + + + $(TestFilters)&($(TestSetFilter)) + $(TestFilters) + $(TestSetFilter) + --filter "$(ManualTestFilters)" + "$(DotnetPath)dotnet" test "$(SqlClientManualTestProjectPath)" -p:Configuration=$(Configuration) $(TestBlameArgument) $(TestCodeCoverageArgument) - $(TestFiltersArgument) + $(ManualTestFiltersArgument) $(TestFrameworkArgument) - $(TestSetArgument) --results-directory "$(TestResultsFolderPath)" --logger:"trx;LogFilePrefix=$(LogFilePrefix)" diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx index d65c3edc90..83a42c1c2c 100644 --- a/src/Microsoft.Data.SqlClient.slnx +++ b/src/Microsoft.Data.SqlClient.slnx @@ -209,10 +209,10 @@ - - - - - + + + + + diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj index 8fe4c2be23..13673697db 100644 --- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj @@ -77,7 +77,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs index 8a56a7690c..53232b1431 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class AKVTest : IClassFixture { private readonly SQLSetupStrategyAzureKeyVault _fixture; @@ -59,12 +60,12 @@ public void TestEncryptDecryptWithAKV() } /* - This unit test is going to assess an issue where a failed decryption leaves a connection in a bad state + This unit test is going to assess an issue where a failed decryption leaves a connection in a bad state when it is returned to the connection pool. If a subsequent connection is retried it will result in an "Internal connection fatal error", - which causes that connection to be doomed, preventing it from being returned to the pool. + which causes that connection to be doomed, preventing it from being returned to the pool. Consequently, retrying a third connection will encounter the same decryption error, leading to a repetitive failure cycle. - The purpose of this unit test is to simulate a decryption error and verify that the connection remains usable when returned to the pool. + The purpose of this unit test is to simulate a decryption error and verify that the connection remains usable when returned to the pool. It aims to confirm that three consecutive connections will consistently fail with the "Failed to decrypt column" error. */ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsAKVSetupAvailable))] @@ -100,10 +101,10 @@ public void ForcedColumnDecryptErrorTestShouldFail() // does not leave the connection in a bad state. // In each try, when a "Failed to decrypt error" is thrown, the connection's TDS Parser state object buffer is drained of any // pending data so it does not interfere with future operations. In addition, the TDS parser state object's reader.DataReady flag - // is set to false so that the calling function that catches the exception will not continue to use the reader. Otherwise, it will + // is set to false so that the calling function that catches the exception will not continue to use the reader. Otherwise, it will // timeout waiting to read data that doesn't exist. Also, the TDS Parser state object HasPendingData flag is also set to false // to indicate that the buffer has been cleared and to avoid it getting cleared again in SqlDataReader.TryCloseInternal function. - // Finally, after successfully handling the decryption error, the connection is then returned back to the connection pool without + // Finally, after successfully handling the decryption error, the connection is then returned back to the connection pool without // an error. A proof that the connection's state object is clean is in the second connection being able to throw the same error. // The third connection is for making sure we test 3 times as the minimum number of connections to reproduce the issue previously. for (int i = 0; i < 3; i++) @@ -182,7 +183,7 @@ public void TestLocalCekCacheIsScopedToProvider() sqlDataReader2.Close(); // global cek cache and local cek cache are populated above - // when using a new per-command provider, it will only use its local cek cache + // when using a new per-command provider, it will only use its local cek cache // the following query should fail due to an empty cek cache and invalid credentials customProvider[SqlColumnEncryptionAzureKeyVaultProvider.ProviderName] = new SqlColumnEncryptionAzureKeyVaultProvider(new ClientSecretCredential("tenant", "client", "secret")); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs index 54c0c12192..c8c3820978 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class AKVUnitTests : IClassFixture { const string EncryptionAlgorithm = "RSA_OAEP"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs index 1c16e90ac4..0343b9b355 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -21,6 +21,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted /// /// Always Encrypted public API Manual tests. /// + [Trait("Set", "AE")] public sealed class ApiShould : IClassFixture, IDisposable { private SQLSetupStrategy _fixture; @@ -1914,7 +1915,7 @@ public void TestExecuteXmlReader(string connection) IList values = GetValues(dataHint: 60); int numberOfRows = 10; - // Insert a bunch of rows in to the table. + // Insert a bunch of rows in to the table. int rowsAffected = InsertRows(tableName: _tableName, numberofRows: numberOfRows, values: values, connection: connection); Assert.True(rowsAffected == numberOfRows, "number of rows affected is unexpected."); @@ -1922,12 +1923,12 @@ public void TestExecuteXmlReader(string connection) { sqlConnection.Open(); - // select the set of rows that were inserted just now. + // select the set of rows that were inserted just now. using (SqlCommand sqlCommand = new SqlCommand($"SELECT LastName FROM [{_tableName}] WHERE FirstName = @FirstName AND CustomerId = @CustomerId FOR XML AUTO;", sqlConnection, transaction: null, columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled)) { if (DataTestUtility.EnclaveEnabled) { - //Increase Time out for enclave-enabled server. + //Increase Time out for enclave-enabled server. sqlCommand.CommandTimeout = 90; } sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int); @@ -2031,7 +2032,7 @@ public void TestSqlCommandCancel(string connection, string value) * Use long-running tasks to create the thread. This enables any failed assertions to propagate, rather than * allowing the exception to kill the thread and the process. * These threads should progress in the sequence below: - * + * * Workload Thread | Cancel Thread * ------------------------------------ | ------------- * Start thread | Start thread @@ -2307,7 +2308,7 @@ public void TestConnectionCustomKeyStoreProviderDuringAeQuery(string connectionS () => ExecuteQueryThatRequiresCustomKeyStoreProvider(connection)); AssertExceptionCausedByFailureToDecrypt(ex); - // not required provider will replace the previous entry so required provider will not be found + // not required provider will replace the previous entry so required provider will not be found connection.RegisterColumnEncryptionKeyStoreProvidersOnConnection(_notRequiredProvider); ex = Assert.Throws( () => ExecuteQueryThatRequiresCustomKeyStoreProvider(connection)); @@ -2448,7 +2449,7 @@ public void TestRetryWhenAEParameterMetadataCacheIsStale(string connectionString cmd.CommandText = string.Format(alterCekQueryFormatString, _tableName, table.columnEncryptionKey2.Name); cmd.ExecuteNonQuery(); - // execute the select query again. it will attempt to use the stale cache entry, receive + // execute the select query again. it will attempt to use the stale cache entry, receive // a retryable error from the server, remove the stale cache entry, retry and succeed cmd.CommandText = enclaveSelectQuery; cmd.Parameters.AddWithValue("@CustomerId", 0); @@ -2562,7 +2563,7 @@ public void TestRetryWhenAEEnclaveCacheIsStale(string connectionString) readAsyncTask2.GetAwaiter().GetResult(); #endif */ - + // revert the CEK change to the CustomerId column cmd.Parameters.Clear(); cmd.CommandText = string.Format(alterCekQueryFormatString, _tableName, table.columnEncryptionKey1.Name); @@ -2699,8 +2700,8 @@ private DataTable CreateDataTable(string tableName, int numberofRows) }; table.Columns.Add(column); - // Create three new DataRow objects and add - // them to the DataTable + // Create three new DataRow objects and add + // them to the DataTable for (int i = 0; i < numberofRows; i++) { row = table.NewRow(); @@ -2810,7 +2811,7 @@ private async Task VerifyExecuteScalarAsync(SqlCommand sqlCommand) } /// - /// + /// /// /// /// @@ -2821,7 +2822,7 @@ private async Task ExecuteNonQueryAsync(SqlCommand sqlCommand, CancellationToken } /// - /// + /// /// /// /// diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs index c0b80fe977..eee3a71ebb 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted /// /// Always Encrypted public API Manual tests. /// + [Trait("Set", "AE")] public sealed class BulkCopyAE : IClassFixture, IDisposable { private SQLSetupStrategy fixture; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs index a824575f6f..b08b8eb325 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted /// /// Always Encrypted public API Manual tests. /// + [Trait("Set", "AE")] public class BulkCopyAEErrorMessage : IClassFixture { private SQLSetupStrategy _fixture; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs index d7435b95af..7ed66d6708 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public sealed class ColumnDecryptErrorTests : IClassFixture, IDisposable { private SQLSetupStrategyAzureKeyVault fixture; @@ -28,13 +29,13 @@ public ColumnDecryptErrorTests(SQLSetupStrategyAzureKeyVault context) * properly reset before being returned to the pool. If this doesn't happen, then random bytes * may be left in the connection's state. These can interfere with the next operation that utilizes * the connection. - * + * * We test that state is properly reset by triggering the same error condition twice. Routing column key discovery - * away from AKV toward a dummy key store achieves this. Each connection pulls from a pool of max - * size one to ensure we are using the same internal connection/socket both times. We expect to + * away from AKV toward a dummy key store achieves this. Each connection pulls from a pool of max + * size one to ensure we are using the same internal connection/socket both times. We expect to * receive the "Failed to decrypt column" exception twice. If the state were not cleaned properly, * the second error would be different because the TDS stream would be unintelligible. - * + * * Finally, we assert that restoring the connection to AKV allows a successful query. */ [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore), nameof(DataTestUtility.IsAKVSetupAvailable))] @@ -75,7 +76,7 @@ public void TestCleanConnectionAfterDecryptFail(string connString, string select using SqlCommand sqlCommand = new SqlCommand(string.Format(selectQuery, tableName), sqlConnection, null, SqlCommandColumnEncryptionSetting.Enabled); - + using SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(); Assert.True(sqlDataReader.HasRows, "FAILED: Select statement did not return any rows."); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs index f54609e2c0..5574b83c45 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information.using System; @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public sealed class ConversionTests : IDisposable, IClassFixture { @@ -621,7 +622,7 @@ private void AdjustSizePrecisionAndScale(ref ColumnMetaData largeColumnMeta, ref if (TypeHasSize(largeColumnMeta.ColumnType)) { - // 20% of the time use (max) as the length. + // 20% of the time use (max) as the length. largeColumnMeta.UseMax = (largeColumnMeta.ColumnType is SqlDbType.VarChar || largeColumnMeta.ColumnType is SqlDbType.NVarChar || largeColumnMeta.ColumnType is SqlDbType.VarBinary) && @@ -683,7 +684,7 @@ largeColumnMeta.ColumnType is SqlDbType.NVarChar || { smallColumnMeta.Precision = 0; - // For Time / DateTime2 / DateTimeOffset types, actual scale is set to 7 when parameter.scale is zero. + // For Time / DateTime2 / DateTimeOffset types, actual scale is set to 7 when parameter.scale is zero. // Active Issue in SQLParameter.cs when user wants to specify zero as the actual scale. smallColumnMeta.Scale = random.Next(minScale, largeColumnMeta.Scale); } diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs index acb2e9278c..27b78acd10 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted /// Always Encrypted public CspProvider Manual tests. /// // TODO: These tests are marked as Windows only for now but should be run for all platforms once the Master Key is accessible to this app from Azure Key Vault. + [Trait("Set", "AE")] [PlatformSpecific(TestPlatforms.Windows)] public class CspProviderExt { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs index 4c0900a68b..f91788c9c1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public sealed class DateOnlyReadTests : IClassFixture, IDisposable { private SQLSetupStrategy fixture; @@ -41,10 +42,10 @@ public void TestSelectOnEncryptedNonEncryptedColumns(string connString, string s // insert 1 row data CustomerDateOnly customer = new CustomerDateOnly( - 45, - "Microsoft", - "Corporation", - new DateOnly(2001, 1, 31), + 45, + "Microsoft", + "Corporation", + new DateOnly(2001, 1, 31), new TimeOnly(18, 36, 45)); DatabaseHelper.InsertCustomerDateOnlyData(sqlConn, null, tableName, customer); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs index 536be83a3e..4de82d39b7 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information.using System; @@ -14,6 +14,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { // This test class is for internal use only + [Trait("Set", "AE")] public sealed class EnclaveAzureDatabaseTests : IDisposable, IClassFixture { private ColumnMasterKey akvColumnMasterKey; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs index a9c30646ae..6581fcf2e8 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public sealed class End2EndSmokeTests : IClassFixture, IDisposable { private SQLSetupStrategy fixture; @@ -160,13 +161,13 @@ public IEnumerator GetEnumerator() { foreach (string connStrAE in DataTestUtility.AEConnStrings) { - yield return new object[] { - connStrAE, + yield return new object[] { + connStrAE, true, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 2, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ @@ -177,13 +178,13 @@ public IEnumerator GetEnumerator() @"Microsoft" /*input parameter value*/} }; - yield return new object[] { + yield return new object[] { connStrAE, true, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ @@ -191,13 +192,13 @@ public IEnumerator GetEnumerator() 45, /*input parameter value*/} }; - yield return new object[] { + yield return new object[] { connStrAE, true, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where FirstName = @FirstName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"FirstName", /*input parameter name*/ @@ -210,8 +211,8 @@ public IEnumerator GetEnumerator() true, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where LastName = @LastName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"LastName", /*input parameter name*/ @@ -224,7 +225,7 @@ public IEnumerator GetEnumerator() true, /*sync*/ @"select CustomerId, FirstName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName", 2, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ @"string", /*unencrypted datatype of second column in select statement*/}, 2, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ @@ -240,8 +241,8 @@ public IEnumerator GetEnumerator() false, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 2, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ @@ -257,8 +258,8 @@ public IEnumerator GetEnumerator() false, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ @@ -271,8 +272,8 @@ public IEnumerator GetEnumerator() false, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where FirstName = @FirstName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"FirstName", /*input parameter name*/ @@ -285,8 +286,8 @@ public IEnumerator GetEnumerator() false, /*sync*/ @"select CustomerId, FirstName, LastName from [{0}] where LastName = @LastName", 3, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ - @"string", /*unencrypted datatype of second column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + @"string", /*unencrypted datatype of second column in select statement*/ @"string" /*datatype of third column in select statement*/}, 1, /*no:of input parameters*/ new object[] { @"LastName", /*input parameter name*/ @@ -299,7 +300,7 @@ public IEnumerator GetEnumerator() false, /*sync*/ @"select CustomerId, FirstName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName", 2, /*total number of columns in select statement*/ - new string[] { @"int", /*unencrypted datatype of first column in select statement*/ + new string[] { @"int", /*unencrypted datatype of first column in select statement*/ @"string", /*unencrypted datatype of second column in select statement*/}, 2, /*no:of input parameters*/ new object[] { @"CustomerId", /*input parameter name*/ diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs index 15679176ac..9f006c3f55 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class ExceptionTestAKVStore : IClassFixture { private const string MasterKeyEncAlgo = "RSA_OAEP"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs index 1e3a00931a..00e45951db 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class ExceptionsGenericErrors : IClassFixture { [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsNotAzureServer), Skip = "ActiveIssue 10036")] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs index 0bc6d63545..b80ed2c861 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class SqlBulkCopyTruncation : IClassFixture { private SQLSetupStrategy _fixture; @@ -416,7 +417,7 @@ public void BulkCopySmallBinary(string connectionString) try { DoBulkCopy(tableNames["TabSmallBinarySource"], tableNames["TabSmallBinaryTarget"], connectionString); - // Verify its 8000 + // Verify its 8000 using (SqlConnection conn = new SqlConnection(GetOpenConnectionString(connectionString, true))) { conn.Open(); @@ -548,7 +549,7 @@ internal void TruncateTables(string sourceName, string targetName, string connec } /// - /// + /// /// /// /// diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs index c69a3cc314..f409a7db77 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public sealed class SqlNullValuesTests : IClassFixture, IDisposable { private SQLSetupStrategy fixture; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs index 5a4d3579be..b8ca21a68f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted { + [Trait("Set", "AE")] public class TestTrustedMasterKeyPaths : IClassFixture { private readonly string dummyThumbprint; @@ -68,8 +69,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithNullDictionary(string c // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { @@ -113,8 +114,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithOneServer(string connec // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { @@ -171,8 +172,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithMultipleServers(string // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { @@ -217,8 +218,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithInvalidInputs(string co // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { @@ -249,8 +250,8 @@ FROM [{tableName}] // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { @@ -283,8 +284,8 @@ FROM [{tableName}] // Test INPUT parameter on an encrypted parameter using (SqlCommand sqlCommand = new SqlCommand( - $@"SELECT CustomerId, FirstName, LastName - FROM [{tableName}] + $@"SELECT CustomerId, FirstName, LastName + FROM [{tableName}] WHERE FirstName = @firstName", sqlConnection)) { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs index bb1fd24a1f..ec2d5f060e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class DDAsyncTest { #region <> diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs index eda1a2c788..320102318e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class DDDataTypesTest { // Synapse: Cannot find data type 'XML'. diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs index ad057e587d..33dbf2600a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -6,6 +6,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class DDMARSTest { // TODO Synapse: Remove dependency from Northwind database diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj index 1145fa4790..4b0dfb6ddd 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj @@ -4,9 +4,6 @@ ManualTests Microsoft.Data.SqlClient.ManualTests true - - - false @@ -20,246 +17,8 @@ $(TargetFrameworks);net462 - - - - - - - 123AE - $(TestSet.ToLower()) - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - xunit.runner.json - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest @@ -277,53 +36,28 @@ PreserveNewest TvpColumnBoundaries_Azure.bsl - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + PreserveNewest + xunit.runner.json + + + PreserveNewest + CodeCoverage.runsettings + @@ -370,12 +104,12 @@ - - - - + + + + @@ -396,11 +130,11 @@ - - - - + + + + diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs index bf1551373b..a04d8df76a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class MultipleResultsTest { private const string ResultSet1_Message = "0"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs index 50e2b9253c..0743e8fad9 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class ReaderTest { // TODO Synapse: Remove dependency from Northwind database diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs index e99192732d..e5616776b1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class AADFedAuthTokenRefreshTest { private readonly ITestOutputHelper _testOutputHelper; @@ -31,7 +32,7 @@ public void FedAuthTokenRefreshTest() #pragma warning disable 0618 // Type or member is obsolete SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId)); #pragma warning restore 0618 // Type or member is obsolete - + string connectionString = DataTestUtility.AADPasswordConnectionString; using SqlConnection connection = new SqlConnection(connectionString); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs index 798890c3fa..960f3ee822 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class AdapterTest { private char[] _appendNewLineIndentBuffer = new char[0]; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs index 9dd87d8f21..60b509683a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public class AsyncCancelledConnectionsTest { /// @@ -193,7 +194,7 @@ private async Task TimeBombAsync(SqlCommand command) delayMs = _random.Next(100, 3000); } await Task.Delay(delayMs); - + // Cancel the command command.Cancel(); } diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs index bc514dce92..1c0abdc5d7 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public static class AsyncTimeoutTest { static string delayQuery2s = "WAITFOR DELAY '00:00:02'"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs index cdf89fbac1..131d2f38f3 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public static class BeginExecAsyncTest { private static string GenerateCommandText() diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs index daa58b1851..65eeec5229 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public static class BeginExecReaderAsyncTest { private static string GenerateCommandText() diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs index 8be5437b9f..780edfa8bf 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public static class XmlReaderAsyncTest { private const string CommandText = diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs index 991d55cdeb..01d54f2462 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class BatchTests { @@ -379,8 +380,8 @@ public static void ParameterInOutAndReturn() { string create = @" -CREATE PROCEDURE TestInAndOutParams - @Input int, +CREATE PROCEDURE TestInAndOutParams + @Input int, @InOut int OUTPUT, @Output int = default OUTPUT AS diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs index 160f7f550e..92db4f1101 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class ConfigurableIpPreferenceTest { private const string CnnPrefIPv6 = ";IPAddressPreference=IPv6First"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs index d3d41d4c9a..e843e108be 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs @@ -19,6 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// /// Connection pool stress test to validate pool behavior under various concurrent load scenarios. /// + [Trait("Set", "3")] public class ConnectionPoolStressTest { #region Properties @@ -111,7 +112,7 @@ private bool DoomMicrosoftDataConnection(SqlConnection connection) #region Configuration /// - /// Sets up connection string + /// Sets up connection string /// /// Connection string to be set. internal void SetConnectionString(string connectionString) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs index 130ef02934..b2ad4f6fd1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests // xUnit won't run tests in an abstract class. // // public static class ConnectionPoolTestDebug + [Trait("Set", "3")] public abstract class ConnectionPoolTestDebug { [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsUsingManagedSNI))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs index 0d9b076dd2..4451710963 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class ConnectionPoolConnectionStringProvider : IEnumerable { private static readonly string _TCPConnectionString = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs index 6d14f6fbd8..84f779cf96 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class PoolBlockPeriodTest { private const string AzureEndpointSample = "nonexistent.database.windows.net"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs index 6e358cc63a..96432c8bd6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs @@ -8,11 +8,12 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)] public static class TransactionPoolTest { /// - /// Tests if connections in a distributed transaction are put into a transaction pool. Also checks that clearallpools + /// Tests if connections in a distributed transaction are put into a transaction pool. Also checks that clearallpools /// does not clear transaction connections and that the transaction root is put into "stasis" when closed /// Synapse: only supports local transaction request. /// diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs index 32780dcfe6..36dda08cb2 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] [PlatformSpecific(TestPlatforms.Windows)] public class CertificateTest : IDisposable { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs index bb1bb8b5f2..828a87d63e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs @@ -19,6 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public class CertificateTestWithTdsServer : IDisposable { private static readonly string s_fullPathToPowershellScript = Path.Combine(Directory.GetCurrentDirectory(), "makepfxcert.ps1"); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs index 3c68e6dafd..b60b4a1e9e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class AADConnectionTest { private static void ConnectAndDisconnect(string connectionString, SqlCredential credential = null) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs index 5b108400b0..2df2ddcd51 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class ConnectionBehaviorTest { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs index 28955b39ff..fbbee8db26 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class ConnectivityTest { private const string COL_SPID = "SPID"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs index f8271dfdc4..1ee593279b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] [OuterLoop("Takes minutes on some networks")] public static class TcpDefaultForAzureTest { @@ -35,7 +36,7 @@ static TcpDefaultForAzureTest() // Synapse: Named Pipes not supported for Azure Synapse // Expected protocol TCP Provider in the error message, but received: A network-related or instance-specific error occurred while establishing a connection to SQL Server. - // The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. + // The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. // (provider: Named Pipes Provider, error: 40 - Could not open a connection to SQL Server) [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [PlatformSpecific(TestPlatforms.Windows)] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs index a23efff073..555005618a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,14 +10,15 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class DNSCachingTest { public static Assembly systemData = Assembly.GetAssembly(typeof(SqlConnection)); public static Type SQLFallbackDNSCacheType = systemData.GetType("Microsoft.Data.SqlClient.SQLFallbackDNSCache"); public static Type SQLDNSInfoType = systemData.GetType("Microsoft.Data.SqlClient.SQLDNSInfo"); public static MethodInfo SQLFallbackDNSCacheGetDNSInfo = SQLFallbackDNSCacheType.GetMethod("GetDNSInfo", BindingFlags.Instance | BindingFlags.NonPublic); - - + + [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))] public void DNSCachingIsSupportedFlag() { @@ -37,21 +38,21 @@ public void DNSCachingIsSupportedFlag() Assert.Equal(expectedDNSCachingSupportedTR, isSupportedStateTR); } } - + [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))] public void DNSCachingGetDNSInfo() - { + { using(SqlConnection connection = new SqlConnection(DataTestUtility.DNSCachingConnString)) { connection.Open(); } var SQLFallbackDNSCacheInstance = SQLFallbackDNSCacheType.GetProperty("Instance", BindingFlags.Static | BindingFlags.Public).GetValue(null); - + var serverList = new List>(); serverList.Add(new KeyValuePair(DataTestUtility.DNSCachingServerCR, DataTestUtility.IsDNSCachingSupportedCR)); serverList.Add(new KeyValuePair(DataTestUtility.DNSCachingServerTR, DataTestUtility.IsDNSCachingSupportedTR)); - + foreach(var server in serverList) { object[] parameters; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs index 028447251c..0589cd8844 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class ConnectionSchemaTest { public static bool CanRunSchemaTests() diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs index ce5174b6ca..b2322baa92 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class DataClassificationTest { private static string s_tableName; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs index 5199922174..4b0ef2e8a1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs @@ -9,12 +9,13 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class DataReaderCancellationTest { /// /// Test ensures cancellation token is registered before ReadAsync starts processing results from TDS Stream, /// such that when Cancel is triggered, the token is capable of canceling reading further results. - /// Synapse: Incompatible query. + /// Synapse: Incompatible query. /// /// Async Task [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs index 380978f049..cf85112559 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs @@ -14,6 +14,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class DataReaderStreamsTest { [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs index aad117b336..2a2132dbcb 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -19,6 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class DataReaderTest { private static readonly object s_rowVersionLock = new(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs index 38d4685537..976260e98c 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs @@ -6,6 +6,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.DataSourceParserTest { + [Trait("Set", "3")] public class DataSourceParserTest { [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotAzureSynapse))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs index a49e14de6e..17c760ace9 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class DataStreamTest { private readonly string _testName; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs index b313d89e24..0867164cff 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class DateTimeTest { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs index c44ed97ed0..2d5162bcb2 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class ConnectionExceptionTest { // test connection string diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs index 4179b7bf4b..81dbd0e35d 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class ExceptionTest { // data value and server consts diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs index 42a2331be6..e2e25a469e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class InstanceNameTest { private const char SemicolonSeparator = ';'; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs index 5342448af5..69acede640 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class IntegratedAuthenticationTest { private static bool IsIntegratedSecurityEnvironmentSet() => DataTestUtility.IsIntegratedSecuritySetup(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs index 06b76c7ed4..e9ad8be557 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs @@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest { + [Trait("Set", "3")] public class JsonBulkCopyTest { private readonly ITestOutputHelper _output; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs index 3cb0f1b534..eef2902932 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs @@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class JsonRecord { public int Id { get; set; } diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs index 2b2fd2c8db..887482ed95 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs @@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class JsonTest { private const string JsonDataString = "[{\"name\":\"Dave\",\"skills\":[\"Python\"]},{\"name\":\"Ron\",\"surname\":\"Peter\"}]"; @@ -96,7 +97,7 @@ public void TestJsonWrite() int rowsAffected = command.ExecuteNonQuery(); ValidateRowsAffected(rowsAffected); - //Test 2 + //Test 2 //Write a SqlString type as json parameter.Value = new SqlString(JsonDataString); int rowsAffected2 = command.ExecuteNonQuery(); @@ -141,7 +142,7 @@ public async Task TestJsonWriteAsync() int rowsAffected = await command.ExecuteNonQueryAsync(); ValidateRowsAffected(rowsAffected); - //Test 2 + //Test 2 //Write a SqlString type as json parameter.Value = new SqlString(JsonDataString); int rowsAffected2 = await command.ExecuteNonQueryAsync(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs index c6026088f4..e7d22907e0 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class KerberosTests { [PlatformSpecific(TestPlatforms.AnyUnix)] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs index c3aed471c0..f1fc1bb1a3 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. using System; @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class LocalDBTest { private enum InfoType diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs index 14b5ab54c4..e84c9fabb6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class MarsSessionPoolingTest { private const int ConcurrentCommands = 5; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs index 1213c5bfa4..a067ad841a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class MARSTest { private static readonly string _connStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true }).ConnectionString; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs index 460d566a6d..15495d00b0 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class ConnectionOnMirroringTest { private static ManualResetEvent workerCompletedEvent = new ManualResetEvent(false); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs index 73fbd8bdc6..6f3f74fe4e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class ParallelTransactionsTest { #region <> diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs index ec9f516260..05a01788c3 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -51,16 +51,17 @@ public TestResult(object value, string baseTypeName) /// /// Tests for DateTime variant parameters with different date/time types. /// + [Trait("Set", "3")] [Trait("Category", "flaky")] public class DateTimeVariantTests { private static void RunTest( TestVariations tag, Func action, - object paramValue, - string expectedBaseTypeName, - string connStr, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + string connStr, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -127,9 +128,9 @@ private static void xsql(SqlConnection conn, string sql) [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleParameter_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -152,10 +153,10 @@ public void TestSimpleParameter_Type( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -163,9 +164,9 @@ public void TestSimpleParameter_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleParameter_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -188,10 +189,10 @@ public void TestSimpleParameter_Variant( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -199,9 +200,9 @@ public void TestSimpleParameter_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataRecordParameterToTVP_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -231,10 +232,10 @@ public void TestSqlDataRecordParameterToTVP_Type( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -242,9 +243,9 @@ public void TestSqlDataRecordParameterToTVP_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataRecordParameterToTVP_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -274,10 +275,10 @@ public void TestSqlDataRecordParameterToTVP_Variant( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -285,9 +286,9 @@ public void TestSqlDataRecordParameterToTVP_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReaderParameterToTVP_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -320,10 +321,10 @@ public void TestSqlDataReaderParameterToTVP_Type( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -331,9 +332,9 @@ public void TestSqlDataReaderParameterToTVP_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReaderParameterToTVP_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -368,10 +369,10 @@ public void TestSqlDataReaderParameterToTVP_Variant( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -379,9 +380,9 @@ public void TestSqlDataReaderParameterToTVP_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReader_TVP_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -437,10 +438,10 @@ public void TestSqlDataReader_TVP_Type( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -448,9 +449,9 @@ public void TestSqlDataReader_TVP_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSqlDataReader_TVP_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -506,10 +507,10 @@ public void TestSqlDataReader_TVP_Variant( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -517,9 +518,9 @@ public void TestSqlDataReader_TVP_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleDataReader_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -557,10 +558,10 @@ public void TestSimpleDataReader_Type( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -568,9 +569,9 @@ public void TestSimpleDataReader_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void TestSimpleDataReader_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -608,10 +609,10 @@ public void TestSimpleDataReader_Variant( return new TestResult(dr[0], dr.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -619,9 +620,9 @@ public void TestSimpleDataReader_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopySqlDataReader_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -675,10 +676,10 @@ public void SqlBulkCopySqlDataReader_Type( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -686,9 +687,9 @@ public void SqlBulkCopySqlDataReader_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopySqlDataReader_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -746,10 +747,10 @@ public void SqlBulkCopySqlDataReader_Variant( } } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -757,9 +758,9 @@ public void SqlBulkCopySqlDataReader_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopyDataTable_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -795,10 +796,10 @@ public void SqlBulkCopyDataTable_Type( return new TestResult(drVerify[0], drVerify.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -806,9 +807,9 @@ public void SqlBulkCopyDataTable_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopyDataTable_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -844,10 +845,10 @@ public void SqlBulkCopyDataTable_Variant( return new TestResult(drVerify[0], drVerify.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -855,9 +856,9 @@ public void SqlBulkCopyDataTable_Variant( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopyDataRow_Type( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -888,10 +889,10 @@ public void SqlBulkCopyDataRow_Type( return new TestResult(drVerify[0], drVerify.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -899,9 +900,9 @@ public void SqlBulkCopyDataRow_Type( [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)] public void SqlBulkCopyDataRow_Variant( - object paramValue, - string expectedBaseTypeName, - Dictionary expectedExceptions, + object paramValue, + string expectedBaseTypeName, + Dictionary expectedExceptions, Dictionary expectedValueOverrides, Dictionary expectedBaseTypeOverrides) { @@ -932,10 +933,10 @@ public void SqlBulkCopyDataRow_Variant( return new TestResult(drVerify[0], drVerify.GetString(1)); } }, - paramValue, - expectedBaseTypeName, - DataTestUtility.TCPConnectionString, - expectedExceptions, + paramValue, + expectedBaseTypeName, + DataTestUtility.TCPConnectionString, + expectedExceptions, expectedValueOverrides, expectedBaseTypeOverrides); } @@ -954,11 +955,11 @@ public static IEnumerable GetParameterCombinations() { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow }, { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow }, { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow }, - { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, - new Dictionary(), + { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, + new Dictionary(), new Dictionary()}; - yield return new object[] { DateTime.MaxValue, "date", - new Dictionary(), + yield return new object[] { DateTime.MaxValue, "date", + new Dictionary(), new Dictionary { { TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) }, @@ -993,10 +994,10 @@ public static IEnumerable GetParameterCombinations() { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow }, { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow }, { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow }, - { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, + { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, new Dictionary(), new Dictionary()}; - yield return new object[] { DateTime.MaxValue, "datetime2", + yield return new object[] { DateTime.MaxValue, "datetime2", new Dictionary(), new Dictionary { {TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000)}, @@ -1013,8 +1014,8 @@ public static IEnumerable GetParameterCombinations() {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"}, {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"} }}; - yield return new object[] { DateTime.MinValue, "datetime", - new Dictionary { + yield return new object[] { DateTime.MinValue, "datetime", + new Dictionary { { TestVariations.TestSimpleParameter_Type, SqlDateTimeOverflow }, { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow }, { TestVariations.TestSqlDataRecordParameterToTVP_Type, SqlDateTimeOverflow }, @@ -1026,21 +1027,21 @@ public static IEnumerable GetParameterCombinations() { TestVariations.TestSimpleDataReader_Type, VarcharToDateTimeOutOfRange}, { TestVariations.TestSimpleDataReader_Variant, VarcharToDateTimeOutOfRange}, { TestVariations.SqlBulkCopySqlDataReader_Type, VarcharToDateTimeOutOfRange}, - { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToDateTimeOutOfRange}, + { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToDateTimeOutOfRange}, { TestVariations.SqlBulkCopyDataTable_Type, SqlDateTimeOverflow}, { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow}, { TestVariations.SqlBulkCopyDataRow_Type, SqlDateTimeOverflow}, { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow}}, new Dictionary(), new Dictionary()}; - yield return new object[] { DateTime.MaxValue, "datetime", - new Dictionary { + yield return new object[] { DateTime.MaxValue, "datetime", + new Dictionary { { TestVariations.TestSqlDataReader_TVP_Type, CannotConvertCharacterStringToDateOrTime}, { TestVariations.TestSqlDataReader_TVP_Variant, CannotConvertCharacterStringToDateOrTime}, { TestVariations.TestSimpleDataReader_Type, CannotConvertCharacterStringToDateOrTime}, { TestVariations.TestSimpleDataReader_Variant, CannotConvertCharacterStringToDateOrTime}, { TestVariations.SqlBulkCopySqlDataReader_Type, CannotConvertCharacterStringToDateOrTime}, - { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime}}, + { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime}}, new Dictionary { { TestVariations.TestSimpleParameter_Type, new DateTime(3155378975999970000) }, @@ -1123,7 +1124,7 @@ public static IEnumerable GetParameterCombinations() { TestVariations.SqlBulkCopySqlDataReader_Type, ConversionFailedCharStringToSmallDateTime }, { TestVariations.SqlBulkCopySqlDataReader_Variant, ConversionFailedCharStringToSmallDateTime }, { TestVariations.SqlBulkCopyDataTable_Type, UnRepresentableDateTime }, - { TestVariations.SqlBulkCopyDataRow_Type, UnRepresentableDateTime }}, + { TestVariations.SqlBulkCopyDataRow_Type, UnRepresentableDateTime }}, new Dictionary { { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000) }, { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000) }, @@ -1181,7 +1182,7 @@ public static IEnumerable GetParameterCombinations() new Dictionary(), new Dictionary()}; yield return new object[] { DateTime.MinValue, "time", - new Dictionary { + new Dictionary { { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMinDateTimeToTime}, { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMinDateTimeToTime}, { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan }, @@ -1197,7 +1198,7 @@ public static IEnumerable GetParameterCombinations() { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid }, { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }, { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow }, - { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, + { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, new Dictionary { {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Zero}, {TestVariations.SqlBulkCopySqlDataReader_Variant, TimeSpan.Zero}, @@ -1208,7 +1209,7 @@ public static IEnumerable GetParameterCombinations() }, new Dictionary()}; yield return new object[] { DateTime.MaxValue, "time", - new Dictionary { + new Dictionary { { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMaxDateTimeToTime }, { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMaxDateTimeToTime }, { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan }, @@ -1219,7 +1220,7 @@ public static IEnumerable GetParameterCombinations() { TestVariations.TestSimpleDataReader_Type, InvalidCastNotValid }, { TestVariations.TestSimpleDataReader_Variant, InvalidCastNotValid }, { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid }, - { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }}, + { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }}, new Dictionary { {TestVariations.TestSqlDataReader_TVP_Variant, TimeSpan.Parse("23:59:59.9999999")}, {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Parse("23:59:59.9999999")}, diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs index 537313792e..8b0322b559 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// /// Tests for output parameters. /// + [Trait("Set", "3")] public class OutputParameterTests { /// diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs index 782ef68ca8..95d3736d9a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -23,6 +23,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class ParametersTest { private static readonly string s_connString = DataTestUtility.TCPConnectionString; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs index aa59bc319c..67a9ddb92e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class SqlAdapterUpdateBatch { // TODO Synapse: Incorrect syntax near 'IF'. diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs index 5f47576baa..0f81496d65 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -17,6 +17,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// Tests for SQL Variant parameters. /// Tests all SqlTypes inside sql_variant to server using sql_variant parameter, SqlBulkCopy, and TVP parameter. /// + [Trait("Set", "3")] public sealed class SqlVariantParameterTests : IDisposable { private readonly string _connStr; @@ -31,7 +32,7 @@ public SqlVariantParameterTests() // which uses CultureInfo.CurrentCulture.LCID. On Linux, this LCID is 127 // (InvariantCulture), which is not a valid SQL Server collation and causes // "invalid TDS collation" errors in the TVP code path. - // SqlClient doesn't support invariant mode: + // SqlClient doesn't support invariant mode: // https://github.com/dotnet/SqlClient/issues/3742 _previousCulture = Thread.CurrentThread.CurrentCulture; Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs index e6d9284dff..5e8bfa5841 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// Tests for stream input parameters (binary streams, text readers, XML). /// These tests run independently with their own baseline comparison. /// + [Trait("Set", "3")] [Collection("ParameterBaselineTests")] public class StreamInputParameterTests { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs index e8396e2cf6..81851902a5 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// Tests for TVP column boundaries with various data types. /// These tests run independently with their own baseline comparison. /// + [Trait("Set", "3")] [Collection("ParameterBaselineTests")] public class TvpColumnBoundariesTests { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs index 62df3f2c27..545a19a165 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// /// Tests for TVP query hints (sort order, uniqueness, default columns). /// + [Trait("Set", "3")] public sealed class TvpQueryHintsTests : IDisposable { private readonly SqlConnection _conn; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs index 5c0459b687..a8baee786c 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -21,6 +21,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class TvpTest { private const string TvpName = "@tvp"; @@ -863,7 +864,7 @@ private void CreateServerObjects(StePermutation tvpPerm) SqlCommand cmd = new(tsql.ToString(), conn); cmd.ExecuteNonQuery(); - // and create the proc that uses the type + // and create the proc that uses the type cmd.CommandText = string.Format("CREATE PROC {0}(@tvp {1} READONLY) AS SELECT * FROM @tvp order by {2}", GetProcName(tvpPerm), GetTypeName(tvpPerm), colOrdinal - 1); cmd.ExecuteNonQuery(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs index 99d606322c..d04753ec1b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class RandomStressTest : IDisposable { private static readonly TimeSpan TimeLimitDefault = new TimeSpan(0, 0, 10); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs index 4b1b7add4d..9d90459696 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class RetryLogicCounterTest { [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs index 5c2aef92eb..225b1430b6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class RetryLogicTestHelper { private static readonly HashSet s_defaultTransientErrors = diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs index a0b00a9bee..911b90ec5b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class SqlCommandReliabilityTest : IDisposable { private const int ConcurrentParallelExecutions = 3; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs index bcb221ff30..8ffbbdb5bf 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class SqlConfigurationManagerReliabilityTest { private static readonly SqlConnectionReliabilityTest s_connectionCRLTest = new SqlConnectionReliabilityTest(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs index d133d25e03..83feb0571a 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class SqlConnectionReliabilityTest { internal const string InvalidInitialCatalog = "InvalidInitialCatalog_for_retry"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs index beda53991a..433676875b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class SplitPacketTest : IDisposable { private int _port = -1; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs index 49912202d6..f79652eb8f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public static class AdjustPrecScaleForBulkCopy { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] @@ -29,7 +30,7 @@ public static void RunTest() Assert.Equal("12.3", value.ToString()); value = BulkCopySqlDecimalToTable(new SqlDecimal(123.45), 10, 2, 4, 1); - + bool? truncate = appContextSwitches.TruncateScaledDecimal; if (truncate.HasValue && truncate.Value) { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs index 4a722dd409..4264a9aa2f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs @@ -85,6 +85,7 @@ public void Dispose() } } + [Trait("Set", "2")] public class DataConversionErrorMessageTest : IClassFixture { private readonly InitialDatabase _fixture; @@ -101,8 +102,8 @@ public DataConversionErrorMessageTest(InitialDatabase fixture) _fixture = fixture; } - // Synapse: Column count in target table does not match column count specified in input. - // If BCP command, ensure format file column count matches destination table. + // Synapse: Column count in target table does not match column count specified in input. + // If BCP command, ensure format file column count matches destination table. // If SSIS data import, check column mappings are consistent with target. [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public void StringToIntErrorMessageTest() diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs index 1322120b55..c3d7f1d12b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests { + [Trait("Set", "2")] public class HiddenTargetColumn { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs index 90a4e5cbf3..1fc251423f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] public class SqlBulkCopyTest { private string _connStr = null; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs index a5b702f6b4..755658dd3f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests { + [Trait("Set", "2")] public class SqlGraphTables { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs index da5287e831..f8f452e2ee 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// Validates SqlBulkCopy functionality when working with UTF-8 encoded data. /// Ensures that data copied from a UTF-8 source table to a destination table retains its encoding and content integrity. /// + [Trait("Set", "2")] public sealed class TestBulkCopyWithUtf8 : IDisposable { private static string s_sourceTable = DataTestUtility.GetShortName("SourceTableForUTF8Data"); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs index 552fd4cea5..deeaf95c2f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlCommandCancelTest { // Shrink the packet size - this should make timeouts more likely diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs index 1176447204..9969ef17a8 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlCommandCompletedTest { private static readonly string s_connStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { PacketSize = 512 }).ConnectionString; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs index 590657e5db..b618872772 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests /// Tests for ExecuteScalar to verify proper exception handling. /// Regression tests for GitHub issue #3736: https://github.com/dotnet/SqlClient/issues/3736 /// + [Trait("Set", "3")] public static class SqlCommandExecuteScalarTest { /// diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs index b694bc6aee..4eb7e6779e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class SqlCommandSetTest { private static Assembly mds = Assembly.GetAssembly(typeof(SqlConnection)); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs index 1c26151d94..0767c26894 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "1")] public class SqlCommandStoredProcTest { private static readonly string s_tcp_connStr = DataTestUtility.TCPConnectionString; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs index dd3132a41c..38295bd953 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlCredentialTest { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs index 62127bc9a8..4369d75ab0 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "2")] [PlatformSpecific(TestPlatforms.Windows)] public class SqlDataSourceEnumeratorTest { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs index c2a4ab79e8..d9f3988e02 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class SqlDependencyTest { [Fact] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs index ccf0a3a90c..bd36cc37a2 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlFileStreamTest { private static bool IsFileStreamEnvironmentSet() => DataTestUtility.IsFileStreamSetup(); @@ -50,7 +51,7 @@ public static void ReadFilestream() string path = reader.GetString(0); byte[] transactionContext = reader.GetSqlBytes(1).Buffer; - // Create the SqlFileStream + // Create the SqlFileStream using (Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.Read, FileOptions.SequentialScan, allocationSize: 0)) { // Read the contents as bytes. @@ -118,11 +119,11 @@ public static void OverwriteFilestream() { while (reader.Read()) { - // Get the pointer for file + // Get the pointer for file string path = reader.GetString(0); byte[] transactionContext = reader.GetSqlBytes(1).Buffer; - // Create the SqlFileStream + // Create the SqlFileStream using Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.Write, FileOptions.SequentialScan, allocationSize: 0); // Overwrite the first row in the table fileStream.Write((insertedValue), 0, 4); @@ -183,15 +184,15 @@ public static void AppendFilestream() { while (reader.Read()) { - // Get the pointer for file + // Get the pointer for file string path = reader.GetString(0); byte[] transactionContext = reader.GetSqlBytes(1).Buffer; using Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.ReadWrite, FileOptions.SequentialScan, allocationSize: 0); - // Seek to the end of the file + // Seek to the end of the file fileStream.Seek(0, SeekOrigin.End); - // Append a single byte + // Append a single byte fileStream.WriteByte(appendedByte); } } diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs index 497450f74e..9386b181ca 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlNamedPipesTest { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs index e4bd1133ac..33d7698074 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public sealed class SqlNotificationTest : IDisposable { // Misc constants diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs index 6f4c602c27..a7ef4993bb 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlSchemaInfoTest { #region TestMethods diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs index f04bc38a4d..32bb8ff919 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class SqlStatisticsTest { private static DateTime startTime = new DateTime(); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs index 28aa62ccf5..399f016ab7 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs @@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] [PlatformSpecific(TestPlatforms.Windows)] public class DistributedTransactionTestWindows { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs index b6b718e4dd..527665d2b1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class TransactionEnlistmentTest { // TODO Synapse: Cannot find data type 'text'. diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs index 0adff2c8ae..9aea760e56 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class TransactionTest { public static TheoryData PoolEnabledConnectionStrings => diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs index b590a7c451..712d1ec2c6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -16,6 +16,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class SqlServerTypesTest { private const string BuiltInUdtSelectQuery = diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs index 469c895a61..ed5dd7056b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class UdtBulkCopyTest { private string _connStr; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs index 490bfe74b4..f5c2df4c09 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs @@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class DateTimeOffsetList : SqlDataRecord { public DateTimeOffsetList(DateTimeOffset dateTimeOffset) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs index 666b7bd258..12b92fa76d 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,6 +10,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class UdtTest { private readonly string _connStr; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs index 2159589f9c..c5c4955fee 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { [ActiveIssue("5536")] // TODO Synapse: Remove dependency from UDTTest Database + [Trait("Set", "3")] public class UdtTest2 { private string _connStr = null; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs index 41f81b12e3..b20251ea69 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class Utf8SupportTest { // Synapse: 'CONNECTIONPROPERTY' is not a recognized built-in function name. diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs index 0a86534112..4f121a7392 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -14,6 +14,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest { + [Trait("Set", "3")] public static class VectorFloat32TestData { public const int VectorHeaderSize = 8; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs index a805cb4dc9..607f4ce01b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest { + [Trait("Set", "3")] public sealed class VectorAPIValidationTest { // We need these testcases to validate ref assembly for vector APIs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs index 9db91d767f..d50c0e00d6 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -41,6 +41,7 @@ public static IEnumerable GetVarcharVectorInsertTestData() } } + [Trait("Set", "3")] public sealed class VectorTypeBackwardCompatibilityTests : VectorBackwardCompatTestBase { public VectorTypeBackwardCompatibilityTests(ITestOutputHelper output) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs index 8062df455a..7d270935d1 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class WeakRefTest { private const string COMMAND_TEXT_1 = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country from Employees"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs index 472392d47d..864d1a5447 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -8,6 +8,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public static class WeakRefTestYukonSpecific { private const string COMMAND_TEXT_1 = "SELECT CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax from Customers"; diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs index db49fc7c32..eb64eecce8 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs @@ -21,6 +21,9 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + // TODO(ADO-39873): Re-enable these tests after addressing their flakiness. + [Trait("Set", "3")] + [Trait("Category", "flaky")] // Serialized execution: DiagnosticListener is global state, so these tests // must not run in parallel with each other. [Collection("DiagnosticTests")] diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs index 4992c55974..df8229025b 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs @@ -7,6 +7,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class EventSourceTest { [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))] @@ -24,7 +25,7 @@ public void EventSourceTestAll() } } - // Need to investigate better way of validating traces in sequential runs, + // Need to investigate better way of validating traces in sequential runs, // For now we're collecting all traces to improve code coverage. Assert.All(TraceListener.IDs, item => { Assert.Contains(item, Enumerable.Range(1, 21)); }); diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs index 6f9abd12cb..6d37051821 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs @@ -9,6 +9,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests { + [Trait("Set", "3")] public class MetricsTest { #if NETFRAMEWORK diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs index b03fc8b224..c1e4bad178 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs @@ -10,7 +10,6 @@ using Microsoft.Data.SqlClient.Tests.Common; using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects; using Xunit; -using Xunit.Abstractions; #nullable enable @@ -97,6 +96,7 @@ public class XEventCleanerCollection : ICollectionFixture /// even in error scenarios. This is important to ensure that customers can rely on activity IDs being present in /// XEvent sessions for troubleshooting and correlation purposes. /// + [Trait("Set", "3")] [Collection("XEventCleaner")] public class XEventsTracingTest { diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Point1.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Point1.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Point1.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Point1.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Line.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Line.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Line.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Line.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Point.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Point.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Point.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Point.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.cs rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.cs diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj similarity index 100% rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj