Fix nunit usage after bump to 4.1.0

snowflakedb · Jun 11, 2024 · 7a8f956 · 7a8f956
1 parent 64f2f36
commit 7a8f956
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 24 deletions.
diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs
@@ -4,11 +4,11 @@
 using Moq;
 using NUnit.Framework;
 using Snowflake.Data.Client;
-using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Mock;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsIT.cs
@@ -10,6 +10,8 @@
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Tests.Mock;
 using Snowflake.Data.Tests.Util;
+using NUnit.Framework.Legacy;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolChangedSessionIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolChangedSessionIT.cs
@@ -3,6 +3,7 @@
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolCommonIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolCommonIT.cs
@@ -11,6 +11,7 @@
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs
@@ -6,8 +6,8 @@
 using NUnit.Framework;
 using Snowflake.Data.Client;
 using Snowflake.Data.Core.Session;
-using Snowflake.Data.Tests.Mock;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/UnitTests/ConnectionCacheManagerTest.cs b/Snowflake.Data.Tests/UnitTests/ConnectionCacheManagerTest.cs
@@ -2,6 +2,7 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {

diff --git a/Snowflake.Data.Tests/UnitTests/ConnectionPoolManagerTest.cs b/Snowflake.Data.Tests/UnitTests/ConnectionPoolManagerTest.cs
@@ -13,6 +13,7 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Core.Tools;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/ConnectionPoolConfigExtractorTest.cs b/Snowflake.Data.Tests/UnitTests/Session/ConnectionPoolConfigExtractorTest.cs
@@ -6,6 +6,7 @@
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Core.Tools;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/FixedZeroCounterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/FixedZeroCounterTest.cs
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/NonCountingSessionCreationTokenCounterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/NonCountingSessionCreationTokenCounterTest.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
@@ -12,36 +13,36 @@ public void TestGrantSessionCreation()
         {
             // arrange
             var tokens = new NonCountingSessionCreationTokenCounter();
-            
+
             // act
             tokens.NewToken();
-            
+
             // assert
             Assert.AreEqual(0, tokens.Count());
         }
-        
+
         [Test]
         public void TestCompleteSessionCreation()
         {
             // arrange
             var tokens = new NonCountingSessionCreationTokenCounter();
             var token = tokens.NewToken();
-            
+
             // act
             tokens.RemoveToken(token);
-            
+
             // assert
             Assert.AreEqual(0, tokens.Count());
         }
-        
+
         [Test]
         public void TestCompleteUnknownTokenDoesNotThrowExceptions()
         {
             // arrange
             var tokens = new NonCountingSessionCreationTokenCounter();
             tokens.NewToken();
             var unknownToken = new SessionCreationToken(SFSessionHttpClientProperties.DefaultConnectionTimeout);
-            
+
             // act
             tokens.RemoveToken(unknownToken);
 

diff --git a/Snowflake.Data.Tests/UnitTests/Session/NonNegativeCounterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/NonNegativeCounterTest.cs
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/NonWaitingQueueTest.cs b/Snowflake.Data.Tests/UnitTests/Session/NonWaitingQueueTest.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/SessionCreationTokenCounterTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SessionCreationTokenCounterTest.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/SessionCreationTokenTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SessionCreationTokenTest.cs
@@ -1,14 +1,15 @@
 using System;
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
     [TestFixture]
     public class SessionCreationTokenTest
     {
         private static readonly TimeSpan s_timeout30Seconds = TimeSpan.FromSeconds(30);
-        
+
         [Test]
         public void TestTokenIsNotExpired()
         {
@@ -17,11 +18,11 @@ public void TestTokenIsNotExpired()
 
             // act
             var isExpired = token.IsExpired(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
-            
+
             // assert
             Assert.IsFalse(isExpired);
         }
-        
+
         [Test]
         public void TestTokenIsExpired()
         {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/SessionOrCreationTokensTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SessionOrCreationTokensTest.cs
@@ -3,20 +3,21 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {
     [TestFixture]
     public class SessionOrCreationTokensTest
     {
         private SFSession _session = new SFSession("account=test;user=test;password=test", null);
-        
+
         [Test]
         public void TestNoBackgroundSessionsToCreateWhenInitialisedWithSession()
         {
             // arrange
             var sessionOrTokens = new SessionOrCreationTokens(_session);
-            
+
             // act
             var backgroundCreationTokens = sessionOrTokens.BackgroundSessionCreationTokens();
 
@@ -32,14 +33,14 @@ public void TestReturnFirstCreationToken()
                 .Select(_ => sessionCreationTokenCounter.NewToken())
                 .ToList();
             var sessionOrTokens = new SessionOrCreationTokens(tokens);
-            
+
             // act
             var token = sessionOrTokens.SessionCreationToken();
-            
+
             // assert
             Assert.AreSame(tokens[0], token);
         }
-        
+
         [Test]
         public void TestReturnCreationTokensFromTheSecondOneForBackgroundExecution()
         {
@@ -49,10 +50,10 @@ public void TestReturnCreationTokensFromTheSecondOneForBackgroundExecution()
                 .Select(_ => sessionCreationTokenCounter.NewToken())
                 .ToList();
             var sessionOrTokens = new SessionOrCreationTokens(tokens);
-            
+
             // act
             var backgroundTokens = sessionOrTokens.BackgroundSessionCreationTokens();
-            
+
             // assert
             Assert.AreEqual(2, backgroundTokens.Count);
             Assert.AreSame(tokens[1], backgroundTokens[0]);

diff --git a/Snowflake.Data.Tests/UnitTests/Session/SessionPoolTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SessionPoolTest.cs
@@ -7,6 +7,7 @@
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Core.Tools;
 using Snowflake.Data.Tests.Util;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/SessionPropertiesWithDefaultValuesExtractorTest.cs b/Snowflake.Data.Tests/UnitTests/Session/SessionPropertiesWithDefaultValuesExtractorTest.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Session/WaitingQueueTest.cs b/Snowflake.Data.Tests/UnitTests/Session/WaitingQueueTest.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Session
 {

diff --git a/Snowflake.Data.Tests/UnitTests/SnowflakeDbConnectionPoolTest.cs b/Snowflake.Data.Tests/UnitTests/SnowflakeDbConnectionPoolTest.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Snowflake.Data.Client;
 using Snowflake.Data.Core.Session;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Tools/SecureStringHelperTest.cs b/Snowflake.Data.Tests/UnitTests/Tools/SecureStringHelperTest.cs
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using Snowflake.Data.Core.Tools;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Tools
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Tools/TimeoutHelperTest.cs b/Snowflake.Data.Tests/UnitTests/Tools/TimeoutHelperTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using Snowflake.Data.Core.Tools;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Tools
 {

diff --git a/Snowflake.Data.Tests/Util/AwaiterTest.cs b/Snowflake.Data.Tests/Util/AwaiterTest.cs
@@ -1,19 +1,20 @@
 using System;
 using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.Util
 {
     [TestFixture]
     public class AwaiterTest
     {
         private readonly TimeSpan _maxDurationRegardedAsImmediately = TimeSpan.FromSeconds(1);
-        
+
         [Test]
         public void TestReturnsImmediatelyWhenConditionIsMet()
         {
             // act
             var millis = MillisecondsOfWaiting(() => true, TimeSpan.FromHours(1));
-            
+
             // assert
             Assert.LessOrEqual(millis, _maxDurationRegardedAsImmediately.TotalMilliseconds);
         }
@@ -23,7 +24,7 @@ public void TestReturnsImmediatelyOnZeroTimeout()
         {
             // act
             var millis = MillisecondsOfWaiting(() => false, TimeSpan.FromMilliseconds(0));
-            
+
             // assert
             Assert.LessOrEqual(millis, _maxDurationRegardedAsImmediately.TotalMilliseconds);
         }
@@ -33,10 +34,10 @@ public void TestReturnsOnTimeout()
         {
             // arrange
             var timeout = TimeSpan.FromSeconds(2);
-            
+
             // act
             var millis = MillisecondsOfWaiting(() => false, TimeSpan.FromSeconds(2));
-            
+
             // assert
             Assert.GreaterOrEqual(millis, _maxDurationRegardedAsImmediately.TotalMilliseconds);
             Assert.LessOrEqual(millis, timeout.TotalMilliseconds + _maxDurationRegardedAsImmediately.TotalMilliseconds);