diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-26 15:57:32 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-26 15:57:32 +0400 |
| commit | 5ba64e4f967e49c0ddc96179fe919a0837463e27 (patch) | |
| tree | 284278e01c75bd78f6054e39ae5bead0bc7f7cb2 /main/tests | |
| parent | 6cf6e34954b32247d8970a0712e1a12cebe4b52d (diff) | |
| parent | 21ad778ec4c166c9e06218ccc173a547c2c0f6ec (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
Diffstat (limited to 'main/tests')
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs index 7908c75bff..774567ccac 100644 --- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs +++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestViewContent.cs @@ -180,12 +180,17 @@ namespace MonoDevelop.CSharpBinding.Tests {
} - public void BeginAtomicUndo ()
+ class DisposeStub : IDisposable
{
- } - public void EndAtomicUndo () - { - } + public void Dispose ()
+ {
+ }
+ }
+
+ public IDisposable OpenUndoGroup ()
+ {
+ return new DisposeStub ();
+ }
public TextEditorData GetTextEditorData () { |