Upgrade to NUnit 3.8.1

mythz · mythz · commit ca049bb7aa1a · 2017-11-09T17:50:39.000-05:00
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs
@@ -600,8 +600,7 @@ private object GetNextValue(IDbCommand dbCmd, string sequence, object value)
 
             if (value.ToString() != "0")
             {
-                long nv;
-                if (long.TryParse(value.ToString(), out nv))
+                if (long.TryParse(value.ToString(), out var nv))
                 {
                     LastInsertId = nv;
                     retObj = LastInsertId;
diff --git a/src/ServiceStack.OrmLite.Oracle.Tests/ForeignKeyAttributeTests.cs b/src/ServiceStack.OrmLite.Oracle.Tests/ForeignKeyAttributeTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.OrmLite.Tests
     [TestFixture]
     public class ForeignKeyAttributeTests : OrmLiteTestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Setup()
         {
             using (var dbConn = OpenDbConnection())
diff --git a/src/ServiceStack.OrmLite.Oracle.Tests/OrmLiteTestBase.cs b/src/ServiceStack.OrmLite.Oracle.Tests/OrmLiteTestBase.cs
@@ -35,7 +35,7 @@ protected void CreateNewDatabase()
 			ConnectionString = GetFileConnectionString();
 		}
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			LogManager.LogFactory = new ConsoleLogFactory();
diff --git a/src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj b/src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
   </ItemGroup>
 
diff --git a/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs
@@ -319,9 +319,8 @@ public override void SetParameterValues<T>(IDbCommand dbCmd, object obj)
 
             foreach (IDataParameter p in dbCmd.Parameters)
             {
-                FieldDefinition fieldDef;
                 var fieldName = this.ToFieldName(p.ParameterName);
-                fieldMap.TryGetValue(fieldName, out fieldDef);
+                fieldMap.TryGetValue(fieldName, out var fieldDef);
 
                 if (fieldDef == null)
                     throw new ArgumentException("Field Definition '{0}' was not found".Fmt(fieldName));
@@ -805,8 +804,7 @@ private object GetNextValue(IDbConnection connection, IDbTransaction transaction
         {
             if (!isInsert)
             {
-                long nv;
-                return long.TryParse(value.ToString(), out nv) 
+                return long.TryParse(value.ToString(), out var nv) 
                     ? nv 
                     : 0;
             }
diff --git a/src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj b/src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <PackageReference Include="Npgsql" Version="3.2.5" />
   </ItemGroup>
   
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/ServiceStack.OrmLite.SqlServerTests.csproj b/src/ServiceStack.OrmLite.SqlServerTests/ServiceStack.OrmLite.SqlServerTests.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
   </ItemGroup>
 
diff --git a/src/ServiceStack.OrmLite.VistaDB.Tests/ForeignKeyAttributeTests.cs b/src/ServiceStack.OrmLite.VistaDB.Tests/ForeignKeyAttributeTests.cs
@@ -6,7 +6,7 @@ namespace ServiceStack.OrmLite.VistaDB.Tests
     [TestFixture]
     public class ForeignKeyAttributeTests : OrmLiteTestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Setup()
         {
             using (var dbConn = OpenDbConnection())
diff --git a/src/ServiceStack.OrmLite.VistaDB.Tests/OrmLiteTestBase.cs b/src/ServiceStack.OrmLite.VistaDB.Tests/OrmLiteTestBase.cs
@@ -12,7 +12,7 @@ public class OrmLiteTestBase
 
         protected virtual string DataFileName { get; private set; }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             LogManager.LogFactory = new ConsoleLogFactory();
@@ -25,7 +25,7 @@ public void TestFixtureSetUp()
             ConnectionString = "Data Source=" + DataFileName + ";";
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             if (File.Exists(DataFileName))
diff --git a/src/ServiceStack.OrmLite.VistaDB.Tests/UseCase/SimpleUseCase.cs b/src/ServiceStack.OrmLite.VistaDB.Tests/UseCase/SimpleUseCase.cs
@@ -10,7 +10,7 @@ namespace ServiceStack.OrmLite.VistaDB.Tests.UseCase
     [TestFixture]
     public class SimpleUseCase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             //Inject your database provider here
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/ForeignKeyAttributeTests.cs b/tests/ServiceStack.OrmLite.FirebirdTests/ForeignKeyAttributeTests.cs
@@ -6,7 +6,7 @@ namespace ServiceStack.OrmLite.FirebirdTests
 	[TestFixture]
 	public class ForeignKeyAttributeTests : OrmLiteTestBase
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void Setup()
 		{
 			using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
@@ -99,7 +99,7 @@ public void CanCreateForeignWithOnDeleteSetNull()
 			}
 		}
 		
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TearDwon()
 		{
 			using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/LocalizationTests.cs b/tests/ServiceStack.OrmLite.FirebirdTests/LocalizationTests.cs
@@ -15,14 +15,14 @@ public class LocalizationTests
 		private readonly CultureInfo CurrentCulture = Thread.CurrentThread.CurrentCulture;
 		private readonly CultureInfo CurrentUICulture = Thread.CurrentThread.CurrentUICulture;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public new  void TestFixtureSetUp()
 		{
 			Thread.CurrentThread.CurrentCulture = new CultureInfo("vi-VN");
 			Thread.CurrentThread.CurrentUICulture = new CultureInfo("vi-VN");
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 			Thread.CurrentThread.CurrentCulture = CurrentCulture;
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteConnectionFactoryTests.cs b/tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteConnectionFactoryTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.OrmLite.FirebirdTests
     [Ignore("")]
     public class OrmLiteConnectionFactoryTests
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             OrmLiteConfig.DialectProvider = FirebirdOrmLiteDialectProvider.Instance; //use Pooling=false ?
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteTestBase.cs b/tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteTestBase.cs
@@ -21,7 +21,7 @@ protected void CreateNewDatabase()
 			ConnectionString = GetFileConnectionString();
 		}
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			LogManager.LogFactory = new ConsoleLogFactory();
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/ServiceStack.OrmLite.FirebirdTests.csproj b/tests/ServiceStack.OrmLite.FirebirdTests/ServiceStack.OrmLite.FirebirdTests.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite.Firebird\ServiceStack.OrmLite.Firebird.csproj" />
     <ProjectReference Include="..\ServiceStack.OrmLite.Tests\ServiceStack.OrmLite.Tests.csproj" />
diff --git a/tests/ServiceStack.OrmLite.FirebirdTests/UseCase/SimpleUseCase.cs b/tests/ServiceStack.OrmLite.FirebirdTests/UseCase/SimpleUseCase.cs
@@ -10,7 +10,7 @@ namespace ServiceStack.OrmLite.FirebirdTests
 	[TestFixture]
 	public class SimpleUseCase
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			//Inject your database provider here
diff --git a/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/ServiceStack.OrmLite.Sqlite.Windows.Tests.csproj b/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/ServiceStack.OrmLite.Sqlite.Windows.Tests.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <ProjectReference Include="..\..\src\ServiceStack.OrmLite.Sqlite.Windows\ServiceStack.OrmLite.Sqlite.Windows.csproj" />
     <ProjectReference Include="..\ServiceStack.OrmLite.Tests\ServiceStack.OrmLite.Tests.csproj" />
diff --git a/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/UseCase/NullableDateTimeOffset.cs b/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/UseCase/NullableDateTimeOffset.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.OrmLite.Tests.UseCase
     [TestFixture]
     public class NullableDateTimeOffset
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             //Inject your database provider here
diff --git a/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/packages.config b/tests/ServiceStack.OrmLite.Sqlite.Windows.Tests/packages.config
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/Issues/UtcDateTests.cs b/tests/ServiceStack.OrmLite.SqliteTests/Issues/UtcDateTests.cs
@@ -15,7 +15,7 @@ namespace ServiceStack.OrmLite.Tests.Issues
     [TestFixture]
     public class When_DateTimeConverter_DateStyle_is_Utc
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             OrmLiteConfig.DialectProvider = new SqliteOrmLiteDialectProvider();
@@ -31,7 +31,7 @@ public class User
         }
 
         [Test]
-        public void insert_and_select_utc_DateTime()
+        public void Insert_and_select_utc_DateTime()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
@@ -49,7 +49,7 @@ public void insert_and_select_utc_DateTime()
         }
 
         [Test]
-        public void insert_and_select_local_DateTime()
+        public void Insert_and_select_local_DateTime()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
@@ -74,7 +74,7 @@ public void insert_and_select_local_DateTime()
     [TestFixture]
     public class _DateTimeQueryTests
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             //OrmLiteConfig.UseParameterizeSqlExpressions = false;  //Removed in OrmLite in future
@@ -91,7 +91,7 @@ public class User
         }
 
         [Test]
-        public void count_using_utc_DateTime_in_where_clause()
+        public void Count_using_utc_DateTime_in_where_clause()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
@@ -111,7 +111,7 @@ public void count_using_utc_DateTime_in_where_clause()
         }
 
         [Test]
-        public void count_using_local_DateTime_in_where_clause()
+        public void Count_using_local_DateTime_in_where_clause()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
@@ -138,7 +138,7 @@ public void count_using_local_DateTime_in_where_clause()
     [TestFixture]
     public class When_DateTimeConverter_DateStyle_is_default
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             OrmLiteConfig.DialectProvider = new SqliteOrmLiteDialectProvider();
@@ -155,7 +155,7 @@ public class User
         }
 
         [Test]
-        public void insert_and_select_utc_DateTime()
+        public void Insert_and_select_utc_DateTime()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
@@ -174,7 +174,7 @@ public void insert_and_select_utc_DateTime()
         }
 
         [Test]
-        public void insert_and_select_local_DateTime()
+        public void Insert_and_select_local_DateTime()
         {
             using (IDbConnection db = ":memory:".OpenDbConnection())
             {
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/OrmLiteTestBase.cs b/tests/ServiceStack.OrmLite.SqliteTests/OrmLiteTestBase.cs
@@ -35,7 +35,7 @@ protected void CreateNewDatabase()
 				ConnectionString = GetFileConnectionString();
 		}
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			LogManager.LogFactory = new ConsoleLogFactory();
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj b/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/UseCase/PasswordUseCase.cs b/tests/ServiceStack.OrmLite.SqliteTests/UseCase/PasswordUseCase.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.OrmLite.Tests.UseCase
     [TestFixture]
     public class PasswordUseCase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             //Inject your database provider here
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/UseCase/SimpleUseCase.cs b/tests/ServiceStack.OrmLite.SqliteTests/UseCase/SimpleUseCase.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.OrmLite.Tests.UseCase
 	[TestFixture]
 	public class SimpleUseCase
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			//Inject your database provider here
diff --git a/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj b/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
     <PackageReference Include="System.ValueTuple" Version="4.3.1" />
   </ItemGroup>
   
@@ -70,7 +70,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(NUNITLITE)' != '' ">
-    <PackageReference Include="NUnitLite" Version="3.6.1" />
+    <PackageReference Include="NUnitLite" Version="3.8.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

Original file line number	Diff line number	Diff line change
`@@ -600,8 +600,7 @@ private object GetNextValue(IDbCommand dbCmd, string sequence, object value)`
`600`	`600`
`601`	`601`	`if (value.ToString() != "0")`
`602`	`602`	`{`
`603`		`- long nv;`
`604`		`- if (long.TryParse(value.ToString(), out nv))`
	`603`	`+ if (long.TryParse(value.ToString(), out var nv))`
`605`	`604`	`{`
`606`	`605`	`LastInsertId = nv;`
`607`	`606`	`retObj = LastInsertId;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace ServiceStack.OrmLite.Tests`
`9`	`9`	`[TestFixture]`
`10`	`10`	`public class ForeignKeyAttributeTests : OrmLiteTestBase`
`11`	`11`	`{`
`12`		`- [TestFixtureSetUp]`
	`12`	`+ [OneTimeSetUp]`
`13`	`13`	`public void Setup()`
`14`	`14`	`{`
`15`	`15`	`using (var dbConn = OpenDbConnection())`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected void CreateNewDatabase()`
`35`	`35`	`ConnectionString = GetFileConnectionString();`
`36`	`36`	`}`
`37`	`37`
`38`		`- [TestFixtureSetUp]`
	`38`	`+ [OneTimeSetUp]`
`39`	`39`	`public void TestFixtureSetUp()`
`40`	`40`	`{`
`41`	`41`	`LogManager.LogFactory = new ConsoleLogFactory();`
Original file line number	Diff line number	Diff line change
`@@ -319,9 +319,8 @@ public override void SetParameterValues<T>(IDbCommand dbCmd, object obj)`
`319`	`319`
`320`	`320`	`foreach (IDataParameter p in dbCmd.Parameters)`
`321`	`321`	`{`
`322`		`- FieldDefinition fieldDef;`
`323`	`322`	`var fieldName = this.ToFieldName(p.ParameterName);`
`324`		`- fieldMap.TryGetValue(fieldName, out fieldDef);`
	`323`	`+ fieldMap.TryGetValue(fieldName, out var fieldDef);`
`325`	`324`
`326`	`325`	`if (fieldDef == null)`
`327`	`326`	`throw new ArgumentException("Field Definition '{0}' was not found".Fmt(fieldName));`
`@@ -805,8 +804,7 @@ private object GetNextValue(IDbConnection connection, IDbTransaction transaction`
`805`	`804`	`{`
`806`	`805`	`if (!isInsert)`
`807`	`806`	`{`
`808`		`- long nv;`
`809`		`- return long.TryParse(value.ToString(), out nv)`
	`807`	`+ return long.TryParse(value.ToString(), out var nv)`
`810`	`808`	`? nv`
`811`	`809`	`: 0;`
`812`	`810`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace ServiceStack.OrmLite.VistaDB.Tests`
`6`	`6`	`[TestFixture]`
`7`	`7`	`public class ForeignKeyAttributeTests : OrmLiteTestBase`
`8`	`8`	`{`
`9`		`- [TestFixtureSetUp]`
	`9`	`+ [OneTimeSetUp]`
`10`	`10`	`public void Setup()`
`11`	`11`	`{`
`12`	`12`	`using (var dbConn = OpenDbConnection())`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class OrmLiteTestBase`
`12`	`12`
`13`	`13`	`protected virtual string DataFileName { get; private set; }`
`14`	`14`
`15`		`- [TestFixtureSetUp]`
	`15`	`+ [OneTimeSetUp]`
`16`	`16`	`public void TestFixtureSetUp()`
`17`	`17`	`{`
`18`	`18`	`LogManager.LogFactory = new ConsoleLogFactory();`
`@@ -25,7 +25,7 @@ public void TestFixtureSetUp()`
`25`	`25`	`ConnectionString = "Data Source=" + DataFileName + ";";`
`26`	`26`	`}`
`27`	`27`
`28`		`- [TestFixtureTearDown]`
	`28`	`+ [OneTimeTearDown]`
`29`	`29`	`public void TestFixtureTearDown()`
`30`	`30`	`{`
`31`	`31`	`if (File.Exists(DataFileName))`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace ServiceStack.OrmLite.VistaDB.Tests.UseCase`
`10`	`10`	`[TestFixture]`
`11`	`11`	`public class SimpleUseCase`
`12`	`12`	`{`
`13`		`- [TestFixtureSetUp]`
	`13`	`+ [OneTimeSetUp]`
`14`	`14`	`public void TestFixtureSetUp()`
`15`	`15`	`{`
`16`	`16`	`//Inject your database provider here`