Browse Source

fixed some Unit Tests

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/XmlEditor@4193 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
b4c9f561a0
  1. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeTextMarker.cs
  2. 19
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
  3. 1
      src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
  4. 1
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlViewContent.cs

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathNodeTextMarker.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.XmlEditor @@ -45,7 +45,7 @@ namespace ICSharpCode.XmlEditor
public static void AddMarker(IDocument document, XPathNodeMatch node)
{
if (node.HasLineInfo() && node.Value.Length > 0) {
markers.Add(new XPathNodeTextMarker(document, document.PositionToOffset(node.LineNumber + 1, node.LinePosition), node));
markers.Add(new XPathNodeTextMarker(document, document.PositionToOffset(node.LineNumber + 1, node.LinePosition + 1), node));
}
}

19
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs

@ -79,9 +79,22 @@ namespace ICSharpCode.XmlEditor @@ -79,9 +79,22 @@ namespace ICSharpCode.XmlEditor
public static XmlCompletionDataProvider GetProvider(string extension)
{
string defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefix(extension);
XmlSchemaCompletionData defaultSchemaCompletionData = XmlSchemaManager.GetSchemaCompletionData(extension);
return new XmlCompletionDataProvider(XmlSchemaManager.SchemaCompletionDataItems,
string defaultNamespacePrefix;
XmlSchemaCompletionData defaultSchemaCompletionData;
XmlSchemaCompletionDataCollection schemas;
if (PropertyService.Initialized) {
schemas = XmlSchemaManager.SchemaCompletionDataItems;
defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefix(extension);
defaultSchemaCompletionData = XmlSchemaManager.GetSchemaCompletionData(extension);
} else {
// for NUnit tests
defaultNamespacePrefix = string.Empty;
schemas = new XmlSchemaCompletionDataCollection();
defaultSchemaCompletionData = null;
}
return new XmlCompletionDataProvider(schemas,
defaultSchemaCompletionData,
defaultNamespacePrefix);
}

1
src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
// <version>$Revision: 4018 $</version>
// </file>
using ICSharpCode.Core;
using System;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;

1
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlViewContent.cs

@ -23,6 +23,7 @@ namespace XmlEditor.Tests.Utils @@ -23,6 +23,7 @@ namespace XmlEditor.Tests.Utils
public MockXmlViewContent(OpenedFile file)
{
this.file = file;
this.Files.Add(file);
this.document = new AvalonEditDocumentAdapter();
}

Loading…
Cancel
Save