diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-24 15:13:48 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-24 15:24:48 +0400 |
| commit | f8580cbe92f662708b005691990c608bd77d4e10 (patch) | |
| tree | 55657ca133b217cd074dfe57595d7c2fe0224204 /main/tests | |
| parent | a74ea2dece1d9155929f637bcfc39facb53ccc32 (diff) | |
| parent | e745723f147fb605bf72efccef672d7b46aff612 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/tests')
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs | 2 | ||||
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs | 26 |
2 files changed, 24 insertions, 4 deletions
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs index cb14882de9..2a196603f9 100644 --- a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs +++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/ResolveNamespaceTests.cs @@ -80,7 +80,7 @@ namespace MonoDevelop.CSharpBinding.Refactoring return doc; } - HashSet<MonoDevelop.Refactoring.ResolveCommandHandler.PossibleNamespace> GetResult (string input) + List<MonoDevelop.Refactoring.ResolveCommandHandler.PossibleNamespace> GetResult (string input) { var doc = Setup (input); var location = doc.Editor.Caret.Location; diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs index 5874424eab..16270bb7ef 100644 --- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs +++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs @@ -157,8 +157,12 @@ namespace MonoDevelop.CSharpBinding int idx = output.IndexOf ('$'); if (idx > 0) output = output.Substring (0, idx) + output.Substring (idx + 1); - if (output != data.Text) + if (output != data.Text) { + Console.WriteLine ("expected:"); + Console.WriteLine (output.Replace ("\t", "\\t").Replace (" ", ".")); + Console.WriteLine ("was:"); Console.WriteLine (data.Text.Replace ("\t", "\\t").Replace (" ", ".")); + } Assert.AreEqual (output, data.Text); Assert.AreEqual (idx, data.Caret.Offset, "Caret offset mismatch."); } @@ -237,16 +241,32 @@ namespace MonoDevelop.CSharpBinding [Test] public void TestStringContination () { - var data = Create ("\t\t\"Hello$ World\""); + var data = Create ("\t\t\"Hello$World\""); MiscActions.InsertNewLine (data); - var engine = new CSharpTextEditorIndentation () { + var engine = new CSharpTextEditorIndentation { wasInStringLiteral = true }; CheckOutput (data, "\t\t\"Hello\" +" + eolMarker + "\t\t\"$World\"", engine); } /// <summary> + /// Bug 17896 - Adding line break inside string removes forward whitespace. + /// </summary> + [Test] + public void TestBug17896 () + { + var data = Create ("\t\t\"This is a long test string.$ It contains spaces.\""); + MiscActions.InsertNewLine (data); + + var engine = new CSharpTextEditorIndentation { + wasInStringLiteral = true + }; + CheckOutput (data, "\t\t\"This is a long test string.\" +" + eolMarker + "\t\t\"$ It contains spaces.\"", engine); + } + + + /// <summary> /// Bug 3214 - Unclosed String causes 'Enter' key to produce appended String line. /// </summary> [Test] |