Revert "SNOW-1473274 bump nunit to 4.1.0 (#971)"

This reverts commit 0e7a4ad.
snowflakedb · Jun 11, 2024 · c1377f7 · c1377f7
1 parent 0e7a4ad
commit c1377f7
Show file tree

Hide file tree

Showing 63 changed files with 15 additions and 76 deletions.
diff --git a/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs b/Snowflake.Data.Tests/IcebergTests/TestIcebergTable.cs
@@ -8,7 +8,6 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Core;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.Util.TestData;
 
 namespace Snowflake.Data.Tests.IcebergTests

diff --git a/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs b/Snowflake.Data.Tests/IntegrationTests/EasyLoggingIT.cs
@@ -7,7 +7,6 @@
 using Snowflake.Data.Configuration;
 using Snowflake.Data.Core;
 using Snowflake.Data.Log;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.UnitTests.Configuration.EasyLoggingConfigGenerator;
 
 namespace Snowflake.Data.Tests.IntegrationTests

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

diff --git a/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs b/Snowflake.Data.Tests/IntegrationTests/MaxLobSizeIT.cs
@@ -11,7 +11,6 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs
@@ -15,12 +15,11 @@
 using System.Globalization;
 using System.Collections.Generic;
 using Snowflake.Data.Tests.Util;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
 
-    [TestFixture]
+    [TestFixture]    
     class SFBindTestIT : SFBaseTest
     {
         private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFBindTestIT>();

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs
@@ -20,8 +20,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Tests.Mock;
     using System.Runtime.InteropServices;
     using System.Net.Http;
-    using NUnit.Framework.Legacy;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFConnectionIT : SFBaseTest
@@ -801,7 +799,7 @@ public void TestUnknownAuthenticator()
                     IDbConnection conn = new SnowflakeDbConnection();
                     conn.ConnectionString = "scheme=http;host=test;port=8080;user=test;password=test;account=test;authenticator=" + wrongAuthenticator;
                     conn.Open();
-                    Assert.Fail($"Authentication of {wrongAuthenticator} should fail");
+                    Assert.Fail("Authentication of {0} should fail", wrongAuthenticator);
                 }
                 catch (SnowflakeDbException e)
                 {

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolAsyncIT.cs
@@ -10,10 +10,10 @@
 using System.Threading.Tasks;
 using Snowflake.Data.Client;
 using Snowflake.Data.Core;
+using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Mock;
 using Moq;
 using NUnit.Framework;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {

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

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using System.Data;
     using System.Runtime.InteropServices;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbAdaptorIT : SFBaseTest

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
@@ -18,7 +18,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using System.Globalization;
     using Snowflake.Data.Tests.Mock;
     using Snowflake.Data.Core;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandITAsync : SFBaseTestAsync

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

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using NUnit.Framework;
     using System.Data;
     using System.Data.Common;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbFactoryIT : SFBaseTest

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbTransactionIT.cs
@@ -11,7 +11,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbTransactionIT : SFBaseTest

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFMultiStatementsIT.cs
@@ -12,7 +12,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using NUnit.Framework;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFMultiStatementsIT : SFBaseTest

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs
@@ -18,7 +18,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using Snowflake.Data.Core.FileTransfer;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [Parallelizable(ParallelScope.Children)]

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFReusableChunkTest.cs
@@ -9,8 +9,7 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using Core;
     using Client;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
-
+
     [TestFixture, NonParallelizable]
     class SFReusableChunkTest : SFBaseTest
     {

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs b/Snowflake.Data.Tests/IntegrationTests/SFStatementTypeTest.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.IntegrationTests
     using System.Data;
     using Snowflake.Data.Client;
     using System.Data.Common;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFStatementTypeTest : SFBaseTest

diff --git a/Snowflake.Data.Tests/SFBaseTest.cs b/Snowflake.Data.Tests/SFBaseTest.cs
@@ -23,12 +23,11 @@ namespace Snowflake.Data.Tests
     using NUnit.Framework.Interfaces;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Serialization;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     /*
-     * This is the base class for all tests that call blocking methods in the library - it uses MockSynchronizationContext to verify that
+     * This is the base class for all tests that call blocking methods in the library - it uses MockSynchronizationContext to verify that 
      * there are no async deadlocks in the library
-     *
+     * 
      */
     [TestFixture]
     public class SFBaseTest : SFBaseTestAsync
@@ -434,7 +433,7 @@ public void BeforeTest(ITest test)
             {
                 if (Environment.GetEnvironmentVariable(_key) == value)
                 {
-                    Assert.Ignore($"Test is ignored when environment variable {_key} is {value} ");
+                    Assert.Ignore("Test is ignored when environment variable {0} is {1} ", _key, value);
                 }
             }
         }

diff --git a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

diff --git a/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs b/Snowflake.Data.Tests/UnitTests/ArrowChunkParserTest.cs
@@ -16,7 +16,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.IO;
     using System.Text;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ArrowChunkParserTest

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

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

diff --git a/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs
@@ -10,7 +10,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.Collections.Generic;
     using System.Threading;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ChunkDownloaderFactoryTest

diff --git a/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs
@@ -13,7 +13,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Security;
     using System.Text;
     using System.Threading;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture, NonParallelizable]
     class ChunkParserFactoryTest

diff --git a/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs b/Snowflake.Data.Tests/UnitTests/ConcatenatedStreamTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.IO;
     using System.Text;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class ConcatenatedStreamTest

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

diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs
@@ -7,7 +7,6 @@
 using System.IO;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 using static Snowflake.Data.Tests.UnitTests.Configuration.EasyLoggingConfigGenerator;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration

diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigProviderTest.cs
@@ -5,7 +5,6 @@
 using Moq;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
 {

diff --git a/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs b/Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingLogLevelTest.cs
@@ -5,7 +5,6 @@
 using System;
 using NUnit.Framework;
 using Snowflake.Data.Configuration;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Configuration
 {

diff --git a/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs b/Snowflake.Data.Tests/UnitTests/FastMemoryStreamTest.cs
@@ -7,7 +7,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using NUnit.Framework;
     using Snowflake.Data.Core;
     using System.Linq;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class FastMemoryStreamTest

diff --git a/Snowflake.Data.Tests/UnitTests/FastParserTest.cs b/Snowflake.Data.Tests/UnitTests/FastParserTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using System;
     using System.Text;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [SetCulture("en-US")]

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

diff --git a/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs b/Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs
@@ -12,7 +12,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System.Threading.Tasks;
     using System.Net;
     using System;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class HttpUtilTest

diff --git a/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/EasyLoggerManagerTest.cs
@@ -10,14 +10,13 @@
 using Snowflake.Data.Configuration;
 using Snowflake.Data.Core;
 using Snowflake.Data.Log;
-using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace Snowflake.Data.Tests.UnitTests.Logger
 {
     [TestFixture, NonParallelizable]
     public class EasyLoggerManagerTest
     {
-
+        
         private const string InfoMessage = "Easy logging Info message";
         private const string DebugMessage = "Easy logging Debug message";
         private const string WarnMessage = "Easy logging Warn message";

diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
@@ -8,8 +8,7 @@ namespace Snowflake.Data.Tests.UnitTests
 {
     using NUnit.Framework;
     using Snowflake.Data.Log;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
-
+
     [TestFixture, NonParallelizable]
     class SFLoggerTest
     {

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

diff --git a/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs b/Snowflake.Data.Tests/UnitTests/QueryContextCacheTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Core;
     using System;
     using System.Collections.Generic;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class QueryContextCacheTest

diff --git a/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs b/Snowflake.Data.Tests/UnitTests/SFAuthenticatorFactoryTest.cs
@@ -8,7 +8,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Snowflake.Data.Client;
     using Snowflake.Data.Core;
     using Snowflake.Data.Core.Authenticator;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFAuthenticatorFactoryTest

diff --git a/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs b/Snowflake.Data.Tests/UnitTests/SFAzureClientTest.cs
@@ -20,7 +20,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using Moq;
     using Azure;
     using Azure.Storage.Blobs.Models;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFAzureClientTest : SFBaseTest

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

diff --git a/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs b/Snowflake.Data.Tests/UnitTests/SFDataConverterTest.cs
@@ -11,7 +11,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using NUnit.Framework;
     using System.Threading;
     using System.Globalization;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     [SetCulture("en-US")]

diff --git a/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbCommandBuilderTest.cs
@@ -6,7 +6,6 @@ namespace Snowflake.Data.Tests.UnitTests
 {
     using NUnit.Framework;
     using Snowflake.Data.Client;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandBuilderTest

diff --git a/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs b/Snowflake.Data.Tests/UnitTests/SFDbCommandTest.cs
@@ -9,7 +9,6 @@ namespace Snowflake.Data.Tests.UnitTests
     using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
     [TestFixture]
     class SFDbCommandTest