Add commented out TestResultsReader test.

FreeBSoD · Jan 20, 2013 · 5d51ca5 · 5d51ca5
1 parent ba0ebf5
commit 5d51ca5
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 105 deletions.
diff --git a/src/AddIns/Analysis/UnitTesting/Test/TestRunner/TestResultsReaderTests.cs b/src/AddIns/Analysis/UnitTesting/Test/TestRunner/TestResultsReaderTests.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using ICSharpCode.UnitTesting;
 using NUnit.Framework;
 
@@ -12,16 +13,23 @@ namespace UnitTesting.Tests.TestRunner
 	[TestFixture]
 	public class TestResultsReaderTests
 	{
+		List<TestResult> ReadTestResults(string resultsText)
+		{
+			var reader = new TestResultsReader(new StringReader(resultsText));
+			var results = new List<TestResult>();
+			reader.TestFinished += (sender, e) => results.Add(e.Result);
+			reader.Run();
+			return results;
+		}
+
 		[Test]
 		public void OneTestPass()
 		{
-			string resultsText = "Name: MyTest\r\n" +
+			string resultsText =
+				"Name: MyTest\r\n" +
 				"Result: Success\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -34,13 +42,11 @@ public void OneTestPass()
 		[Test]
 		public void OneTestIgnored()
 		{
-			string resultsText = "Name: MyTest\r\n" +
+			string resultsText =
+				"Name: MyTest\r\n" +
 				"Result: Ignored\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -50,23 +56,25 @@ public void OneTestIgnored()
 			Assert.IsFalse(result.IsSuccess);
 			Assert.AreEqual(TestResultType.Ignored, result.ResultType);
 		}
-		/*
+
 		[Test]
 		public void OneTestPassInParts()
 		{
-			string resultsText = "Name: MyTest\r\n" +
+			string resultsText =
+				"Name: MyTest\r\n" +
 				"Result: Success\r\n";
-
-			TestResultsReader reader = new TestResultsReader();
 
-			List<TestResult> results = new List<TestResult>();
+			var stream = new MemoryStream();
+			var streamReader = new StreamReader(stream);
+			var reader = new TestResultsReader(streamReader);
+			var results = new List<TestResult>();
+			reader.TestFinished += (sender, e) => results.Add(e.Result);
+
 			foreach (char ch in resultsText) {
-				TestResult[] readResults = reader.Read(ch.ToString());
-				if (readResults.Length > 0) {
-					foreach (TestResult readResult in readResults) {
-						results.Add(readResult);
-					}
-				}
+				byte[] bytes = Encoding.UTF8.GetBytes(new char[] { ch });
+				stream.Write(bytes, 0, bytes.Length);
+				stream.Position--;
+				reader.Run();
 			}
 
 			Assert.AreEqual(1, results.Count);
@@ -75,17 +83,15 @@ public void OneTestPassInParts()
 			Assert.AreEqual("MyTest", result.Name);
 			Assert.IsTrue(result.IsSuccess);
 		}
-		*/
+
 		[Test]
 		public void OneTestFailure()
 		{
-			string resultsText = "Name: MyTest\r\n" +
+			string resultsText =
+				"Name: MyTest\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -100,14 +106,12 @@ public void OneTestFailure()
 		[Test]
 		public void TestMessage()
 		{
-			string resultsText = "Name: Test\r\n" +
+			string resultsText =
+				"Name: Test\r\n" +
 				"Message: Should not be 0.\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -120,14 +124,12 @@ public void TestMessage()
 		[Test]
 		public void TestStackTrace()
 		{
-			string resultsText = "Name: Test\r\n" +
+			string resultsText =
+				"Name: Test\r\n" +
 				"StackTrace: stack trace\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -141,26 +143,21 @@ public void TestStackTrace()
 		public void ResultWithNoTestName()
 		{
 			string resultsText = "Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(0, results.Count);
 		}
 
 		[Test]
 		public void MissingNameValuePairOnFirstLine()
 		{
-			string resultsText = "MissingNameValuePair\r\n" +
+			string resultsText =
+				"MissingNameValuePair\r\n" +
 				"Name: Test\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -172,15 +169,13 @@ public void MissingNameValuePairOnFirstLine()
 		[Test]
 		public void TwoLineTestMessage()
 		{
-			string resultsText = "Name: Test\r\n" +
+			string resultsText =
+				"Name: Test\r\n" +
 				"Message: Should not be 0.\r\n" +
 				" Should be 1.\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -193,16 +188,14 @@ public void TwoLineTestMessage()
 		[Test]
 		public void ThreeLineTestMessage()
 		{
-			string resultsText = "Name: Test\r\n" +
+			string resultsText =
+				"Name: Test\r\n" +
 				"Message: Should not be 0.\r\n" +
 				" Should be 1.\r\n" +
 				" End of message.\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(1, results.Count);
 
@@ -215,15 +208,13 @@ public void ThreeLineTestMessage()
 		[Test]
 		public void TwoTestFailures()
 		{
-			string resultsText = "Name: MyTest1\r\n" +
+			string resultsText =
+				"Name: MyTest1\r\n" +
 				"Result: Failure\r\n" +
 				"Name: MyTest2\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(2, results.Count);
 
@@ -239,7 +230,8 @@ public void TwoTestFailures()
 		[Test]
 		public void TwoTestFailuresWithMultilineMessages()
 		{
-			string resultsText = "Name: MyTest1\r\n" +
+			string resultsText =
+				"Name: MyTest1\r\n" +
 				"Message: FirstLine\r\n" +
 				" SecondLine\r\n" +
 				"Result: Failure\r\n" +
@@ -248,11 +240,8 @@ public void TwoTestFailuresWithMultilineMessages()
 				" SecondLine\r\n" +
 				" ThirdLine\r\n" +
 				"Result: Failure\r\n";
-
-			TestResultsReader reader = new TestResultsReader(new StringReader(resultsText));
-			List<TestResult> results = new List<TestResult>();
-			reader.TestFinished += (sender, e) => results.Add(e.Result);
-			reader.Run();
+
+			List<TestResult> results = ReadTestResults(resultsText);
 
 			Assert.AreEqual(2, results.Count);
 

diff --git a/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsReader.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsReader.cs
@@ -25,7 +25,6 @@ public class TestResultsReader : ITestResultsReader
 		TextReader reader;
 		readonly NamedPipeServerStream namedPipe;
 		readonly string pipeName;
-		TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
 
 		public TestResultsReader()
 		{

diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
@@ -36,10 +36,6 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
@@ -48,16 +44,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="nunit.util">
-      <HintPath>..\..\..\Tools\NUnit\lib\nunit.util.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core">
-      <HintPath>..\..\..\Tools\NUnit\lib\nunit.core.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>

diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.sln b/src/AddIns/Analysis/UnitTesting/UnitTesting.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5967
+# SharpDevelop 4.3
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
@@ -10,10 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 EndProject
 Global
@@ -38,14 +34,6 @@ Global
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU