Fixed ExpressionFinder unit test, added unit tests for folding manager.

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

src/AddIns/BackendBindings/CSharpBinding/Test/ExpressionFinder.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using NUnit.Framework;
 using CSharpBinding.Parser;
@@ -48,6 +49,11 @@ class Main {
 		[SetUp]
 		public void Init()
 		{
+			HostCallback.GetParseInformation = ParserService.GetParseInformation;
+			HostCallback.GetCurrentProjectContent = delegate {
+				return ParserService.CurrentProjectContent;
+			};
+			
 			ef = new CSharpExpressionFinder("test.cs");
 		}
 		

src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlFoldingStrategy.cs

@@ -138,7 +138,7 @@ namespace ICSharpCode.XmlEditor
 			} catch (Exception) {
 				// If the xml is not well formed keep the foldings 
 				// that already exist in the document.
-				return document.FoldingManager.FoldMarker;
+				return new List<FoldMarker>(document.FoldingManager.FoldMarker);
 			}
 
 			return foldMarkers;

src/Libraries/ICSharpCode.TextEditor/Project/Src/Document/FoldingStrategy/FoldingManager.cs

@@ -18,9 +18,9 @@ namespace ICSharpCode.TextEditor.Document
 		IFoldingStrategy    foldingStrategy = null;
 		IDocument document;
 		
-		public List<FoldMarker> FoldMarker {
+		public IList<FoldMarker> FoldMarker {
 			get {
-				return foldMarker;
+				return foldMarker.AsReadOnly();
 			}
 		}
 		
@@ -223,10 +223,14 @@ namespace ICSharpCode.TextEditor.Document
 		}
 		
 		public void UpdateFoldings(string fileName, object parseInfo)
+		{
+			UpdateFoldings(foldingStrategy.GenerateFoldMarkers(document, fileName, parseInfo));
+		}
+		
+		public void UpdateFoldings(List<FoldMarker> newFoldings)
 		{
 			int oldFoldingsCount = foldMarker.Count;
 			lock (this) {
-				List<FoldMarker> newFoldings = foldingStrategy.GenerateFoldMarkers(document, fileName, parseInfo);
 				if (newFoldings != null && newFoldings.Count != 0) {
 					newFoldings.Sort();
 					if (foldMarker.Count == newFoldings.Count) {

src/Libraries/ICSharpCode.TextEditor/Test/FoldingManagerTests.cs

@@ -0,0 +1,141 @@
+/*
+ * Created by SharpDevelop.
+ * User: Daniel Grunwald
+ * Date: 10/28/2006
+ * Time: 8:42 AM
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ICSharpCode.TextEditor.Document;
+using NUnit.Framework;
+
+namespace ICSharpCode.TextEditor.Tests
+{
+	[TestFixture]
+	public class FoldingManagerTests
+	{
+		FoldingManager manager;
+		List<FoldMarker> list;
+		
+		[SetUp]
+		public void SetUp()
+		{
+			IDocument doc = new DocumentFactory().CreateDocument();
+			StringBuilder b = new StringBuilder();
+			for (int i = 0; i < 50 ; i++) {
+				b.AppendLine(new string('a', 50));
+			}
+			doc.TextContent = b.ToString();
+			list = new List<FoldMarker>();
+			list.Add(new FoldMarker(doc, 1, 6, 5, 2));
+			list.Add(new FoldMarker(doc, 2, 1, 2, 3));
+			list.Add(new FoldMarker(doc, 3, 7, 4, 1));
+			list.Add(new FoldMarker(doc, 10, 1, 14, 1));
+			list.Add(new FoldMarker(doc, 10, 3, 10, 3));
+			list.Add(new FoldMarker(doc, 11, 1, 15, 1));
+			list.Add(new FoldMarker(doc, 12, 1, 16, 1));
+			foreach (FoldMarker fm in list) {
+				fm.IsFolded = true;
+			}
+			doc.FoldingManager.UpdateFoldings(new List<FoldMarker>(list));
+			manager = doc.FoldingManager;
+		}
+		
+		[Test]
+		public void GetFoldingsContainsLineNumber()
+		{
+			AssertList(manager.GetFoldingsContainsLineNumber(1));
+			AssertList(manager.GetFoldingsContainsLineNumber(2), 0);
+			AssertList(manager.GetFoldingsContainsLineNumber(3), 0);
+			AssertList(manager.GetFoldingsContainsLineNumber(4), 0);
+			AssertList(manager.GetFoldingsContainsLineNumber(5));
+			AssertList(manager.GetFoldingsContainsLineNumber(10));
+			AssertList(manager.GetFoldingsContainsLineNumber(11), 3);
+			AssertList(manager.GetFoldingsContainsLineNumber(12), 3,5);
+			AssertList(manager.GetFoldingsContainsLineNumber(13), 3,5,6);
+			AssertList(manager.GetFoldingsContainsLineNumber(14), 5,6);
+			AssertList(manager.GetFoldingsContainsLineNumber(15), 6);
+			AssertList(manager.GetFoldingsContainsLineNumber(16));
+		}
+		
+		[Test]
+		public void GetTopLevelFoldedFoldings()
+		{
+			AssertList(manager.GetTopLevelFoldedFoldings(), 0, 3);
+		}
+		
+		[Test]
+		public void GetFoldingsWithStart()
+		{
+			AssertList(manager.GetFoldingsWithStart(1), 0);
+			AssertList(manager.GetFoldingsWithStart(2), 1);
+			AssertList(manager.GetFoldingsWithStart(3), 2);
+			AssertList(manager.GetFoldingsWithStart(4));
+			AssertList(manager.GetFoldingsWithStart(10), 3,4);
+			AssertList(manager.GetFoldingsWithStart(11), 5);
+			AssertList(manager.GetFoldingsWithStart(12), 6);
+			AssertList(manager.GetFoldingsWithStart(13));
+			AssertList(manager.GetFoldingsWithStart(14));
+			AssertList(manager.GetFoldedFoldingsWithStartAfterColumn(10, 0), 3,4);
+			AssertList(manager.GetFoldedFoldingsWithStartAfterColumn(10, 1), 4);
+			AssertList(manager.GetFoldedFoldingsWithStartAfterColumn(10, 2), 4);
+			AssertList(manager.GetFoldedFoldingsWithStartAfterColumn(10, 3));
+			AssertList(manager.GetFoldedFoldingsWithStartAfterColumn(10, 4));
+		}
+		
+		[Test]
+		public void GetFromPositionOverlapping()
+		{
+			AssertPosition(10, 1);
+			AssertPosition(10, 2,  3);
+			AssertPosition(10, 3,  3);
+			AssertPosition(10, 4,  3);
+			AssertPosition(11, 1,  3);
+			AssertPosition(11, 2,  3,5);
+			AssertPosition(12, 1,  3,5);
+			AssertPosition(12, 2,  3,5,6);
+			AssertPosition(14, 0,  3,5,6);
+			AssertPosition(14, 1,  5,6);
+			AssertPosition(15, 0,  5,6);
+			AssertPosition(15, 1,  6);
+			AssertPosition(16, 0,  6);
+			AssertPosition(16, 1);
+		}
+		
+		void AssertPosition(int line, int column, params int[] markers)
+		{
+			AssertList(manager.GetFoldingsFromPosition(line, column), markers);
+		}
+		
+		void AssertList(List<FoldMarker> l, params int[] markers)
+		{
+			Assert.AreEqual(markers.Length, l.Count);
+			foreach (int m in markers) {
+				Assert.Contains(list[m], l);
+			}
+		}
+		
+		[Test]
+		public void GetFromPositionTest()
+		{
+			AssertPosition(1, 5);
+			//AssertPosition(1, 6,  0);
+			AssertPosition(1, 7,  0);
+			AssertPosition(5, 0,  0);
+			AssertPosition(5, 1,  0);
+			AssertPosition(5, 2);
+			AssertPosition(5, 3);
+			AssertPosition(3, 8,  0,2);
+			AssertPosition(3, 30,  0,2);
+			AssertPosition(4, 0,  0,2);
+			AssertPosition(4, 1,  0);
+			AssertPosition(2, 1,  0);
+			AssertPosition(2, 2,  0,1);
+			AssertPosition(2, 3,  0);
+		}
+	}
+}

src/Libraries/ICSharpCode.TextEditor/Test/ICSharpCode.TextEditor.Tests.csproj

@@ -44,6 +44,7 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="DocumentTests.cs" />
     <Compile Include="BlockCommentTests.cs" />
+    <Compile Include="FoldingManagerTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Project\ICSharpCode.TextEditor.csproj">