nunit3 update(specsfor still relies on nunit2)

Author: lnu

source/NHibernate.AspNet.Identity.Tests/NHibernate.AspNet.Identity.Tests.csproj

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,6 +21,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,8 +74,8 @@
     <Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NHibernate.5.0.0\lib\net461\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
@@ -150,6 +154,13 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.96.0\build\net451\System.Data.SQLite.Core.targets')" />
   <Import Project="..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

source/NHibernate.AspNet.Identity.Tests/SessionFactoryProvider.cs

@@ -6,6 +6,7 @@
 using NHibernate.Cfg;
 using NHibernate.Mapping.ByCode;
 using NHibernate.Tool.hbm2ddl;
+using NUnit.Framework;
 
 namespace NHibernate.AspNet.Identity.Tests
 {
@@ -53,7 +54,8 @@ private SessionFactoryProvider()
             var mapping = mapper.CompileMappingForEach(allEntities);
 
             _configuration = new Configuration();
-            _configuration.Configure("sqlite-nhibernate-config.xml");
+            // nunit3 change: the directory is not set by default and must be retrieved from TestContext
+            _configuration.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "sqlite-nhibernate-config.xml"));
             foreach (var map in mapping)
             {
                 Console.WriteLine(map.AsString());

source/NHibernate.AspNet.Identity.Tests/UserStoreTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using System.Security.Claims;
+using System.Threading.Tasks;
 using System.Transactions;
 using TestClass = NUnit.Framework.TestFixtureAttribute;
 using TestCleanup = NUnit.Framework.TearDownAttribute;
@@ -33,17 +34,17 @@ public void Cleanup()
         }
 
         [TestMethod]
-        public void WhenHaveNoUser()
+        public async Task WhenHaveNoUser()
         {
             var login = new UserLoginInfo("ProviderTest", "ProviderKey");
             var store = new UserStore<IdentityUser>(_session);
-            var user = store.FindAsync(login).Result;
+            var user = await store.FindAsync(login);
 
             Assert.IsNull(user);
         }
 
         [TestMethod]
-        public void WhenAddLoginAsync()
+        public async Task WhenAddLoginAsync()
         {
             var user = new IdentityUser("Lukz");
             var login = new UserLoginInfo("ProviderTest02", "ProviderKey02");
@@ -59,7 +60,7 @@ public void WhenAddLoginAsync()
             this._session.Clear();
 
             var actual = _session.Query<IdentityUser>().FirstOrDefault(x => x.UserName == user.UserName);
-            var userStored = store.FindAsync(login).Result;
+            var userStored = await store.FindAsync(login);
 
             Assert.IsNotNull(actual);
             Assert.AreEqual(user.UserName, actual.UserName);
@@ -91,14 +92,14 @@ public void WhenRemoveLoginAsync()
         }
 
         [TestMethod]
-        public void WhenCreateUserAsync()
+        public async Task WhenCreateUserAsync()
         {
             var userManager = new UserManager<ApplicationUser>(new UserStore<ApplicationUser>(_session));
             var user = new ApplicationUser() { UserName = "RealUserName" };
 
             using (var transaction = new TransactionScope())
             {
-                var result = userManager.CreateAsync(user, "RealPassword").GetAwaiter().GetResult();
+                var result = await userManager.CreateAsync(user, "RealPassword");
                 transaction.Complete();
                 Assert.AreEqual(0, result.Errors.Count());
             }
@@ -133,7 +134,7 @@ public void GivenHaveRoles_WhenDeleteUser_ThenDeletingCausesNoCascade()
         }
 
         [TestMethod]
-        public void WhenRemoveUserFromRole_ThenDoNotDeleteRole_BugFix()
+        public async Task WhenRemoveUserFromRole_ThenDoNotDeleteRole_BugFix()
         {
             var user = new IdentityUser("Lukz 05");
             var role = new IdentityRole("ADM05");
@@ -146,12 +147,12 @@ public void WhenRemoveUserFromRole_ThenDoNotDeleteRole_BugFix()
 
             Assert.IsTrue(_session.Query<IdentityRole>().Any(x => x.Name == "ADM05"));
             Assert.IsTrue(_session.Query<IdentityUser>().Any(x => x.UserName == "Lukz 05"));
-            Assert.IsTrue(store.IsInRoleAsync(user, "ADM05").Result);
+            Assert.IsTrue(await store.IsInRoleAsync(user, "ADM05"));
 
             var result = store.RemoveFromRoleAsync(user, "ADM05");
 
             Assert.IsNull(result.Exception);
-            Assert.IsFalse(store.IsInRoleAsync(user, "ADM05").Result);
+            Assert.IsFalse(await store.IsInRoleAsync(user, "ADM05"));
             Assert.IsTrue(_session.Query<IdentityUser>().Any(x => x.UserName == "Lukz 05"));
             Assert.IsTrue(_session.Query<IdentityRole>().Any(x => x.Name == "ADM05"));
         }

source/NHibernate.AspNet.Identity.Tests/packages.config

@@ -11,7 +11,8 @@
   <package id="MilesiBastos.SharpArch.Domain" version="4.0.3000" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
   <package id="NHibernate" version="5.0.0" targetFramework="net461" />
-  <package id="NUnit" version="2.6.4" targetFramework="net451" />
+  <package id="NUnit" version="3.10.1" targetFramework="net461" />
+  <package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net461" />
   <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net461" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
   <package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />