Merge lp:~cvetomir-todorov/nunitv2/bug524474 into lp:nunitv2

[Cvetomir Todorov]

[Charlie Poole (charlie.poole)]

The reflection is ugly of course, but it seems like a good way to get a test without having to do some
major redesign right now. We should do it more cleanly in 3.0 but right now this seems like a smart use of time.

Only one issue... this line...
              string[] expectedSelectedCategories = new[] { "Foo", "MockCategory" };
...requires C# 3.0 to compile.

If the entire test only works under C# 3.0, then it should be inside an #if CS_3_0.

In this case, we want the test to work under C# 2.0, so the initialization needs to
use the older syntax. However, it's so small, I'll just do it when I do the merge.

Approved! Thanks.

Charlie

[Charlie Poole (charlie.poole)]

Merged with two additional changes:

1. A var declaration in the test
2. The new test file was added to nunit.uikit.tests.build

Charlie

[Charlie Poole (charlie.poole)]

review: Approve

=== modified file 'src/ConsoleRunner/tests/nunit-console.tests.build'
--- src/ConsoleRunner/tests/nunit-console.tests.build	2009-04-22 01:21:06 +0000
+++ src/ConsoleRunner/tests/nunit-console.tests.build	2010-09-05 16:15:55 +0000
@@ -24,6 +24,7 @@
         <include name="${current.test.dir}/nunit.framework.tests.dll"/>
         <include name="${current.test.dir}/test-assembly.dll"/>
         <include name="${current.test.dir}/mock-assembly.dll"/>
+		<include name="${current.test.dir}/nonamespace-assembly.dll"/>
       </references>
     </csc>
   </target>

=== modified file 'src/GuiComponents/UiKit/TestTree.cs'
--- src/GuiComponents/UiKit/TestTree.cs	2009-04-18 02:24:12 +0000
+++ src/GuiComponents/UiKit/TestTree.cs	2010-09-05 16:15:55 +0000
@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Data;
@@ -26,7 +27,7 @@
 		// Contains all available categories, whether
 		// selected or not. Unselected members of this
 		// list are displayed in selectedList
-		private IList availableCategories;
+		private IList availableCategories = new List<string>();
 
 		// Our test loader
 		private TestLoader loader;
@@ -234,8 +235,11 @@
 			foreach( string category in categories )
 			{
 				if ( availableCategories.Contains( category ) )
-				{
-					selectedList.Items.Add( category );
+				{
+					if (!selectedList.Items.Contains(category))
+					{
+						selectedList.Items.Add(category);
+					}
 					availableList.Items.Remove( category );
 
 					this.excludeCheckbox.Checked = exclude;

=== added file 'src/GuiComponents/tests/TestTreeTests.cs'
--- src/GuiComponents/tests/TestTreeTests.cs	1970-01-01 00:00:00 +0000
+++ src/GuiComponents/tests/TestTreeTests.cs	2010-09-05 16:15:55 +0000
@@ -0,0 +1,47 @@
+// ****************************************************************
+// Copyright 2010, Charlie Poole
+// This is free software licensed under the NUnit license. You may
+// obtain a copy of the license at http://nunit.org
+// ****************************************************************
+
+using System;
+using System.Collections;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace NUnit.UiKit.Tests
+{
+	[TestFixture]
+	public class TestTreeTests
+	{
+		[Test]
+		public void SameCategoryShouldNotBeSelectedMoreThanOnce()
+		{
+			// arrange
+			var target = new TestTree();
+
+			// we need to populate the available categories
+			// this can be done via TestLoader but this way the test is isolated
+			FieldInfo fieldInfo = typeof (TestTree).GetField("availableCategories", BindingFlags.NonPublic | BindingFlags.Instance);
+			Assert.IsNotNull(fieldInfo, "The field 'availableCategories' should be found.");
+			object fieldValue = fieldInfo.GetValue(target);
+			Assert.IsNotNull(fieldValue, "The value of 'availableCategories' should not be null.");
+			IList availableCategories = fieldValue as IList;
+			Assert.IsNotNull(availableCategories, "'availableCategories' field should be of type IList.");
+
+			string[] expectedSelectedCategories = new[] { "Foo", "MockCategory" };
+			foreach (string availableCategory in expectedSelectedCategories)
+			{
+				availableCategories.Add(availableCategory);
+			}
+
+			// act
+			target.SelectCategories(expectedSelectedCategories, true);
+			target.SelectCategories(expectedSelectedCategories, true);
+			string[] actualSelectedCategories = target.SelectedCategories;
+
+			// assert
+			CollectionAssert.AreEquivalent(expectedSelectedCategories, actualSelectedCategories);
+		}
+	}
+}

=== modified file 'src/GuiComponents/tests/nunit.uikit.tests.csproj'
--- src/GuiComponents/tests/nunit.uikit.tests.csproj	2010-08-06 18:37:35 +0000
+++ src/GuiComponents/tests/nunit.uikit.tests.csproj	2010-09-05 16:15:55 +0000
@@ -149,6 +149,7 @@
     <Compile Include="StatusBarTests.cs" />
     <Compile Include="TestSuiteTreeNodeTests.cs" />
     <Compile Include="TestSuiteTreeViewFixture.cs" />
+    <Compile Include="TestTreeTests.cs" />
     <Compile Include="VisualStateTests.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />