22 changed files with 443 additions and 97 deletions
@ -1,5 +0,0 @@ |
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|||
<ItemGroup> |
|||
<PackageReference Include="Splat" Version="2.0.0" /> |
|||
</ItemGroup> |
|||
</Project> |
|||
@ -1,53 +0,0 @@ |
|||
// Copyright (c) The Avalonia Project. All rights reserved.
|
|||
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
|||
|
|||
using System; |
|||
using Avalonia.Layout; |
|||
using Splat; |
|||
|
|||
namespace Avalonia.Diagnostics |
|||
{ |
|||
public class LogManager : ILogManager |
|||
{ |
|||
private static LogManager s_instance; |
|||
|
|||
public static LogManager Instance => s_instance ?? (s_instance = new LogManager()); |
|||
|
|||
public ILogger Logger |
|||
{ |
|||
get; |
|||
set; |
|||
} |
|||
|
|||
public bool LogPropertyMessages |
|||
{ |
|||
get; |
|||
set; |
|||
} |
|||
|
|||
public bool LogLayoutMessages |
|||
{ |
|||
get; |
|||
set; |
|||
} |
|||
|
|||
public static void Enable(ILogger logger) |
|||
{ |
|||
Instance.Logger = logger; |
|||
Locator.CurrentMutable.Register(() => Instance, typeof(ILogManager)); |
|||
} |
|||
|
|||
public IFullLogger GetLogger(Type type) |
|||
{ |
|||
if ((type == typeof(AvaloniaObject) && LogPropertyMessages) || |
|||
(type == typeof(Layoutable) && LogLayoutMessages)) |
|||
{ |
|||
return new WrappingFullLogger(Logger, type); |
|||
} |
|||
else |
|||
{ |
|||
return new WrappingFullLogger(new NullLogger(), type); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,113 @@ |
|||
using System.Collections.Generic; |
|||
using Avalonia.Controls; |
|||
using Avalonia.Controls.Shapes; |
|||
using Avalonia.Media; |
|||
using Avalonia.Platform; |
|||
using Avalonia.UnitTests; |
|||
using Xunit; |
|||
|
|||
namespace Avalonia.Layout.UnitTests |
|||
|
|||
{ |
|||
public class ShapeLayoutTests : TestWithServicesBase |
|||
{ |
|||
|
|||
public ShapeLayoutTests() |
|||
{ |
|||
AvaloniaLocator.CurrentMutable |
|||
.Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>(); |
|||
} |
|||
|
|||
[Fact] |
|||
public void Shape_Transformation_Calculation_Should_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Infinite() |
|||
{ |
|||
var shape = new Polygon() |
|||
{ |
|||
Points = new List<Point> |
|||
{ |
|||
new Point(0, 0), |
|||
new Point(10, 5), |
|||
new Point(0, 10) |
|||
}, |
|||
Stretch = Stretch.Fill |
|||
}; |
|||
|
|||
var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity); |
|||
shape.Measure(availableSize); |
|||
Geometry postMeasureGeometry = shape.RenderedGeometry; |
|||
Transform postMeasureTransform = postMeasureGeometry.Transform; |
|||
|
|||
var finalSize = new Size(100, 50); |
|||
var finalRect = new Rect(finalSize); |
|||
shape.Arrange(finalRect); |
|||
|
|||
Geometry postArrangeGeometry = shape.RenderedGeometry; |
|||
Transform postArrangeTransform = postArrangeGeometry.Transform; |
|||
|
|||
Assert.NotEqual(postMeasureGeometry, postArrangeGeometry); |
|||
Assert.NotEqual(postMeasureTransform, postArrangeTransform); |
|||
Assert.Equal(finalSize, shape.Bounds.Size); |
|||
} |
|||
|
|||
[Fact] |
|||
public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Finite() |
|||
{ |
|||
var shape = new Polygon() |
|||
{ |
|||
Points = new List<Point> |
|||
{ |
|||
new Point(0, 0), |
|||
new Point(10, 5), |
|||
new Point(0, 10) |
|||
}, |
|||
Stretch = Stretch.Fill |
|||
}; |
|||
|
|||
var availableSize = new Size(100, 50); |
|||
shape.Measure(availableSize); |
|||
Geometry postMeasureGeometry = shape.RenderedGeometry; |
|||
Transform postMeasureTransform = postMeasureGeometry.Transform; |
|||
|
|||
var finalRect = new Rect(availableSize); |
|||
shape.Arrange(finalRect); |
|||
|
|||
Geometry postArrangeGeometry = shape.RenderedGeometry; |
|||
Transform postArrangeTransform = postArrangeGeometry.Transform; |
|||
|
|||
Assert.Equal(postMeasureGeometry, postArrangeGeometry); |
|||
Assert.Equal(postMeasureTransform, postArrangeTransform); |
|||
Assert.Equal(availableSize, shape.Bounds.Size); |
|||
} |
|||
|
|||
[Fact] |
|||
public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_None() |
|||
{ |
|||
var shape = new Polygon() |
|||
{ |
|||
Points = new List<Point> |
|||
{ |
|||
new Point(0, 0), |
|||
new Point(10, 5), |
|||
new Point(0, 10) |
|||
}, |
|||
Stretch = Stretch.None |
|||
}; |
|||
|
|||
var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity); |
|||
shape.Measure(availableSize); |
|||
Geometry postMeasureGeometry = shape.RenderedGeometry; |
|||
Transform postMeasureTransform = postMeasureGeometry.Transform; |
|||
|
|||
var finalSize = new Size(100, 50); |
|||
var finalRect = new Rect(finalSize); |
|||
shape.Arrange(finalRect); |
|||
|
|||
Geometry postArrangeGeometry = shape.RenderedGeometry; |
|||
Transform postArrangeTransform = postArrangeGeometry.Transform; |
|||
|
|||
Assert.Equal(postMeasureGeometry, postArrangeGeometry); |
|||
Assert.Equal(postMeasureTransform, postArrangeTransform); |
|||
Assert.Equal(finalSize, shape.Bounds.Size); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace Avalonia.UnitTests |
|||
{ |
|||
public class TestWithServicesBase : IDisposable |
|||
{ |
|||
private IDisposable _scope; |
|||
|
|||
public TestWithServicesBase() |
|||
{ |
|||
_scope = AvaloniaLocator.EnterScope(); |
|||
} |
|||
|
|||
public void Dispose() |
|||
{ |
|||
_scope.Dispose(); |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue