Skip to content

Commit 865ac03

Browse files
Fix | Improved DSEnumerator's test and fixed string format (#1541)
1 parent 5cebfbe commit 865ac03

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ internal static DataTable GetDataSources()
4646
finally
4747
{
4848
handle = SNINativeMethodWrapper.SNIServerEnumOpen();
49-
SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> {3} returned handle = {4}.",
49+
SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> {2} returned handle = {3}.",
5050
nameof(SqlDataSourceEnumeratorNativeHelper),
5151
nameof(GetDataSources),
5252
nameof(SNINativeMethodWrapper.SNIServerEnumOpen), handle);
@@ -80,7 +80,7 @@ internal static DataTable GetDataSources()
8080
if (handle != ADP.s_ptrZero)
8181
{
8282
SNINativeMethodWrapper.SNIServerEnumClose(handle);
83-
SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> {3} called.",
83+
SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> {2} called.",
8484
nameof(SqlDataSourceEnumeratorNativeHelper),
8585
nameof(GetDataSources),
8686
nameof(SNINativeMethodWrapper.SNIServerEnumClose));

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6+
using System.Linq;
67
using System.ServiceProcess;
78
using Microsoft.Data.Sql;
89
using Xunit;
@@ -36,9 +37,12 @@ private SqlDataSourceEnumerator GetDSEnumerator()
3637
{
3738
// SQL Server Browser runs as a Windows service.
3839
// TODO: This assessment can be done on CI.
39-
ServiceController sc = new("SQLBrowser");
40-
Assert.Equal(ServiceControllerStatus.Running, sc.Status);
41-
40+
ServiceController[] services = ServiceController.GetServices(Environment.MachineName);
41+
ServiceController service = services.FirstOrDefault(s => s.ServiceName == "SQLBrowser");
42+
if (service != null)
43+
{
44+
Assert.Equal(ServiceControllerStatus.Running, service.Status);
45+
}
4246
return SqlDataSourceEnumerator.Instance;
4347
}
4448
}

0 commit comments

Comments
 (0)