Skip to content

Commit b71b62a

Browse files
Test | Fix Event counter test failure using Azure DB (#1277)
1 parent 249b4ea commit b71b62a

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventCounterTest.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public EventCounterTest()
2323
public void EventCounter_HardConnectionsCounters_Functional()
2424
{
2525
//create a non-pooled connection
26-
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {Pooling = false};
26+
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = false };
2727

2828
var ahc = SqlClientEventSourceProps.ActiveHardConnections;
2929
var npc = SqlClientEventSourceProps.NonPooledConnections;
@@ -56,7 +56,7 @@ public void EventCounter_HardConnectionsCounters_Functional()
5656
public void EventCounter_SoftConnectionsCounters_Functional()
5757
{
5858
//create a pooled connection
59-
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {Pooling = true};
59+
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true };
6060

6161
var ahc = SqlClientEventSourceProps.ActiveHardConnections;
6262
var asc = SqlClientEventSourceProps.ActiveSoftConnections;
@@ -125,10 +125,10 @@ public void EventCounter_SoftConnectionsCounters_Functional()
125125
}
126126
}
127127

128-
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
128+
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
129129
public void EventCounter_StasisCounters_Functional()
130130
{
131-
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {Pooling = false};
131+
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = false, Enlist = false };
132132

133133
using (var conn = new SqlConnection(stringBuilder.ToString()))
134134
using (new TransactionScope())
@@ -150,14 +150,14 @@ public void EventCounter_StasisCounters_Functional()
150150
public void EventCounter_ReclaimedConnectionsCounter_Functional()
151151
{
152152
SqlConnection.ClearAllPools();
153-
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true, MaxPoolSize = 1};
153+
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true, MaxPoolSize = 1 };
154154

155155
long rc = SqlClientEventSourceProps.ReclaimedConnections;
156-
156+
157157
InternalConnectionWrapper internalConnection = CreateEmancipatedConnection(stringBuilder.ToString());
158158

159159
GC.Collect();
160-
GC.WaitForPendingFinalizers();
160+
GC.WaitForPendingFinalizers();
161161

162162
using (SqlConnection conn = new SqlConnection(stringBuilder.ToString()))
163163
{
@@ -173,16 +173,17 @@ public void EventCounter_ConnectionPoolGroupsCounter_Functional()
173173
{
174174
SqlConnection.ClearAllPools();
175175

176-
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true};
176+
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true };
177177

178178
long acpg = SqlClientEventSourceProps.ActiveConnectionPoolGroups;
179-
long iacpg = SqlClientEventSourceProps.InactiveConnectionPoolGroups;
179+
long iacpg = SqlClientEventSourceProps.InactiveConnectionPoolGroups;
180180

181-
using (SqlConnection conn = new SqlConnection(stringBuilder.ToString())) {
181+
using (SqlConnection conn = new SqlConnection(stringBuilder.ToString()))
182+
{
182183
conn.Open();
183184

184185
// when calling open, we have 1 more active connection pool group
185-
Assert.Equal(acpg + 1, SqlClientEventSourceProps.ActiveConnectionPoolGroups);
186+
Assert.Equal(acpg + 1, SqlClientEventSourceProps.ActiveConnectionPoolGroups);
186187

187188
conn.Close();
188189
}
@@ -196,17 +197,17 @@ public void EventCounter_ConnectionPoolGroupsCounter_Functional()
196197
PruneConnectionPoolGroups();
197198
Assert.Equal(acpg, SqlClientEventSourceProps.ActiveConnectionPoolGroups);
198199
Assert.Equal(iacpg + 1, SqlClientEventSourceProps.InactiveConnectionPoolGroups);
199-
200+
200201
// Remove poolGroup from poolGroupsToRelease list
201-
PruneConnectionPoolGroups();
202-
Assert.Equal(iacpg, SqlClientEventSourceProps.ActiveConnectionPoolGroups);
202+
PruneConnectionPoolGroups();
203+
Assert.Equal(iacpg, SqlClientEventSourceProps.ActiveConnectionPoolGroups);
203204
}
204205

205206
private static InternalConnectionWrapper CreateEmancipatedConnection(string connectionString)
206207
{
207-
SqlConnection connection = new SqlConnection(connectionString);
208-
connection.Open();
209-
return new InternalConnectionWrapper(connection);
208+
SqlConnection connection = new SqlConnection(connectionString);
209+
connection.Open();
210+
return new InternalConnectionWrapper(connection);
210211
}
211212

212213
private void ClearConnectionPools()
@@ -241,7 +242,7 @@ private static void PruneConnectionPoolGroups()
241242
connectionFactoryField.FieldType.GetMethod("PruneConnectionPoolGroups",
242243
BindingFlags.NonPublic | BindingFlags.Instance);
243244
Debug.Assert(pruneConnectionPoolGroupsMethod != null);
244-
pruneConnectionPoolGroupsMethod.Invoke(connectionFactoryField.GetValue(null), new[] {(object)null});
245+
pruneConnectionPoolGroupsMethod.Invoke(connectionFactoryField.GetValue(null), new[] { (object)null });
245246
}
246247

247248
private static FieldInfo GetConnectionFactoryField()

0 commit comments

Comments
 (0)