Updated to NUnit 2.5.1

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4418 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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

@@ -16,7 +16,7 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("NUnit.org")]
 [assembly: AssemblyProduct("NUnit")]
-[assembly: AssemblyCopyright("Copyright (C) 2002-2008 Charlie Poole.\r\n" +
+[assembly: AssemblyCopyright("Copyright (C) 2002-2009 Charlie Poole.\r\n" +
                              "Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\n" +
                              "Copyright (C) 2000-2002 Philip Craig.\r\n" +
                              "Copyright (C) 2006 Daniel Grunwald.\r\n" +
@@ -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.0")]
-[assembly: AssemblyInformationalVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.1")]
+[assembly: AssemblyInformationalVersion("2.5.1")]

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

@@ -82,17 +82,17 @@ namespace NUnit.ConsoleRunner
 
 		public void TestFinished(TestResult testResult)
 		{
-			if(testResult.Executed)
+			switch( testResult.ResultState )
 			{
-				testRunCount++;
-
-				if(testResult.IsFailure)
-				{	
+				case ResultState.Error:
+				case ResultState.Failure:
+				case ResultState.Cancelled:
+					testRunCount++;
 					failureCount++;
-						
+					
 					if ( progress )
 						Console.Write("F");
-						
+					
 					messages.Add( string.Format( "{0}) {1} :", failureCount, testResult.Test.TestName.FullName ) );
 					messages.Add( testResult.Message.Trim( Environment.NewLine.ToCharArray() ) );
 
@@ -109,21 +109,28 @@ namespace NUnit.ConsoleRunner
 							}
 						}
 					}
-				}
-			}
-			else
-			{
-				testIgnoreCount++;
+					break;
+
+				case ResultState.Inconclusive:
+				case ResultState.Success:
+					testRunCount++;
+					break;
+
+				case ResultState.Ignored:
+				case ResultState.Skipped:
+				case ResultState.NotRunnable:
+					testIgnoreCount++;
 					
-				if ( progress )
-					Console.Write("N");
+					if ( progress )
+						Console.Write("N");
+					break;
 			}
+
+			currentTestName = string.Empty;
 			
 			if (writeResults) {
 				WriteTestResult(testResult);
 			}
-			
-			currentTestName = string.Empty;
 		}
 
 		public void TestStarted(TestName testName)

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

@@ -270,7 +270,7 @@ namespace NUnit.ConsoleRunner
 		private static void WriteSummaryReport( ResultSummarizer summary )
 		{
             Console.WriteLine(
-                "Tests run: {0}, Errors: {1}, Failures: {2}, Inconclusive: {3} Time: {4} seconds",
+                "Tests run: {0}, Errors: {1}, Failures: {2}, Inconclusive: {3}, Time: {4} seconds",
                 summary.TestsRun, summary.Errors, summary.Failures, summary.Inconclusive, summary.Time);
             Console.WriteLine(
                 "  Not run: {0}, Invalid: {1}, Ignored: {2}, Skipped: {3}",

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

@@ -105,7 +105,7 @@ namespace NUnit.ConsoleRunner
 			string versionText = executingAssembly.GetName().Version.ToString();
 
 			string productName = "NUnit";
-			string copyrightText = "Copyright (C) 2002-2008 Charlie Poole.\r\nCopyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\nCopyright (C) 2000-2002 Philip Craig.\r\nAll Rights Reserved.";
+			string copyrightText = "Copyright (C) 2002-2009 Charlie Poole.\r\nCopyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\nCopyright (C) 2000-2002 Philip Craig.\r\nAll Rights Reserved.";
 
 			object[] objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
 			if ( objectAttrs.Length > 0 )
@@ -116,8 +116,12 @@ namespace NUnit.ConsoleRunner
 				copyrightText = ((AssemblyCopyrightAttribute)objectAttrs[0]).Copyright;
 
 			objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyConfigurationAttribute), false);
-			if ( objectAttrs.Length > 0 )
-				versionText += string.Format(" ({0})", ((AssemblyConfigurationAttribute)objectAttrs[0]).Configuration);
+      if (objectAttrs.Length > 0)
+      {
+        string configText = ((AssemblyConfigurationAttribute)objectAttrs[0]).Configuration;
+        if (configText != "")
+          versionText += string.Format(" ({0})", configText);
+      }
 
 			Console.WriteLine(String.Format("{0} version {1}", productName, versionText));
 			Console.WriteLine(copyrightText);