Browse Source

fixed some unit tests

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/XmlEditor@4189 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 17 years ago
parent
commit
96e8836e37
  1. 1
      src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
  2. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
  3. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionDataProvider.cs
  4. 6
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionItem.cs
  5. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
  6. 7
      src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs
  7. 1
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockXmlViewContent.cs
  8. 2
      src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj

1
src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@ -232,6 +232,7 @@
<ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj"> <ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj">
<Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project> <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
<Name>XmlEditor</Name> <Name>XmlEditor</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj

@ -123,6 +123,7 @@
<ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj"> <ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj">
<Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project> <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
<Name>XmlEditor</Name> <Name>XmlEditor</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -90,7 +90,7 @@ namespace ICSharpCode.XmlEditor
if (path.Elements.Count > 0) { if (path.Elements.Count > 0) {
string namespaceUri = path.Elements[0].Namespace; string namespaceUri = path.Elements[0].Namespace;
if (namespaceUri.Length > 0) { if (namespaceUri.Length > 0) {
return XmlSchemaManager.SchemaCompletionDataItems[namespaceUri]; return schemaCompletionDataItems[namespaceUri];
} else if (defaultSchemaCompletionData != null) { } else if (defaultSchemaCompletionData != null) {
// Use the default schema namespace if none // Use the default schema namespace if none

6
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCompletionItem.cs

@ -78,5 +78,11 @@ namespace ICSharpCode.XmlEditor
break; break;
} }
} }
public override string ToString()
{
return "[" + this.Text + "]";
}
} }
} }

2
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj

@ -32,7 +32,7 @@
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress> <BaseAddress>4194304</BaseAddress>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

7
src/AddIns/DisplayBindings/XmlEditor/Test/FindSchemaObject/AttributeGroupReferenceSelectedTestFixture.cs

@ -5,12 +5,13 @@
// <version>$Revision: 1683 $</version> // <version>$Revision: 1683 $</version>
// </file> // </file>
using ICSharpCode.TextEditor.Gui.CompletionWindow; using ICSharpCode.Core;
using ICSharpCode.XmlEditor;
using NUnit.Framework;
using System; using System;
using System.IO; using System.IO;
using System.Xml.Schema; using System.Xml.Schema;
using ICSharpCode.TextEditor.Gui.CompletionWindow;
using ICSharpCode.XmlEditor;
using NUnit.Framework;
using XmlEditor.Tests.Schema; using XmlEditor.Tests.Schema;
using XmlEditor.Tests.Utils; using XmlEditor.Tests.Utils;

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

@ -22,6 +22,7 @@ namespace XmlEditor.Tests.Utils
public MockXmlViewContent() public MockXmlViewContent()
{ {
this.document = new AvalonEditDocumentAdapter(); this.document = new AvalonEditDocumentAdapter();
this.Files.Add(new MockOpenedFile("test.xml"));
} }
public override object Control { public override object Control {

2
src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj

@ -14,7 +14,7 @@
<DebugType>Full</DebugType> <DebugType>Full</DebugType>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath> <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

Loading…
Cancel
Save