Update NUnit to version 2.5.6

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6211 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Tools/NUnit/nunit-console/AssemblyInfo.cs

@@ -36,5 +36,5 @@ using System.Reflection;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.5.5")]
-[assembly: AssemblyInformationalVersion("2.5.5")]
+[assembly: AssemblyVersion("2.5.6")]
+[assembly: AssemblyInformationalVersion("2.5.6")]

src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs

@@ -76,7 +76,7 @@ namespace NUnit.ConsoleRunner
                     ? package.Settings["RuntimeFramework"]
                     : "Default");
 
-            TestRunner testRunner = new TestRunnerFactory().MakeTestRunner(package);
+            TestRunner testRunner = new DefaultTestRunnerFactory().MakeTestRunner(package);
             testRunner.Load(package);
 
             try
@@ -93,7 +93,7 @@ namespace NUnit.ConsoleRunner
 				TestFilter testFilter = TestFilter.Empty;
 				if ( options.run != null && options.run != string.Empty )
 				{
-					Console.WriteLine( "Selected test: " + options.run );
+					Console.WriteLine( "Selected test(s): " + options.run );
 					testFilter = new SimpleNameFilter( options.run );
 				}
 
@@ -119,6 +119,9 @@ namespace NUnit.ConsoleRunner
 						testFilter = new AndFilter( testFilter, excludeFilter );
 				}
 
+        if (testFilter is NotFilter)
+          ((NotFilter)testFilter).TopLevel = true;
+        
 				TestResult result = null;
 				string savedDirectory = Environment.CurrentDirectory;
 				TextWriter savedOut = Console.Out;
@@ -196,12 +199,13 @@ namespace NUnit.ConsoleRunner
 		}
 
 		#region Helper Methods
-        private static TestPackage MakeTestPackage( ConsoleOptions options )
-        {
+    // TODO: See if this can be unified with the Gui's MakeTestPackage
+    private static TestPackage MakeTestPackage( ConsoleOptions options )
+    {
 			TestPackage package;
 			DomainUsage domainUsage = DomainUsage.Default;
             ProcessModel processModel = ProcessModel.Default;
-            RuntimeFramework framework = RuntimeFramework.CurrentFramework;
+            RuntimeFramework framework = null;
 
 			if (options.IsTestProject)
 			{

src/Tools/NUnit/nunit-console/ExtendedRunner.cs

@@ -63,10 +63,7 @@ namespace NUnit.ConsoleRunner
 			//ServiceManager.Services.AddService( new TestLoader() );
 			ServiceManager.Services.AddService( new AddinRegistry() );
 			ServiceManager.Services.AddService( new AddinManager() );
-			// Hack: Resolves conflict with gui testagency when running
-			// console tests under the gui.
-            if ( !AppDomain.CurrentDomain.FriendlyName.StartsWith("test-domain-") )
-                ServiceManager.Services.AddService( new TestAgency() );
+      ServiceManager.Services.AddService( new TestAgency() );
 
 			// Initialize Services
 			ServiceManager.Services.InitializeServices();