diff --git a/Tests/FAnsiTests/Aggregation/AggregationTests.cs b/Tests/FAnsiTests/Aggregation/AggregationTests.cs index 95a44746..1f0c2fc9 100644 --- a/Tests/FAnsiTests/Aggregation/AggregationTests.cs +++ b/Tests/FAnsiTests/Aggregation/AggregationTests.cs @@ -173,7 +173,7 @@ protected DiscoveredTable GetTestTable(DatabaseType type, bool easy = false) var dic = easy ? _easyTables : _hardTables; if (!dic.ContainsKey(type)) - Assert.Inconclusive("No connection string found for Test database type {0}", type); + Assert.Inconclusive($"No connection string found for Test database type {type}"); return dic[type]; } diff --git a/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs b/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs index 60f62c81..c1e3dfdb 100644 --- a/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs +++ b/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Data; +using NUnit.Framework.Legacy; namespace FAnsiTests.Aggregation; diff --git a/Tests/FAnsiTests/CrossPlatformTests.cs b/Tests/FAnsiTests/CrossPlatformTests.cs index 23e9a6c8..72c6af74 100644 --- a/Tests/FAnsiTests/CrossPlatformTests.cs +++ b/Tests/FAnsiTests/CrossPlatformTests.cs @@ -10,6 +10,7 @@ using FAnsi.Discovery.QuerySyntax; using FAnsiTests.TypeTranslation; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; using TypeGuesser.Deciders; diff --git a/Tests/FAnsiTests/Parameters/ParameterTests.cs b/Tests/FAnsiTests/Parameters/ParameterTests.cs index 486c74f0..ff66e43d 100644 --- a/Tests/FAnsiTests/Parameters/ParameterTests.cs +++ b/Tests/FAnsiTests/Parameters/ParameterTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System.Data; using System.Text; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.Parameters; diff --git a/Tests/FAnsiTests/Query/QuerySyntaxHelperDatabaseTests.cs b/Tests/FAnsiTests/Query/QuerySyntaxHelperDatabaseTests.cs index 2e9940bc..2f20f13a 100644 --- a/Tests/FAnsiTests/Query/QuerySyntaxHelperDatabaseTests.cs +++ b/Tests/FAnsiTests/Query/QuerySyntaxHelperDatabaseTests.cs @@ -2,6 +2,7 @@ using FAnsi; using FAnsi.Discovery.QuerySyntax; using NUnit.Framework; +using NUnit.Framework.Legacy; namespace FAnsiTests.Query; diff --git a/Tests/FAnsiTests/Query/QuerySyntaxHelperTests.cs b/Tests/FAnsiTests/Query/QuerySyntaxHelperTests.cs index 89ff12da..4a8d64ac 100644 --- a/Tests/FAnsiTests/Query/QuerySyntaxHelperTests.cs +++ b/Tests/FAnsiTests/Query/QuerySyntaxHelperTests.cs @@ -5,6 +5,7 @@ using FAnsi.Discovery.QuerySyntax; using FAnsi.Implementation; using NUnit.Framework; +using NUnit.Framework.Legacy; namespace FAnsiTests.Query; diff --git a/Tests/FAnsiTests/Server/ConnectionStringKeywordAccumulatorTests.cs b/Tests/FAnsiTests/Server/ConnectionStringKeywordAccumulatorTests.cs index b19e6f34..48e2f789 100644 --- a/Tests/FAnsiTests/Server/ConnectionStringKeywordAccumulatorTests.cs +++ b/Tests/FAnsiTests/Server/ConnectionStringKeywordAccumulatorTests.cs @@ -8,6 +8,7 @@ using FAnsi.Implementations.Oracle; using FAnsi.Implementations.PostgreSql; using NUnit.Framework; +using NUnit.Framework.Legacy; namespace FAnsiTests.Server; diff --git a/Tests/FAnsiTests/Table/BulkInsertTest.cs b/Tests/FAnsiTests/Table/BulkInsertTest.cs index e01524bc..2b1a928e 100644 --- a/Tests/FAnsiTests/Table/BulkInsertTest.cs +++ b/Tests/FAnsiTests/Table/BulkInsertTest.cs @@ -9,6 +9,7 @@ using FAnsi.Discovery.QuerySyntax; using FAnsi.Exceptions; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.Table; diff --git a/Tests/FAnsiTests/Table/CreateTableTests.cs b/Tests/FAnsiTests/Table/CreateTableTests.cs index 5c3f7003..f66241e8 100644 --- a/Tests/FAnsiTests/Table/CreateTableTests.cs +++ b/Tests/FAnsiTests/Table/CreateTableTests.cs @@ -8,6 +8,7 @@ using FAnsi.Discovery.TableCreation; using FAnsi.Extensions; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.Table; diff --git a/Tests/FAnsiTests/Table/ForeignKeyTests.cs b/Tests/FAnsiTests/Table/ForeignKeyTests.cs index d0a269c1..73555243 100644 --- a/Tests/FAnsiTests/Table/ForeignKeyTests.cs +++ b/Tests/FAnsiTests/Table/ForeignKeyTests.cs @@ -4,6 +4,7 @@ using FAnsi.Discovery; using FAnsi.Discovery.Constraints; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.Table; diff --git a/Tests/FAnsiTests/Table/LongNamesTests.cs b/Tests/FAnsiTests/Table/LongNamesTests.cs index 1ec32325..7f4acd39 100644 --- a/Tests/FAnsiTests/Table/LongNamesTests.cs +++ b/Tests/FAnsiTests/Table/LongNamesTests.cs @@ -2,6 +2,7 @@ using FAnsi; using FAnsi.Discovery; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.Table; diff --git a/Tests/FAnsiTests/Table/TableValuedFunctionTests.cs b/Tests/FAnsiTests/Table/TableValuedFunctionTests.cs index f86d50d7..bf26a26c 100644 --- a/Tests/FAnsiTests/Table/TableValuedFunctionTests.cs +++ b/Tests/FAnsiTests/Table/TableValuedFunctionTests.cs @@ -1,6 +1,7 @@ using System.Linq; using FAnsi; using NUnit.Framework; +using NUnit.Framework.Legacy; namespace FAnsiTests.Table; diff --git a/Tests/FAnsiTests/TypeTranslation/DatatypeComputerTests.cs b/Tests/FAnsiTests/TypeTranslation/DatatypeComputerTests.cs index dcfcd46e..5c0c7b74 100644 --- a/Tests/FAnsiTests/TypeTranslation/DatatypeComputerTests.cs +++ b/Tests/FAnsiTests/TypeTranslation/DatatypeComputerTests.cs @@ -3,6 +3,7 @@ using FAnsi.Discovery.TypeTranslation; using FAnsi.Implementations.MicrosoftSQL; using NUnit.Framework; +using NUnit.Framework.Legacy; using TypeGuesser; namespace FAnsiTests.TypeTranslation; diff --git a/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs b/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs index 2b292b60..dc120754 100644 --- a/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs +++ b/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs @@ -245,10 +245,10 @@ private void RunKnownTypeTest(DatabaseType type, string sqlType, Type expectedTy Assert.Multiple(() => { //was the Type REQUESTED correct according to the test case expectation - Assert.That(tBefore, Is.EqualTo(expectedType), "We asked to create a '{0}', DBMS created a '{1}'. FAnsi decided that '{0}' is '{2}' and that '{1}' is '{3}'", sqlType, col.DataType.SQLType, tBefore, tAfter); + Assert.That(tBefore, Is.EqualTo(expectedType), $"We asked to create a '{sqlType}', DBMS created a '{col.DataType.SQLType}'. FAnsi decided that '{sqlType}' is '{tBefore}' and that '{col.DataType.SQLType}' is '{tAfter}'"); //Was the Type CREATED matching the REQUESTED type (as far as FAnsi is concerned) - Assert.That(tAfter, Is.EqualTo(tBefore), "We asked to create a '{0}', DBMS created a '{1}'. FAnsi decided that '{0}' is '{2}' and that '{1}' is '{3}'", sqlType, col.DataType.SQLType, tBefore, tAfter); + Assert.That(tAfter, Is.EqualTo(tBefore), $"We asked to create a '{sqlType}', DBMS created a '{col.DataType.SQLType}'. FAnsi decided that '{sqlType}' is '{tBefore}' and that '{col.DataType.SQLType}' is '{tAfter}'"); }); if (!string.Equals(col.DataType.SQLType,sqlType,StringComparison.CurrentCultureIgnoreCase))