Skip to content

NH-3900 - Update to NUnit 3 #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NHibernate.nunit
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.Linq\bin\Debug-2.0\NHibernate.Test.Linq.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
</Config>
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.Linq\bin\Release-2.0\NHibernate.Test.Linq.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
</Config>
</NUnitProject>
4 changes: 2 additions & 2 deletions ShowBuildMenu.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
set BUILDTOOL="%~dp0Tools\BuildTool\bin\Release\BuildTool.exe"
set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
set CURRENT_CONFIGURATION=%~dp0current-test-configuration
set NUNIT="%~dp0Tools\nunit\nunit-x86.exe"
set NUNIT="%~dp0Tools\nunit\nunit3-console.exe"

:main-menu
echo ========================= NHIBERNATE BUILD MENU ==========================
Expand Down Expand Up @@ -161,7 +161,7 @@ echo Configuration activated.
goto main-menu

:test-run
start "" %NUNIT% NHibernate.nunit
start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
goto main-menu

rem :build-test
Expand Down
12 changes: 12 additions & 0 deletions Tools/nunit/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
NUnit msi Installer 3.5.0 - October 12th, 2016

* Framework is no longer installed, now solely distributed via NuGet.

Components Installed:
* NUnit.Engine 3.4.1
* NUnit.Console 3.4.1
* NUnit.Extension.VSProjectLoader 3.4.1
* NUnit.Extension.NUnitProjectLoader 3.4.1
* NUnit.Extension.NUnitV2Driver 3.4.1
* NUnit.Extension.NUnitV2ResultWriter 3.4.1
* NUnit.Extension.TeamCityEventListener 1.0.2
20 changes: 20 additions & 0 deletions Tools/nunit/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright (c) 2016 Charlie Poole

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

6 changes: 6 additions & 0 deletions Tools/nunit/License.rtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl276\slmult1\lang9\b\f0\fs22 Copyright (c) 2016 Charlie Poole\b0\par
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\par
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par
}
Binary file added Tools/nunit/Mono.Cecil.dll
Binary file not shown.
5 changes: 5 additions & 0 deletions Tools/nunit/NOTICES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
NUnit 3.0 is based on earlier versions of NUnit, with Portions

Copyright (c) 2002-2014 Charlie Poole or
Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or
Copyright (c) 2000-2002 Philip A. Craig
277 changes: 0 additions & 277 deletions Tools/nunit/NUnitFitTests.html

This file was deleted.

Loading