Restructured code coverage unit tests.

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

src/AddIns/Analysis/CodeCoverage/CodeCoverage.sln

@@ -1,13 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5879
+# SharpDevelop 4.0.0.6131
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
@@ -22,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Do
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "..\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,10 +36,6 @@ Global
 		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -68,5 +64,9 @@ Global
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal

src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj

@@ -57,41 +57,41 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="CodeCoveragePropertyCollectionWithGetterAndSetterTestFixture.cs" />
-    <Compile Include="CodeCoveragePropertyTestFixture.cs" />
-    <Compile Include="CodeCoverageResultsMissingFileIdTestFixture.cs" />
-    <Compile Include="CodeCoverageResultsPropertyFlagsTestFixture.cs" />
-    <Compile Include="CodeCoverageResultsTestFixture.cs" />
-    <Compile Include="CodeCoverageResultsWithEmptyMethodElementTestFixture.cs" />
-    <Compile Include="CodeCoverageTreeViewTestFixture.cs" />
-    <Compile Include="DerivedCodeCoverageTreeView.cs" />
-    <Compile Include="ListViewSortingTestFixture.cs" />
-    <Compile Include="ModuleVisitedSequencePointsTestFixture.cs" />
-    <Compile Include="AddCodeCoverageMarkersTestFixture.cs" />
-    <Compile Include="PartCoverCommandLineTests.cs" />
-    <Compile Include="PartCoverExitEventArgsTestFixture.cs" />
-    <Compile Include="PartCoverSettingsMissingRulePrefixTestFixture.cs" />
-    <Compile Include="PartCoverSettingsTestFixture.cs" />
-    <Compile Include="PropertiesInCodeCoverageTreeView.cs" />
-    <Compile Include="RemoveCodeCoverageMarkersTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersCoverTwoLinesTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersCoverMultipleLinesTestFixture.cs" />
-    <Compile Include="GetSequencePointsForFileNameTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersInvalidStartLineTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersInvalidEndLineTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersInvalidStartColumnTestFixture.cs" />
-    <Compile Include="CodeCoverageMarkersInvalidEndColumnTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoverageNamespaceTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoveragePropertyCollectionWithGetterAndSetterTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoveragePropertyTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoverageResultsMissingFileIdTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoverageResultsPropertyFlagsTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoverageResultsTestFixture.cs" />
+    <Compile Include="Coverage\CodeCoverageResultsWithEmptyMethodElementTestFixture.cs" />
+    <Compile Include="Coverage\ExcludedModuleTestFixture.cs" />
+    <Compile Include="Coverage\GetSequencePointsForFileNameTestFixture.cs" />
+    <Compile Include="Coverage\InvalidSequencePointDataTestFixture.cs" />
+    <Compile Include="Coverage\MethodHasNoNamespaceTestFixture.cs" />
+    <Compile Include="Coverage\ModuleVisitedSequencePointsTestFixture.cs" />
+    <Compile Include="Coverage\PartCoverCommandLineTests.cs" />
+    <Compile Include="Coverage\PartCoverExitEventArgsTestFixture.cs" />
+    <Compile Include="Coverage\PartCoverSettingsMissingRulePrefixTestFixture.cs" />
+    <Compile Include="Coverage\PartCoverSettingsTestFixture.cs" />
+    <Compile Include="Coverage\SimilarRootNamespaceTestFixture.cs" />
+    <Compile Include="Gui\DisplayItemTestFixture.cs" />
+    <Compile Include="Gui\PropertiesInCodeCoverageTreeView.cs" />
+    <Compile Include="Gui\TreeViewSortingTestFixture.cs" />
+    <Compile Include="Gui\ZeroCodeCoverageTreeViewTestFixture.cs" />
+    <Compile Include="Highlighting\AddCodeCoverageMarkersTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersCoverMultipleLinesTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersCoverTwoLinesTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersInvalidEndColumnTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersInvalidEndLineTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersInvalidStartColumnTestFixture.cs" />
+    <Compile Include="Highlighting\CodeCoverageMarkersInvalidStartLineTestFixture.cs" />
+    <Compile Include="Highlighting\RemoveCodeCoverageMarkersTestFixture.cs" />
     <None Include="Strings.resources" />
-    <Compile Include="SimilarRootNamespaceTestFixture.cs" />
-    <Compile Include="TreeViewAfterSelectTestFixture.cs" />
-    <Compile Include="TreeViewSortingTestFixture.cs" />
-    <Compile Include="ZeroCodeCoverageTreeViewTestFixture.cs" />
-    <Compile Include="InvalidSequencePointDataTestFixture.cs" />
-    <Compile Include="MethodHasNoNamespaceTestFixture.cs" />
-    <Compile Include="DisplayItemTestFixture.cs" />
-    <Compile Include="CodeCoverageNamespaceTestFixture.cs" />
-    <Compile Include="ClassWithNoNamespaceInTreeViewTestFixture.cs" />
-    <Compile Include="ExcludedModuleTestFixture.cs" />
+    <Compile Include="Gui\ClassWithNoNamespaceInTreeViewTestFixture.cs" />
+    <Compile Include="Gui\CodeCoverageTreeViewTestFixture.cs" />
+    <Compile Include="Gui\ListViewSortingTestFixture.cs" />
+    <Compile Include="Gui\TreeViewAfterSelectTestFixture.cs" />
+    <Compile Include="Utils\DerivedCodeCoverageTreeView.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
@@ -128,5 +128,11 @@
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Coverage" />
+    <Folder Include="Highlighting" />
+    <Folder Include="Utils" />
+    <Folder Include="Gui" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoverageNamespaceTestFixture.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class CodeCoverageNamespaceTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoveragePropertyCollectionWithGetterAndSetterTestFixture.cs

@@ -10,7 +10,7 @@ using System.Reflection;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests that two CodeCoverageMethod classes that are getter and setter for one property are returned

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoveragePropertyTestFixture.cs

@@ -11,7 +11,7 @@ using System.Reflection;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class CodeCoveragePropertyTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoverageResultsMissingFileIdTestFixture.cs

@@ -10,7 +10,7 @@ using System.IO;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// PartCover does not always put a file id in the code

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoverageResultsPropertyFlagsTestFixture.cs

@@ -10,7 +10,7 @@ using System.IO;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests that property methods (e.g. get_SomeValue) are identified by the CodeCoverageResults class

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoverageResultsTestFixture.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 using System;
 using System.IO;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class CodeCoverageResultsTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/CodeCoverageResultsWithEmptyMethodElementTestFixture.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 using System;
 using System.IO;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class CodeCoverageResultsWithEmptyMethodElementTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/ExcludedModuleTestFixture.cs

@@ -9,7 +9,7 @@ using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 using System;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Ensures that a code coverage module that has no included methods 

src/AddIns/Analysis/CodeCoverage/Test/Coverage/GetSequencePointsForFileNameTestFixture.cs

@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class GetSequencePointsForFileNameTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/InvalidSequencePointDataTestFixture.cs

@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class InvalidSequencePointDataTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/MethodHasNoNamespaceTestFixture.cs

@@ -9,7 +9,7 @@ using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 using System;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Checks that the CodeCoverageMethod class can handle a class name

src/AddIns/Analysis/CodeCoverage/Test/Coverage/ModuleVisitedSequencePointsTestFixture.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 using System;
 using System.IO;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
 	public class ModuleVisitedSequencePointsTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverCommandLineTests.cs

@@ -8,7 +8,7 @@
 using System;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests the PartCoverRunner's command line argumentsests.

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverExitEventArgsTestFixture.cs

@@ -9,7 +9,7 @@ using System;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests the PartCoverExitEventArgs class.

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsMissingRulePrefixTestFixture.cs

@@ -10,7 +10,7 @@ using System.IO;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests that the PartCoverSettings class does not throw an index out of

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs

@@ -15,7 +15,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Project;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// Tests the saving and loading of the PartCover settings file. This

src/AddIns/Analysis/CodeCoverage/Test/Coverage/SimilarRootNamespaceTestFixture.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	/// <summary>
 	/// If there are two namespaces that start the same and match up

src/AddIns/Analysis/CodeCoverage/Test/Gui/ClassWithNoNamespaceInTreeViewTestFixture.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	[TestFixture]
 	public class ClassWithNoNamespaceInTreeViewTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Gui/CodeCoverageTreeViewTestFixture.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	/// <summary>
 	/// Checks that the tree nodes have the correct text, images and 

src/AddIns/Analysis/CodeCoverage/Test/Gui/DisplayItemTestFixture.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 using System;
 using System.Drawing;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	[TestFixture]
 	public class DisplayItemTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Gui/ListViewSortingTestFixture.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 using ICSharpCode.CodeCoverage;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	/// <summary>
 	/// Tests the sorting of the list view that shows

src/AddIns/Analysis/CodeCoverage/Test/Gui/PropertiesInCodeCoverageTreeView.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Windows.Forms;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	/// <summary>
 	/// Tests that getter and setter methods are shown in the tree view as child nodes of a parent

src/AddIns/Analysis/CodeCoverage/Test/Gui/TreeViewAfterSelectTestFixture.cs

@@ -6,10 +6,11 @@
 // </file>
 
 using System;
+using ICSharpCode.CodeCoverage.Tests.Utils;
 using ICSharpCode.SharpDevelop.Gui;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	/// <summary>
 	/// Tests the CodeCoverageResultsTreeView AfterSelect method.

src/AddIns/Analysis/CodeCoverage/Test/Gui/TreeViewSortingTestFixture.cs

@@ -12,7 +12,7 @@ using ICSharpCode.CodeCoverage;
 using ICSharpCode.SharpDevelop.Gui;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	/// <summary>
 	/// Tests that the code coverage tree view is sorted correctly for

src/AddIns/Analysis/CodeCoverage/Test/Gui/ZeroCodeCoverageTreeViewTestFixture.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Gui
 {
 	[TestFixture]
 	public class ZeroCodeCoverageTreeViewTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/AddCodeCoverageMarkersTestFixture.cs

@@ -13,7 +13,7 @@ using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Tests.Utils;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class AddCodeCoverageMarkersTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersCoverMultipleLinesTestFixture.cs

@@ -15,7 +15,7 @@ using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Tests.Utils;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersCoverMultipleLinesTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersCoverTwoLinesTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersCoverTwoLinesTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersInvalidEndColumnTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersInvalidEndColumnTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersInvalidEndLineTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersInvalidEndLineTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersInvalidStartColumnTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersInvalidStartColumnTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/CodeCoverageMarkersInvalidStartLineTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class CodeCoverageMarkersInvalidStartLineTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Highlighting/RemoveCodeCoverageMarkersTestFixture.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using NUnit.Framework;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Highlighting
 {
 	[TestFixture]
 	public class RemoveCodeCoverageMarkersTestFixture

src/AddIns/Analysis/CodeCoverage/Test/Utils/DerivedCodeCoverageTreeView.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 using ICSharpCode.CodeCoverage;
 using ICSharpCode.SharpDevelop.Gui;
 
-namespace ICSharpCode.CodeCoverage.Tests
+namespace ICSharpCode.CodeCoverage.Tests.Utils
 {
 	/// <summary>
 	/// Derived code coverage tree view that gives us access to the