Browse Source

fixed WpfDesign unit tests

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4824 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
12bdde75f9
  1. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
  2. 8
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs
  3. 5
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/ExtensionMethods.cs
  4. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs
  5. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs

@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
protected DesignItem CreateCanvasContext(string xaml)
{
XamlDesignContext context = CreateContext(@"<Canvas
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
" + xaml + "</Canvas>");
Canvas canvas = (Canvas)context.RootItem.Component;
@ -57,7 +57,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -57,7 +57,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
{
expectedXaml =
"<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
("<Canvas xmlns=\"http://schemas.microsoft.com/netfx/2007/xaml/presentation\" " +
("<Canvas xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\" " +
"xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\">\n" + expectedXaml.Trim())
.Replace("\r", "").Replace("\n", "\n ")
+ "\n</Canvas>";

8
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs

@ -165,9 +165,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -165,9 +165,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
DesignItem textBox = canvas.Services.Component.RegisterComponentForDesigner(new TextBox());
canvas.Properties["Children"].CollectionElements.Add(textBox);
AssertCanvasDesignerOutput("<Canvas>\n" +
" <Panel.Children>\n" +
" <TextBox />\n" +
" </Panel.Children>\n" +
" <TextBox />\n" +
"</Canvas>", canvas.Context);
AssertLog("");
}
@ -179,9 +177,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -179,9 +177,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
DesignItem textBox = canvas.Services.Component.RegisterComponentForDesigner(new TextBox());
canvas.Properties["Children"].CollectionElements.Add(textBox);
AssertCanvasDesignerOutput("<Canvas>\n" +
" <Panel.Children>\n" +
" <TextBox />\n" +
" </Panel.Children>\n" +
" <TextBox />\n" +
"</Canvas>", canvas.Context);
AssertLog("");
}

5
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/ExtensionMethods.cs

@ -10,10 +10,13 @@ using System.Windows; @@ -10,10 +10,13 @@ using System.Windows;
namespace ICSharpCode.WpfDesign
{
/// <summary>
/// Description of ExtensionMethods.
/// Extension methods used in the WPF designer.
/// </summary>
public static class ExtensionMethods
{
/// <summary>
/// Rounds position and size of a Rect to PlacementInformation.BoundsPrecision digits.
/// </summary>
public static Rect Round(this Rect rect)
{
return new Rect(

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PlacementInformation.cs

@ -15,6 +15,10 @@ namespace ICSharpCode.WpfDesign @@ -15,6 +15,10 @@ namespace ICSharpCode.WpfDesign
/// </summary>
public sealed class PlacementInformation
{
/// <summary>
/// The designer rounds bounds to this number of digits to avoid floating point errors.
/// Value: 8
/// </summary>
public const int BoundsPrecision = 8;
Rect originalBounds, bounds;

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj

@ -92,6 +92,8 @@ @@ -92,6 +92,8 @@
<Folder Include="Document" />
<Folder Include="Utils" />
<Folder Include="XmlParser" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
<Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
<Name>ICSharpCode.AvalonEdit</Name>

Loading…
Cancel
Save