diff --git a/Orchard.proj b/Orchard.proj index 29b1b5cf6..abd68aa56 100644 --- a/Orchard.proj +++ b/Orchard.proj @@ -38,6 +38,13 @@ $(BUILD_NUMBER) + + + + + + @@ -151,31 +158,20 @@ - - - - - - - + - - - - - - + diff --git a/lib/nunit/NUnitFitTests.html b/lib/nunit/NUnitFitTests.html deleted file mode 100644 index ca5cd4ff7..000000000 --- a/lib/nunit/NUnitFitTests.html +++ /dev/null @@ -1,277 +0,0 @@ - - - -

NUnit Acceptance Tests

-

- Developers love self-referential programs! Hence, NUnit has always run all it's - own tests, even those that are not really unit tests. -

Now, beginning with NUnit 2.4, NUnit has top-level tests using Ward Cunningham's - FIT framework. At this time, the tests are pretty rudimentary, but it's a start - and it's a framework for doing more. -

Running the Tests

-

Open a console or shell window and navigate to the NUnit bin directory, which - contains this file. To run the test under Microsoft .Net, enter the command - 

    runFile NUnitFitTests.html TestResults.html .
- To run it under Mono, enter - 
    mono runFile.exe NUnitFitTests.html TestResults.html .
- Note the space and dot at the end of each command. The results of your test - will be in TestResults.html in the same directory. -

Platform and CLR Version

- - - - -
NUnit.Fixtures.PlatformInfo
-

Verify Unit Tests

-

- Load and run the NUnit unit tests, verifying that the results are as expected. - When these tests are run on different platforms, different numbers of tests may - be skipped, so the values for Skipped and Run tests are informational only. -

- The number of tests in each assembly should be constant across all platforms - - any discrepancy usually means that one of the test source files was not - compiled on the platform. There should be no failures and no tests ignored. -

Note: - At the moment, the nunit.extensions.tests assembly is failing because the - fixture doesn't initialize addins in the test domain. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NUnit.Fixtures.AssemblyRunner
AssemblyTests()Run()Skipped()Ignored()Failures()
nunit.framework.tests.dll397  00
nunit.core.tests.dll355  00
nunit.util.tests.dll238  00
nunit.mocks.tests.dll43  00
nunit.extensions.tests.dll5  00
nunit-console.tests.dll40  00
nunit.uikit.tests.dll34  00
nunit-gui.tests.dll15  00
nunit.fixtures.tests.dll6  00
-

Code Snippet Tests

-

- These tests create a test assembly from a snippet of code and then load and run - the tests that it contains, verifying that the structure of the loaded tests is - as expected and that the number of tests run, skipped, ignored or failed is - correct. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NUnit.Fixtures.SnippetRunner
CodeTree()Run()Skipped()Ignored()Failures()
public class TestClass
-{
-}
- 		EMPTY0000
using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
-}
- 		TestClass0000
using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
-    [Test]
-    public void T1() { }
-    [Test]
-    public void T2() { }
-    [Test]
-    public void T3() { }
-}
- 
TestClass
->T1
->T2
->T3
- 		3000
using NUnit.Framework;
-
-[TestFixture]
-public class TestClass1
-{
-    [Test]
-    public void T1() { }
-}
-
-[TestFixture]
-public class TestClass2
-{
-    [Test]
-    public void T2() { }
-    [Test]
-    public void T3() { }
-}
- 
TestClass1
->T1
-TestClass2
->T2
->T3
- 		3000
using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
-    [Test]
-    public void T1() { }
-    [Test, Ignore]
-    public void T2() { }
-    [Test]
-    public void T3() { }
-}
- 
TestClass
->T1
->T2
->T3
- 		2010
using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
-    [Test]
-    public void T1() { }
-    [Test, Explicit]
-    public void T2() { }
-    [Test]
-    public void T3() { }
-}
- 
TestClass
->T1
->T2
->T3
- 		2100
-

Summary Information

- - - - -
fit.Summary
- - diff --git a/lib/nunit/NUnitTests.config b/lib/nunit/NUnitTests.config deleted file mode 100644 index de8a65698..000000000 --- a/lib/nunit/NUnitTests.config +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/nunit/NUnitTests.nunit b/lib/nunit/NUnitTests.nunit deleted file mode 100644 index e7bb7f432..000000000 --- a/lib/nunit/NUnitTests.nunit +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/lib/nunit/agent.conf b/lib/nunit/agent.conf deleted file mode 100644 index ddbcd8ea6..000000000 --- a/lib/nunit/agent.conf +++ /dev/null @@ -1,4 +0,0 @@ - - 8080 - . - \ No newline at end of file diff --git a/lib/nunit/agent.log.conf b/lib/nunit/agent.log.conf deleted file mode 100644 index 4bd90ca49..000000000 --- a/lib/nunit/agent.log.conf +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/lib/nunit/clr.bat b/lib/nunit/clr.bat deleted file mode 100644 index 0a838482c..000000000 --- a/lib/nunit/clr.bat +++ /dev/null @@ -1,96 +0,0 @@ -@echo off -rem Run a program under a particular version of the .Net framework -rem by setting the COMPLUS_Version environment variable. -rem -rem This command was written by Charlie Poole for the NUnit project. -rem You may use it separately from NUnit at your own risk. - -if "%1"=="/?" goto help -if "%1"=="?" goto help -if "%1"=="" goto GetVersion -if /I "%1"=="off" goto RemoveVersion -if "%2"=="" goto SetVersion -goto main - -:help -echo Control the version of the .Net framework that is used. The -echo command has several forms: -echo. -echo CLR -echo Reports the version of the CLR that has been set -echo. -echo CLR version -echo Sets the local shell environment to use a specific -echo version of the CLR for subsequent commands. -echo. -echo CLR version command [arguments] -echo Executes a single command using the specified CLR version. -echo. -echo CLR off -echo Turns off specific version selection for commands -echo. -echo The CLR version may be specified as vn.n.n or n.n.n. In addition, -echo the following shortcuts are recognized: -echo net-1.0, 1.0 For version 1.0.3705 -echo net-1.1, 1.1 For version 1.1.4322 -echo beta2 For version 2.0.50215 -echo net-2.0, 2.0 For version 2.0.50727 -echo. -echo NOTE: -echo Any specific settings for required or supported runtime in -echo the ^ section of a program's config file will -echo override the version specified by this command, and the -echo command will have no effect. -echo. -goto done - -:main - -setlocal -set CMD= -call :SetVersion %1 -shift /1 - -:loop 'Copy remaining arguments to form the command -if "%1"=="" goto run -set CMD=%CMD% %1 -shift /1 -goto :loop - -:run 'Execute the command -%CMD% -endlocal -goto done - -:SetVersion -set COMPLUS_Version=%1 - -rem Substitute proper format for certain names -if /I "%COMPLUS_Version:~0,1%"=="v" goto useit -if /I "%COMPLUS_Version%"=="net-1.0" set COMPLUS_Version=v1.0.3705&goto report -if /I "%COMPLUS_Version%"=="1.0" set COMPLUS_Version=v1.0.3705&goto report -if /I "%COMPLUS_Version%"=="net-1.1" set COMPLUS_Version=v1.1.4322&goto report -if /I "%COMPLUS_Version%"=="1.1" set COMPLUS_Version=v1.1.4322&goto report -if /I "%COMPLUS_Version%"=="beta2" set COMPLUS_Version=v2.0.50215&goto report -if /I "%COMPLUS_Version%"=="net-2.0" set COMPLUS_Version=v2.0.50727&goto report -if /I "%COMPLUS_Version%"=="2.0" set COMPLUS_Version=v2.0.50727&goto report - -rem Add additional substitutions here, branching to report - -rem assume it's a version number without 'v' -set COMPLUS_Version=v%COMPLUS_Version% - -:report -echo Setting CLR version to %COMPLUS_Version% -goto done - -:GetVersion -if "%COMPLUS_Version%"=="" echo CLR version is not set -if NOT "%COMPLUS_Version%"=="" echo CLR version is set to %COMPLUS_Version% -goto done - -:RemoveVersion -set COMPLUS_Version= -echo CLR version is no longer set - -:done \ No newline at end of file diff --git a/lib/nunit/launcher.log.conf b/lib/nunit/launcher.log.conf deleted file mode 100644 index 4bd90ca49..000000000 --- a/lib/nunit/launcher.log.conf +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/lib/nunit/lib/Failure.png b/lib/nunit/lib/Failure.png deleted file mode 100644 index 2e400b276..000000000 Binary files a/lib/nunit/lib/Failure.png and /dev/null differ diff --git a/lib/nunit/lib/Ignored.png b/lib/nunit/lib/Ignored.png deleted file mode 100644 index 478efbf00..000000000 Binary files a/lib/nunit/lib/Ignored.png and /dev/null differ diff --git a/lib/nunit/lib/Inconclusive.png b/lib/nunit/lib/Inconclusive.png deleted file mode 100644 index 4807b7ced..000000000 Binary files a/lib/nunit/lib/Inconclusive.png and /dev/null differ diff --git a/lib/nunit/lib/Skipped.png b/lib/nunit/lib/Skipped.png deleted file mode 100644 index 7c9fc64e3..000000000 Binary files a/lib/nunit/lib/Skipped.png and /dev/null differ diff --git a/lib/nunit/lib/Success.png b/lib/nunit/lib/Success.png deleted file mode 100644 index 2a301508c..000000000 Binary files a/lib/nunit/lib/Success.png and /dev/null differ diff --git a/lib/nunit/lib/fit.dll b/lib/nunit/lib/fit.dll deleted file mode 100644 index 40bbef0e2..000000000 Binary files a/lib/nunit/lib/fit.dll and /dev/null differ diff --git a/lib/nunit/lib/log4net.dll b/lib/nunit/lib/log4net.dll deleted file mode 100644 index 20a2e1c47..000000000 Binary files a/lib/nunit/lib/log4net.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit-console-runner.dll b/lib/nunit/lib/nunit-console-runner.dll deleted file mode 100644 index 3f9c0e931..000000000 Binary files a/lib/nunit/lib/nunit-console-runner.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit-gui-runner.dll b/lib/nunit/lib/nunit-gui-runner.dll deleted file mode 100644 index 894c3383f..000000000 Binary files a/lib/nunit/lib/nunit-gui-runner.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.core.dll b/lib/nunit/lib/nunit.core.dll deleted file mode 100644 index 6fd79cf14..000000000 Binary files a/lib/nunit/lib/nunit.core.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.core.interfaces.dll b/lib/nunit/lib/nunit.core.interfaces.dll deleted file mode 100644 index 2794827b9..000000000 Binary files a/lib/nunit/lib/nunit.core.interfaces.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.fixtures.dll b/lib/nunit/lib/nunit.fixtures.dll deleted file mode 100644 index 1658b3791..000000000 Binary files a/lib/nunit/lib/nunit.fixtures.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.uiexception.dll b/lib/nunit/lib/nunit.uiexception.dll deleted file mode 100644 index 3f05866d9..000000000 Binary files a/lib/nunit/lib/nunit.uiexception.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.uikit.dll b/lib/nunit/lib/nunit.uikit.dll deleted file mode 100644 index cb3cfdf9a..000000000 Binary files a/lib/nunit/lib/nunit.uikit.dll and /dev/null differ diff --git a/lib/nunit/lib/nunit.util.dll b/lib/nunit/lib/nunit.util.dll deleted file mode 100644 index 71ca49bca..000000000 Binary files a/lib/nunit/lib/nunit.util.dll and /dev/null differ diff --git a/lib/nunit/license.txt b/lib/nunit/license.txt deleted file mode 100644 index 66a5ebf28..000000000 --- a/lib/nunit/license.txt +++ /dev/null @@ -1,15 +0,0 @@ -Copyright © 2002-2008 Charlie Poole -Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov -Copyright © 2000-2002 Philip A. Craig - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required. - -Portions Copyright © 2002-2008 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig - -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source distribution. diff --git a/lib/nunit/nunit-agent.exe b/lib/nunit/nunit-agent.exe deleted file mode 100644 index 9b189c1aa..000000000 Binary files a/lib/nunit/nunit-agent.exe and /dev/null differ diff --git a/lib/nunit/nunit-agent.exe.config b/lib/nunit/nunit-agent.exe.config deleted file mode 100644 index e33ec06e0..000000000 --- a/lib/nunit/nunit-agent.exe.config +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/nunit-console-x86.exe b/lib/nunit/nunit-console-x86.exe deleted file mode 100644 index 83849f3af..000000000 Binary files a/lib/nunit/nunit-console-x86.exe and /dev/null differ diff --git a/lib/nunit/nunit-console-x86.exe.config b/lib/nunit/nunit-console-x86.exe.config deleted file mode 100644 index bd83fb171..000000000 --- a/lib/nunit/nunit-console-x86.exe.config +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/nunit-console.exe b/lib/nunit/nunit-console.exe deleted file mode 100644 index 9f6190573..000000000 Binary files a/lib/nunit/nunit-console.exe and /dev/null differ diff --git a/lib/nunit/nunit-console.exe.config b/lib/nunit/nunit-console.exe.config deleted file mode 100644 index 329567941..000000000 --- a/lib/nunit/nunit-console.exe.config +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/nunit-x86.exe b/lib/nunit/nunit-x86.exe deleted file mode 100644 index 138323777..000000000 Binary files a/lib/nunit/nunit-x86.exe and /dev/null differ diff --git a/lib/nunit/nunit-x86.exe.config b/lib/nunit/nunit-x86.exe.config deleted file mode 100644 index 9d5ca14e9..000000000 --- a/lib/nunit/nunit-x86.exe.config +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/nunit.exe b/lib/nunit/nunit.exe deleted file mode 100644 index e3a0d28e1..000000000 Binary files a/lib/nunit/nunit.exe and /dev/null differ diff --git a/lib/nunit/nunit.exe.config b/lib/nunit/nunit.exe.config deleted file mode 100644 index 9d5ca14e9..000000000 --- a/lib/nunit/nunit.exe.config +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/nunit.framework.dll b/lib/nunit/nunit.framework.dll deleted file mode 100644 index 2729ddf28..000000000 Binary files a/lib/nunit/nunit.framework.dll and /dev/null differ diff --git a/lib/nunit/pnunit-agent.exe b/lib/nunit/pnunit-agent.exe deleted file mode 100644 index 7a559eb24..000000000 Binary files a/lib/nunit/pnunit-agent.exe and /dev/null differ diff --git a/lib/nunit/pnunit-agent.exe.config b/lib/nunit/pnunit-agent.exe.config deleted file mode 100644 index f4236b6dd..000000000 --- a/lib/nunit/pnunit-agent.exe.config +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/pnunit-launcher.exe b/lib/nunit/pnunit-launcher.exe deleted file mode 100644 index 5251378d8..000000000 Binary files a/lib/nunit/pnunit-launcher.exe and /dev/null differ diff --git a/lib/nunit/pnunit-launcher.exe.config b/lib/nunit/pnunit-launcher.exe.config deleted file mode 100644 index 87828f68d..000000000 --- a/lib/nunit/pnunit-launcher.exe.config +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/nunit/pnunit.framework.dll b/lib/nunit/pnunit.framework.dll deleted file mode 100644 index 494dc721c..000000000 Binary files a/lib/nunit/pnunit.framework.dll and /dev/null differ diff --git a/lib/nunit/pnunit.tests.dll b/lib/nunit/pnunit.tests.dll deleted file mode 100644 index ac67a2b4f..000000000 Binary files a/lib/nunit/pnunit.tests.dll and /dev/null differ diff --git a/lib/nunit/runFile.exe b/lib/nunit/runFile.exe deleted file mode 100644 index a79445866..000000000 Binary files a/lib/nunit/runFile.exe and /dev/null differ diff --git a/lib/nunit/runFile.exe.config b/lib/nunit/runFile.exe.config deleted file mode 100644 index f58f099b6..000000000 --- a/lib/nunit/runFile.exe.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/nunit/runpnunit.bat b/lib/nunit/runpnunit.bat deleted file mode 100644 index a05cbb7d9..000000000 --- a/lib/nunit/runpnunit.bat +++ /dev/null @@ -1,2 +0,0 @@ -start pnunit-agent agent.conf -pnunit-launcher test.conf \ No newline at end of file diff --git a/lib/nunit/test.conf b/lib/nunit/test.conf deleted file mode 100644 index 14cd11307..000000000 --- a/lib/nunit/test.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Testing - - - Testing - pnunit.tests.dll - TestLibraries.Testing.EqualTo19 - localhost:8080 - - ..\server - - - - - - - - - - - \ No newline at end of file diff --git a/src/Orchard.Specs/Hosting/TraceEnabledDataServicesProviderFactory.cs b/src/Orchard.Specs/Hosting/TraceEnabledDataServicesProviderFactory.cs index 8e79f2b7a..204e1e1eb 100644 --- a/src/Orchard.Specs/Hosting/TraceEnabledDataServicesProviderFactory.cs +++ b/src/Orchard.Specs/Hosting/TraceEnabledDataServicesProviderFactory.cs @@ -13,7 +13,8 @@ namespace Orchard.Specs.Hosting { } public override IPersistenceConfigurer GetPersistenceConfigurer(bool createDatabase) { var config = (MsSqlCeConfiguration)base.GetPersistenceConfigurer(createDatabase); - config.ShowSql(); + // Uncomment to display SQL while running tests + // config.ShowSql(); return config; } } diff --git a/src/Orchard.Tests/DataUtility.cs b/src/Orchard.Tests/DataUtility.cs index 20e12285c..4c28290f8 100644 --- a/src/Orchard.Tests/DataUtility.cs +++ b/src/Orchard.Tests/DataUtility.cs @@ -23,7 +23,8 @@ namespace Orchard.Tests { // .Conventions.AddFromAssemblyOf(); var persistenceModel = AbstractDataServicesProvider.CreatePersistenceModel(types.Select(t => new RecordBlueprint { TableName = "Test_" + t.Name, Type = t }).ToList()); var persistenceConfigurer = new SqlCeDataServicesProvider(fileName).GetPersistenceConfigurer(true/*createDatabase*/); - ((MsSqlCeConfiguration)persistenceConfigurer).ShowSql(); + // Uncomment to display SQL while running tests + // ((MsSqlCeConfiguration)persistenceConfigurer).ShowSql(); return Fluently.Configure() .Database(persistenceConfigurer) diff --git a/src/Orchard.Tests/FluentDbTests.cs b/src/Orchard.Tests/FluentDbTests.cs index 39a038cd4..70f8df0b0 100644 --- a/src/Orchard.Tests/FluentDbTests.cs +++ b/src/Orchard.Tests/FluentDbTests.cs @@ -46,7 +46,8 @@ namespace Orchard.Tests { var fileName = "temp.sdf"; var persistenceConfigurer = new SqlCeDataServicesProvider(fileName).GetPersistenceConfigurer(true/*createDatabase*/); - ((MsSqlCeConfiguration)persistenceConfigurer).ShowSql(); + // Uncomment to display SQL while running tests + // ((MsSqlCeConfiguration)persistenceConfigurer).ShowSql(); var sessionFactory = Fluently.Configure() .Database(persistenceConfigurer)