Skip to content

Commit 8a83e20

Browse files
MichelZMichelZ
committed
- Remove AsyncTest (why would Async be faster than Sync?)
- Move tests around to TestSet when necessary, consolidate AE test sets
1 parent a0844a8 commit 8a83e20

File tree

2 files changed

+27
-136
lines changed

2 files changed

+27
-136
lines changed

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

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,12 @@
1515
<IsTestProject>true</IsTestProject>
1616
</PropertyGroup>
1717
<ItemGroup Condition="'$(TestSet)' == '' or '$(TestSet)' == 'AE'">
18-
<Compile Include="AlwaysEncrypted\CoreCryptoTests.cs" />
19-
<Compile Include="AlwaysEncrypted\ConversionTests.cs" />
20-
<Compile Include="AlwaysEncrypted\ExceptionsGenericError.cs" />
21-
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoVector.cs" />
22-
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoNativeBaselineReader.cs" />
23-
<Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
24-
<Content Include="AlwaysEncrypted\TestFixtures\Setup\TCECryptoNativeBaseline.txt">
25-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26-
<Link>TCECryptoNativeBaseline.txt</Link>
27-
</Content>
28-
<Content Include="AlwaysEncrypted\TestFixtures\Setup\TCECryptoNativeBaselineRsa.txt">
29-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30-
<Link>TCECryptoNativeBaselineRsa.txt</Link>
31-
</Content>
32-
</ItemGroup>
33-
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND ('$(TestSet)' == '' OR '$(TestSet)' == 'AE')">
34-
<Compile Include="AlwaysEncrypted\CspProviderExt.cs" />
35-
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CertificateUtilityWin.cs" />
36-
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CspProviderColumnMasterKey.cs" />
37-
<Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategyCspExt.cs" />
38-
</ItemGroup>
39-
<ItemGroup Condition="'$(TestSet)' == '' OR '$(TestSet)' == 'AE'">
4018
<Compile Include="AlwaysEncrypted\AKVTests.cs" />
4119
<Compile Include="AlwaysEncrypted\AKVUnitTests.cs" />
20+
<Compile Include="AlwaysEncrypted\CoreCryptoTests.cs" />
21+
<Compile Include="AlwaysEncrypted\ConversionTests.cs" />
4222
<Compile Include="AlwaysEncrypted\EnclaveAzureDatabaseTests.cs" />
23+
<Compile Include="AlwaysEncrypted\ExceptionsGenericError.cs" />
4324
<Compile Include="AlwaysEncrypted\ExceptionTestAKVStore.cs" />
4425
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\AKVTestTable.cs" />
4526
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\AkvColumnMasterKey.cs" />
@@ -59,6 +40,8 @@
5940
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\BulkCopyAEErrorMessageTestTable.cs" />
6041
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\BulkCopyTruncationTables.cs" />
6142
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\ColumnDecryptErrorTestTable.cs" />
43+
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoVector.cs" />
44+
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoNativeBaselineReader.cs" />
6245
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\DateOnlyTestTable.cs" />
6346
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\SqlNullValuesTable.cs" />
6447
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\SqlParameterPropertiesTable.cs" />
@@ -72,6 +55,21 @@
7255
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\DummyKeyStoreProvider.cs" />
7356
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\DummyProviderMasterKey.cs" />
7457
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CertificateUtility.cs" />
58+
<Content Include="AlwaysEncrypted\TestFixtures\Setup\TCECryptoNativeBaseline.txt">
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60+
<Link>TCECryptoNativeBaseline.txt</Link>
61+
</Content>
62+
<Content Include="AlwaysEncrypted\TestFixtures\Setup\TCECryptoNativeBaselineRsa.txt">
63+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64+
<Link>TCECryptoNativeBaselineRsa.txt</Link>
65+
</Content>
66+
<Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
67+
</ItemGroup>
68+
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND ('$(TestSet)' == '' OR '$(TestSet)' == 'AE')">
69+
<Compile Include="AlwaysEncrypted\CspProviderExt.cs" />
70+
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CertificateUtilityWin.cs" />
71+
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CspProviderColumnMasterKey.cs" />
72+
<Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategyCspExt.cs" />
7573
</ItemGroup>
7674
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND ('$(TestSet)' == '' OR '$(TestSet)' == 'AE')">
7775
<Compile Include="AlwaysEncrypted\DateOnlyReadTests.cs" />
@@ -81,7 +79,6 @@
8179
<Compile Include="SQL\AsyncTest\BeginExecAsyncTest.cs" />
8280
<Compile Include="SQL\AsyncTest\BeginExecReaderAsyncTest.cs" />
8381
<Compile Include="SQL\AsyncTest\XmlReaderAsyncTest.cs" />
84-
<Compile Include="SQL\AsyncTest\AsyncTest.cs" />
8582
<Compile Include="SQL\AsyncTest\AsyncCancelledConnectionsTest.cs" />
8683
</ItemGroup>
8784
<ItemGroup Condition="'$(TestSet)' == '' OR '$(TestSet)' == '2'">
@@ -175,15 +172,21 @@
175172
<Compile Include="DDBasics\DDAsyncTest\DDAsyncTest.cs" />
176173
<Compile Include="DDBasics\DDDataTypesTest\DDDataTypesTest.cs" />
177174
<Compile Include="DDBasics\DDMARSTest\DDMARSTest.cs" />
175+
<Compile Include="Json\SqlJsonTest.cs" />
178176
<Compile Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.cs" />
179177
<Compile Include="ProviderAgnostic\ReaderTest\ReaderTest.cs" />
180178
<Compile Include="TracingTests\EventSourceTest.cs" />
181179
<Compile Include="SQL\AADFedAuthTokenRefreshTest\AADFedAuthTokenRefreshTest.cs" />
180+
<Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTest.cs" />
181+
<Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTestWithTdsServer.cs" />
182182
<Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.cs" />
183183
<Compile Include="SQL\ConnectionPoolTest\PoolBlockPeriodTest.cs" />
184184
<Compile Include="SQL\DataSourceParserTest\DataSourceParserTest.cs" />
185185
<Compile Include="SQL\InstanceNameTest\InstanceNameTest.cs" />
186186
<Compile Include="SQL\IntegratedAuthenticationTest\IntegratedAuthenticationTest.cs" />
187+
<Compile Include="SQL\JsonTest\JsonBulkCopyTest.cs" />
188+
<Compile Include="SQL\JsonTest\JsonStreamTest.cs" />
189+
<Compile Include="SQL\JsonTest\JsonTest.cs" />
187190
<Compile Include="SQL\KerberosTests\KerberosTest.cs" />
188191
<Compile Include="SQL\KerberosTests\KerberosTicketManager\KerberosTicketManager.cs" />
189192
<Compile Include="SQL\LocalDBTest\LocalDBTest.cs" />
@@ -195,6 +198,7 @@
195198
<Compile Include="SQL\SqlCommand\SqlCommandCompletedTest.cs" />
196199
<Compile Include="SQL\SqlCommand\SqlCommandCancelTest.cs" />
197200
<Compile Include="SQL\SqlCommand\SqlCommandSetTest.cs" />
201+
<Compile Include="SQL\SqlCommand\SqlCommandStoredProcTest.cs" />
198202
<Compile Include="SQL\SqlCredentialTest\SqlCredentialTest.cs" />
199203
<Compile Include="SQL\SqlDependencyTest\SqlDependencyTest.cs" />
200204
<Compile Include="SQL\SqlFileStreamTest\SqlFileStreamTest.cs" />
@@ -280,7 +284,6 @@
280284
<Compile Include="DataCommon\ProxyServer.cs" />
281285
<Compile Include="DataCommon\SqlClientCustomTokenCredential.cs" />
282286
<Compile Include="DataCommon\SystemDataResourceManager.cs" />
283-
<Compile Include="Json\SqlJsonTest.cs" />
284287
<Compile Include="SQL\Common\AsyncDebugScope.cs" />
285288
<Compile Include="SQL\Common\ConnectionPoolWrapper.cs" />
286289
<Compile Include="SQL\Common\InternalConnectionWrapper.cs" />
@@ -292,12 +295,6 @@
292295
<Compile Include="SQL\Common\SystemDataInternals\FedAuthTokenHelper.cs" />
293296
<Compile Include="SQL\Common\SystemDataInternals\TdsParserHelper.cs" />
294297
<Compile Include="SQL\Common\SystemDataInternals\TdsParserStateObjectHelper.cs" />
295-
<Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTest.cs" />
296-
<Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTestWithTdsServer.cs" />
297-
<Compile Include="SQL\JsonTest\JsonBulkCopyTest.cs" />
298-
<Compile Include="SQL\JsonTest\JsonStreamTest.cs" />
299-
<Compile Include="SQL\JsonTest\JsonTest.cs" />
300-
<Compile Include="SQL\SqlCommand\SqlCommandStoredProcTest.cs" />
301298
<Compile Include="TracingTests\TestTdsServer.cs" />
302299
<Compile Include="XUnitAssemblyAttributes.cs" />
303300
</ItemGroup>

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

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

0 commit comments

Comments
 (0)