Browse Source

XamlBinding: fixed Unit Tests

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4725 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
0dc6a987cb
  1. 2
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CtrlSpaceCodeCompletionTests.cs
  2. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs
  3. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/ResolveContextTests.cs
  4. 6
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
  5. 2
      src/Main/Base/Project/Src/Services/ParserService/ParserService.cs

2
src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/CtrlSpaceCodeCompletionTests.cs

@ -16,7 +16,6 @@ using NUnit.Framework; @@ -16,7 +16,6 @@ using NUnit.Framework;
namespace ICSharpCode.XamlBinding.Tests
{
[TestFixture]
[Ignore("Does not work due to bugs")]
[RequiresSTA]
public class CodeCompletionTests : TextEditorBasedTests
{
@ -263,7 +262,6 @@ namespace ICSharpCode.XamlBinding.Tests @@ -263,7 +262,6 @@ namespace ICSharpCode.XamlBinding.Tests
}
[Test]
[Ignore("Fails currently because the XamlParser fails due to the invalid syntax on the root element.")]
public void CtrlSpaceTest11()
{
string fileHeader = @"<Window x:Class='ICSharpCode.XamlBinding.Tests.CompletionTestsBase'

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

@ -58,10 +58,8 @@ namespace ICSharpCode.XamlBinding.Tests @@ -58,10 +58,8 @@ namespace ICSharpCode.XamlBinding.Tests
new XamlLanguageBinding().Attach(this);
}
static int fileNo;
public override string FileName {
get { return "mockFileName" + (fileNo++) + ".xaml"; }
get { return "mockFileName.xaml"; }
}
public void CreateParseInformation()

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/ResolveContextTests.cs

@ -14,7 +14,6 @@ using System.IO; @@ -14,7 +14,6 @@ using System.IO;
namespace ICSharpCode.XamlBinding.Tests
{
[TestFixture]
[Ignore("Does not work due to bugs")]
public class ResolveContextTests
{
[Test]

6
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs

@ -74,10 +74,10 @@ namespace ICSharpCode.XamlBinding @@ -74,10 +74,10 @@ namespace ICSharpCode.XamlBinding
public static XamlContext ResolveContext(ITextBuffer fileContent, string fileName, int offset)
{
using (new DebugTimerObject("ResolveContext")) {
XamlParser parser = ParserService.GetParser(fileName) as XamlParser;
XamlParser parser = string.IsNullOrEmpty(fileName) ? new XamlParser() : ParserService.GetParser(fileName) as XamlParser;
ParseInformation info = string.IsNullOrEmpty(fileName) ? null : ParserService.GetParseInformation(fileName);
using (parser.ParseAndLock(fileContent)) {
ParseInformation info = string.IsNullOrEmpty(fileName) ? null : ParserService.GetParseInformation(fileName);
AXmlDocument document = parser.LastDocument;
AXmlObject currentData = document.GetChildAtOffset(offset);

2
src/Main/Base/Project/Src/Services/ParserService/ParserService.cs

@ -704,7 +704,6 @@ namespace ICSharpCode.SharpDevelop @@ -704,7 +704,6 @@ namespace ICSharpCode.SharpDevelop
/// <summary>
/// Replaces the list of available parsers.
/// Causes all stored parse information to be deleted.
/// Please use this for unit tests only!
/// </summary>
public static void RegisterAvailableParsers(params ParserDescriptor[] descriptors)
@ -712,7 +711,6 @@ namespace ICSharpCode.SharpDevelop @@ -712,7 +711,6 @@ namespace ICSharpCode.SharpDevelop
lock (syncLock) {
parserDescriptors = new List<ParserDescriptor>();
parserDescriptors.AddRange(descriptors);
ClearAllFileEntries();
}
}

Loading…
Cancel
Save