Browse Source

adjust unit tests to API changes

pull/32/merge
Siegfried Pammer 12 years ago
parent
commit
8ed5264b29
  1. 10
      src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/Folding/WebFormsLanguageBindingTests.cs
  2. 7
      src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpCodeGeneratorTests.cs
  3. 12
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs

10
src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/Folding/WebFormsLanguageBindingTests.cs

@ -14,7 +14,7 @@ namespace AspNet.Mvc.Tests.Folding @@ -14,7 +14,7 @@ namespace AspNet.Mvc.Tests.Folding
public class WebFormsLanguageBindingTests
{
ITextEditorWithParseInformationFolding fakeTextEditorWithParseInformationFolding;
WebFormsLanguageBinding languageBinding;
WebFormsTextEditorExtension editorExtension;
ITextEditor fakeTextEditor;
ITextEditorWithParseInformationFoldingFactory fakeTextEditorFactory;
IFoldGeneratorFactory fakeFoldGeneratorFactory;
@ -34,7 +34,7 @@ namespace AspNet.Mvc.Tests.Folding @@ -34,7 +34,7 @@ namespace AspNet.Mvc.Tests.Folding
void CreateLanguageBinding()
{
languageBinding = new WebFormsLanguageBinding(fakeTextEditorFactory, fakeFoldGeneratorFactory);
editorExtension = new WebFormsTextEditorExtension(fakeTextEditorFactory, fakeFoldGeneratorFactory);
}
void CreateFakeFoldGeneratorFactory()
@ -73,7 +73,7 @@ namespace AspNet.Mvc.Tests.Folding @@ -73,7 +73,7 @@ namespace AspNet.Mvc.Tests.Folding
[Test]
public void Attach_TextEditor_FoldGeneratorCreated()
{
languageBinding.Attach(fakeTextEditor);
editorExtension.Attach(fakeTextEditor);
fakeFoldGeneratorFactory.AssertWasCalled(
factory => factory.CreateFoldGenerator(fakeTextEditorWithParseInformationFolding));
@ -82,8 +82,8 @@ namespace AspNet.Mvc.Tests.Folding @@ -82,8 +82,8 @@ namespace AspNet.Mvc.Tests.Folding
[Test]
public void Detach_TextEditor_FoldGeneratorDisposed()
{
languageBinding.Attach(fakeTextEditor);
languageBinding.Detach();
editorExtension.Attach(fakeTextEditor);
editorExtension.Detach();
fakeFoldGenerator.AssertWasCalled(generator => generator.Dispose());
}

7
src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpCodeGeneratorTests.cs

@ -53,6 +53,7 @@ interface TargetInterface @@ -53,6 +53,7 @@ interface TargetInterface
";
MockTextEditor textEditor;
IProject project;
CSharpCodeGenerator gen;
static readonly IUnresolvedAssembly Corlib = new CecilLoader().LoadAssemblyFile(typeof(object).Assembly.Location);
@ -64,7 +65,7 @@ interface TargetInterface @@ -64,7 +65,7 @@ interface TargetInterface
textEditor = new MockTextEditor();
textEditor.Document.Text = program;
var parseInfo = textEditor.CreateParseInformation();
IProject project = MockRepository.GenerateStrictMock<IProject>();
this.project = MockRepository.GenerateStrictMock<IProject>();
var pc = new CSharpProjectContent().AddOrUpdateFiles(parseInfo.UnresolvedFile);
pc = pc.AddAssemblyReferences(new[] { Corlib });
var compilation = pc.CreateCompilation();
@ -82,7 +83,7 @@ interface TargetInterface @@ -82,7 +83,7 @@ interface TargetInterface
IViewContent view = MockRepository.GenerateStrictMock<IViewContent>();
view.Stub(v => v.GetService(typeof(ITextEditor))).Return(textEditor);
SD.FileService.Stub(f => f.OpenFile(textEditor.FileName, false)).Return(view);
gen = new CSharpCodeGenerator(project);
gen = new CSharpCodeGenerator();
}
[TearDown]
@ -283,7 +284,7 @@ interface TargetInterface @@ -283,7 +284,7 @@ interface TargetInterface
{
var compilation = SD.ParserService.GetCompilationForFile(textEditor.FileName);
var attribute = compilation.FindType(new FullTypeName("MySimpleAttribute"));
gen.AddAssemblyAttribute(new DefaultAttribute(attribute));
gen.AddAssemblyAttribute(project, new DefaultAttribute(attribute));
Assert.AreEqual(@"using System;
using System.Reflection;

12
src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs

@ -22,13 +22,13 @@ namespace ICSharpCode.XamlBinding.Tests @@ -22,13 +22,13 @@ namespace ICSharpCode.XamlBinding.Tests
/// </summary>
public class MockTextEditor : AvalonEditTextEditorAdapter
{
XamlLanguageBinding langBinding;
XamlTextEditorExtension extension;
public MockTextEditor()
: base(new TextEditor())
{
this.langBinding = new XamlLanguageBinding();
this.TextEditor.TextArea.TextView.Services.AddService(typeof(XamlLanguageBinding), langBinding);
this.extension = new XamlTextEditorExtension();
this.TextEditor.TextArea.TextView.Services.AddService(typeof(XamlTextEditorExtension), extension);
}
public override FileName FileName {
@ -53,12 +53,6 @@ namespace ICSharpCode.XamlBinding.Tests @@ -53,12 +53,6 @@ namespace ICSharpCode.XamlBinding.Tests
return null;
}
public override ICSharpCode.SharpDevelop.ILanguageBinding Language {
get {
return langBinding;
}
}
IList<IInsightItem> lastInsightItemList = null;
public override IInsightWindow ShowInsightWindow(IEnumerable<IInsightItem> items)

Loading…
Cancel
Save