[CSharpBinding] Implemented & tested auto bracket insertion.

1 files changed, 80 insertions, 3 deletions

diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
index efedc0c809..80653788fd 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/AutomaticBracketInsertionTests.cs
@@ -170,7 +170,7 @@ namespace MonoDevelop.CSharpBinding
 			return compExt;
 		}
 
-		string Test(string input, string type, string member)
+		string Test(string input, string type, string member, Gdk.Key key = Gdk.Key.Return, bool isDelegateExpected = false)
 		{
 			TestViewContent content;
 			var ext = Setup (input, out content);
@@ -183,12 +183,14 @@ namespace MonoDevelop.CSharpBinding
 			var t = ext.Document.Compilation.FindType (new FullTypeName (type)); 
 			var method = t.GetMembers (m => m.Name == member).First ();
 			var data = new MemberCompletionData (ext, method, OutputFlags.ClassBrowserEntries);
-
+			data.IsDelegateExpected = isDelegateExpected;
 			KeyActions ka = KeyActions.Process;
-			data.InsertCompletionText (listWindow, ref ka, Gdk.Key.Return, '\n', Gdk.ModifierType.None); 
+			data.InsertCompletionText (listWindow, ref ka, key, (char)key, Gdk.ModifierType.None, true, false); 
 			return widget.CompletedWord;
 		}
 
+
+
 		[Test]
 		public void TestSimpleCase ()
 		{
@@ -199,9 +201,84 @@ namespace MonoDevelop.CSharpBinding
 		$
 	}
 }", "MyClass", "FooBar");
+			Assert.AreEqual ("FooBar ();|", completion); 
+		}
+
+		[Test]
+		public void TestOverloads ()
+		{
+			string completion = Test (@"class MyClass
+{
+	void FooBar (int foo)
+	{
+	}
+	void FooBar ()
+	{
+		$
+	}
+}", "MyClass", "FooBar");
 			Assert.AreEqual ("FooBar (|);", completion); 
 		}
 
+		[Test]
+		public void TestExpressionCase ()
+		{
+			string completion = Test (@"class MyClass
+{
+	int FooBar ()
+	{
+		int i;
+		i = $
+	}
+}", "MyClass", "FooBar");
+			Assert.AreEqual ("FooBar ()|", completion); 
+		}
+
+		[Test]
+		public void TestExpressionCaseWithOverloads ()
+		{
+			string completion = Test (@"class MyClass
+{
+	int FooBar (int foo)
+	{
+	}
+	
+	int FooBar ()
+	{
+		int i;
+		i = $
+	}
+}", "MyClass", "FooBar");
+			Assert.AreEqual ("FooBar (|)", completion); 
+		}
+
+		[Test]
+		public void TestDelegateCase ()
+		{
+			string completion = Test (@"using System;
+class MyClass
+{
+	int FooBar ()
+	{
+		Func<int> i;
+		i = $
+	}
+}", "MyClass", "FooBar", Gdk.Key.Return, true);
+			Assert.AreEqual ("FooBar", completion); 
+		}
+
+		[Test]
+		public void TestDotCompletion ()
+		{
+			string completion = Test (@"class MyClass
+{
+	void FooBar ()
+	{
+		$
+	}
+}", "MyClass", "FooBar", (Gdk.Key)'.');
+			Assert.AreEqual ("FooBar ().|", completion); 
+		}
 	}
 }