Skip to content

Commit cddf5f4

Browse files
mdaigleCopilot
mdaigle
and
Copilot
committed
Consolidate duplicate baseline files for SqlVariantParameter, StreamInputParameter, and TvpColumnBoundaries
SqlVariantParameter: All 4 variants were identical, consolidated to a single file. StreamInputParameter: Azure variants were identical to non-Azure, removed duplicates (Debug/Release distinction preserved). TvpColumnBoundaries: Debug/Release variants were identical, consolidated to non-Azure and Azure files. Also fixes csproj references for all baseline files including DateTimeVariant from prior commit. Co-authored-by: Copilot <[email protected]>
1 parent 57cfe65 commit cddf5f4

14 files changed

+18
-1826
lines changed

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

Lines changed: 13 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -264,70 +264,30 @@
264264
<Content Include="DDDataTypesTest_Data.xml"
265265
CopyToOutputDirectory="PreserveNewest" />
266266

267-
<!-- Split baseline files for individual test groups -->
268-
<Content Include="SQL\ParameterTest\StreamInputParameter_DebugMode.bsl">
269-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
270-
<Link>StreamInputParameter_DebugMode.bsl</Link>
271-
</Content>
272-
<Content Include="SQL\ParameterTest\StreamInputParameter_DebugMode_Azure.bsl">
273-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
274-
<Link>StreamInputParameter_DebugMode_Azure.bsl</Link>
275-
</Content>
276-
<Content Include="SQL\ParameterTest\StreamInputParameter_ReleaseMode.bsl">
277-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
278-
<Link>StreamInputParameter_ReleaseMode.bsl</Link>
279-
</Content>
280-
<Content Include="SQL\ParameterTest\StreamInputParameter_ReleaseMode_Azure.bsl">
281-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
282-
<Link>StreamInputParameter_ReleaseMode_Azure.bsl</Link>
283-
</Content>
284-
<Content Include="SQL\ParameterTest\TvpColumnBoundaries_DebugMode.bsl">
285-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
286-
<Link>TvpColumnBoundaries_DebugMode.bsl</Link>
287-
</Content>
288-
<Content Include="SQL\ParameterTest\TvpColumnBoundaries_DebugMode_Azure.bsl">
267+
<!-- Baseline files for individual test groups -->
268+
<Content Include="SQL\ParameterTest\DateTimeVariant.bsl">
289269
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
290-
<Link>TvpColumnBoundaries_DebugMode_Azure.bsl</Link>
270+
<Link>DateTimeVariant.bsl</Link>
291271
</Content>
292-
<Content Include="SQL\ParameterTest\TvpColumnBoundaries_ReleaseMode.bsl">
272+
<Content Include="SQL\ParameterTest\SqlVariantParameter.bsl">
293273
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
294-
<Link>TvpColumnBoundaries_ReleaseMode.bsl</Link>
274+
<Link>SqlVariantParameter.bsl</Link>
295275
</Content>
296-
<Content Include="SQL\ParameterTest\TvpColumnBoundaries_ReleaseMode_Azure.bsl">
297-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
298-
<Link>TvpColumnBoundaries_ReleaseMode_Azure.bsl</Link>
299-
</Content>
300-
<Content Include="SQL\ParameterTest\SqlVariantParameter_DebugMode.bsl">
301-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
302-
<Link>SqlVariantParameter_DebugMode.bsl</Link>
303-
</Content>
304-
<Content Include="SQL\ParameterTest\SqlVariantParameter_DebugMode_Azure.bsl">
305-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
306-
<Link>SqlVariantParameter_DebugMode_Azure.bsl</Link>
307-
</Content>
308-
<Content Include="SQL\ParameterTest\SqlVariantParameter_ReleaseMode.bsl">
309-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
310-
<Link>SqlVariantParameter_ReleaseMode.bsl</Link>
311-
</Content>
312-
<Content Include="SQL\ParameterTest\SqlVariantParameter_ReleaseMode_Azure.bsl">
313-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
314-
<Link>SqlVariantParameter_ReleaseMode_Azure.bsl</Link>
315-
</Content>
316-
<Content Include="SQL\ParameterTest\DateTimeVariant_DebugMode.bsl">
276+
<Content Include="SQL\ParameterTest\StreamInputParameter_DebugMode.bsl">
317277
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
318-
<Link>DateTimeVariant_DebugMode.bsl</Link>
278+
<Link>StreamInputParameter_DebugMode.bsl</Link>
319279
</Content>
320-
<Content Include="SQL\ParameterTest\DateTimeVariant_DebugMode_Azure.bsl">
280+
<Content Include="SQL\ParameterTest\StreamInputParameter_ReleaseMode.bsl">
321281
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
322-
<Link>DateTimeVariant_DebugMode_Azure.bsl</Link>
282+
<Link>StreamInputParameter_ReleaseMode.bsl</Link>
323283
</Content>
324-
<Content Include="SQL\ParameterTest\DateTimeVariant_ReleaseMode.bsl">
284+
<Content Include="SQL\ParameterTest\TvpColumnBoundaries.bsl">
325285
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
326-
<Link>DateTimeVariant_ReleaseMode.bsl</Link>
286+
<Link>TvpColumnBoundaries.bsl</Link>
327287
</Content>
328-
<Content Include="SQL\ParameterTest\DateTimeVariant_ReleaseMode_Azure.bsl">
288+
<Content Include="SQL\ParameterTest\TvpColumnBoundaries_Azure.bsl">
329289
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
330-
<Link>DateTimeVariant_ReleaseMode_Azure.bsl</Link>
290+
<Link>TvpColumnBoundaries_Azure.bsl</Link>
331291
</Content>
332292
</ItemGroup>
333293

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameter_DebugMode.bsl renamed to src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameter.bsl

File renamed without changes.

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,7 @@ private bool RunTestAndCompareWithBaseline()
3939
try
4040
{
4141
string outputPath = "SqlVariantParameter.out";
42-
string baselinePath;
43-
#if DEBUG
44-
if (DataTestUtility.IsNotAzureServer() || DataTestUtility.IsManagedInstance)
45-
{
46-
baselinePath = "SqlVariantParameter_DebugMode.bsl";
47-
}
48-
else
49-
{
50-
baselinePath = "SqlVariantParameter_DebugMode_Azure.bsl";
51-
}
52-
#else
53-
if (DataTestUtility.IsNotAzureServer() || DataTestUtility.IsManagedInstance)
54-
{
55-
baselinePath = "SqlVariantParameter_ReleaseMode.bsl";
56-
}
57-
else
58-
{
59-
baselinePath = "SqlVariantParameter_ReleaseMode_Azure.bsl";
60-
}
61-
#endif
42+
string baselinePath = "SqlVariantParameter.bsl";
6243

6344
var fstream = new FileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.Read);
6445
var swriter = new StreamWriter(fstream, Encoding.UTF8);

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameter_DebugMode_Azure.bsl‎

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

0 commit comments

Comments
 (0)