fix unit test

dotnet · Sep 3, 2020 · 263a04c · 263a04c
1 parent 33b6fe5
commit 263a04c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 143 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -247,10 +247,6 @@
     <Compile Include="Microsoft\Data\SqlClient\EnclaveProviderBase.cs" />
     <Compile Include="Microsoft\Data\SqlClient\EnclaveSessionCache.cs" />
 	</ItemGroup>
-  <!-- netcoreapp 2.1 & netstandard 2.0 -->
-  <ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND ('$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netstandard2.0')">
-    <Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp2.cs" />
-  </ItemGroup>
   <!-- netcoreapp 3.1 & netstandard 2.1 and above -->
   <ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netstandard2.0'">
     <Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp3.cs" />

diff --git a/...t.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientEventSource.NetCoreApp2.cs b/...t.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientEventSource.NetCoreApp2.cs
diff --git a/...t.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientEventSource.NetCoreApp3.cs b/...t.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientEventSource.NetCoreApp3.cs
@@ -186,7 +186,7 @@ protected override void EventCommandMethodCall(EventCommandEventArgs command)
         /// The number of actual connections that are being made to servers
         /// </summary>
         [NonEvent]
-        internal void HardConnectRequest()
+        internal override void HardConnectRequest()
         {
             if (IsEnabled())
             {
@@ -199,7 +199,7 @@ internal void HardConnectRequest()
         /// The number of actual disconnects that are being made to servers
         /// </summary>
         [NonEvent]
-        internal void HardDisconnectRequest()
+        internal override void HardDisconnectRequest()
         {
             if (IsEnabled())
             {
@@ -212,7 +212,7 @@ internal void HardDisconnectRequest()
         /// The number of connections we get from the pool
         /// </summary>
         [NonEvent]
-        internal void SoftConnectRequest()
+        internal override void SoftConnectRequest()
         {
             if (IsEnabled())
             {
@@ -225,7 +225,7 @@ internal void SoftConnectRequest()
         /// The number of connections we return to the pool
         /// </summary>
         [NonEvent]
-        internal void SoftDisconnectRequest()
+        internal override void SoftDisconnectRequest()
         {
             if (IsEnabled())
             {
@@ -239,7 +239,7 @@ internal void SoftDisconnectRequest()
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void NonPooledConnectionRequest(bool increment = true)
+        internal override void NonPooledConnectionRequest(bool increment = true)
         {
             Request(ref _nonPooledConnectionsCounter, increment);
         }
@@ -249,7 +249,7 @@ internal void NonPooledConnectionRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void PooledConnectionRequest(bool increment = true)
+        internal override void PooledConnectionRequest(bool increment = true)
         {
             Request(ref _pooledConnectionsCounter, increment);
         }
@@ -259,7 +259,7 @@ internal void PooledConnectionRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void ActiveConnectionPoolGroupRequest(bool increment = true)
+        internal override void ActiveConnectionPoolGroupRequest(bool increment = true)
         {
             Request(ref _activeConnectionPoolGroupsCounter, increment);
         }
@@ -269,7 +269,7 @@ internal void ActiveConnectionPoolGroupRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void InactiveConnectionPoolGroupRequest(bool increment = true)
+        internal override void InactiveConnectionPoolGroupRequest(bool increment = true)
         {
             Request(ref _inactiveConnectionPoolGroupsCounter, increment);
         }
@@ -279,7 +279,7 @@ internal void InactiveConnectionPoolGroupRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void ActiveConnectionPoolRequest(bool increment = true)
+        internal override void ActiveConnectionPoolRequest(bool increment = true)
         {
             Request(ref _activeConnectionPoolsCounter, increment);
         }
@@ -289,7 +289,7 @@ internal void ActiveConnectionPoolRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void InactiveConnectionPoolRequest(bool increment = true)
+        internal override void InactiveConnectionPoolRequest(bool increment = true)
         {
             Request(ref _inactiveConnectionPoolsCounter, increment);
         }
@@ -299,7 +299,7 @@ internal void InactiveConnectionPoolRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void ActiveConnectionRequest(bool increment = true)
+        internal override void ActiveConnectionRequest(bool increment = true)
         {
             Request(ref _activeConnectionsCounter, increment);
         }
@@ -309,7 +309,7 @@ internal void ActiveConnectionRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void FreeConnectionRequest(bool increment = true)
+        internal override void FreeConnectionRequest(bool increment = true)
         {
             Request(ref _freeConnectionsCounter, increment);
         }
@@ -319,7 +319,7 @@ internal void FreeConnectionRequest(bool increment = true)
         /// </summary>
         /// <param name="increment"></param>
         [NonEvent]
-        internal void StasisConnectionRequest(bool increment = true)
+        internal override void StasisConnectionRequest(bool increment = true)
         {
             Request(ref _stasisConnectionsCounter, increment);
         }
@@ -328,7 +328,7 @@ internal void StasisConnectionRequest(bool increment = true)
         ///  The number of connections we reclaim from GC'd external connections
         /// </summary>
         [NonEvent]
-        internal void ReclaimedConnectionRequest()
+        internal override void ReclaimedConnectionRequest()
         {
             Request(ref _reclaimedConnectionsCounter, true);
         }

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.cs
@@ -15,7 +15,37 @@ protected override void OnEventCommand(EventCommandEventArgs command)
             EventCommandMethodCall(command);
         }
 
-        protected virtual void EventCommandMethodCall(EventCommandEventArgs command){}
+        protected virtual void EventCommandMethodCall(EventCommandEventArgs command) { }
+
+        #region not implemented for .Net core 2.1, .Net standard 2.0 and lower
+        internal virtual void HardConnectRequest() { /*no-op*/ }
+
+        internal virtual void HardDisconnectRequest() { /*no-op*/ }
+
+        internal virtual void SoftConnectRequest() { /*no-op*/ }
+
+        internal virtual void SoftDisconnectRequest() { /*no-op*/ }
+
+        internal virtual void NonPooledConnectionRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void PooledConnectionRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void ActiveConnectionPoolGroupRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void InactiveConnectionPoolGroupRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void ActiveConnectionPoolRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void InactiveConnectionPoolRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void ActiveConnectionRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void FreeConnectionRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void StasisConnectionRequest(bool increment = true) { /*no-op*/ }
+
+        internal virtual void ReclaimedConnectionRequest() { /*no-op*/ }
+        #endregion
     }
 
     [EventSource(Name = "Microsoft.Data.SqlClient.EventSource")]

diff --git a/...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -232,6 +232,9 @@
   <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'">
     <Compile Include="TracingTests\DiagnosticTest.cs" />
     <Compile Include="TracingTests\FakeDiagnosticListenerObserver.cs" />
+  </ItemGroup>
+  <!--.Net core 3.0 & .Net standard 2.1 and above-->
+  <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp' AND !$(TargetFramework.StartsWith('netcoreapp2')) AND !$(ReferenceType.Contains('netcoreapp2')) AND !$(ReferenceType.Contains('NetStandard2.0'))">
     <Compile Include="TracingTests\EventCounterTest.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventCounterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventCounterTest.cs
@@ -11,6 +11,9 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    /// <summary>
+    /// This unit test is just valid for .NetCore 3.0 and above
+    /// </summary>
     public class EventCounterTest
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]