tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't need to create LayoutManager target. 

There is already one on the root.
pull/1014/head
Steven Kirk 9 years ago
parent
5e3f604308
commit
061a264ca4
1 changed files with 19 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs

47
tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
View File

@ -14,15 +14,14 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Measures_And_Arranges_InvalidateMeasured_Control() public void Measures_And_Arranges_InvalidateMeasured_Control()
{ {
var target = new LayoutManager();
var control = new LayoutTestControl(); var control = new LayoutTestControl();
var root = new LayoutTestRoot { Child = control }; var root = new LayoutTestRoot { Child = control };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
control.Measured = control.Arranged = false; control.Measured = control.Arranged = false;
control.InvalidateMeasure(); control.InvalidateMeasure();
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.True(control.Measured); Assert.True(control.Measured);
Assert.True(control.Arranged); Assert.True(control.Arranged);
@ -31,15 +30,14 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Arranges_InvalidateArranged_Control() public void Arranges_InvalidateArranged_Control()
{ {
var target = new LayoutManager();
var control = new LayoutTestControl(); var control = new LayoutTestControl();
var root = new LayoutTestRoot { Child = control }; var root = new LayoutTestRoot { Child = control };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
control.Measured = control.Arranged = false; control.Measured = control.Arranged = false;
control.InvalidateArrange(); control.InvalidateArrange();
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.False(control.Measured); Assert.False(control.Measured);
Assert.True(control.Arranged); Assert.True(control.Arranged);
@ -48,15 +46,14 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Measures_Parent_Of_Newly_Added_Control() public void Measures_Parent_Of_Newly_Added_Control()
{ {
var target = new LayoutManager();
var control = new LayoutTestControl(); var control = new LayoutTestControl();
var root = new LayoutTestRoot(); var root = new LayoutTestRoot();
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
root.Child = control; root.Child = control;
root.Measured = root.Arranged = false; root.Measured = root.Arranged = false;
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.True(root.Measured); Assert.True(root.Measured);
Assert.True(root.Arranged); Assert.True(root.Arranged);
@ -67,7 +64,6 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Measures_In_Correct_Order() public void Measures_In_Correct_Order()
{ {
var target = new LayoutManager();
LayoutTestControl control1; LayoutTestControl control1;
LayoutTestControl control2; LayoutTestControl control2;
var root = new LayoutTestRoot var root = new LayoutTestRoot
@ -89,14 +85,14 @@ namespace Avalonia.Layout.UnitTests
root.DoMeasureOverride = MeasureOverride; root.DoMeasureOverride = MeasureOverride;
control1.DoMeasureOverride = MeasureOverride; control1.DoMeasureOverride = MeasureOverride;
control2.DoMeasureOverride = MeasureOverride; control2.DoMeasureOverride = MeasureOverride;
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
control2.InvalidateMeasure(); control2.InvalidateMeasure();
control1.InvalidateMeasure(); control1.InvalidateMeasure();
root.InvalidateMeasure(); root.InvalidateMeasure();
order.Clear(); order.Clear();
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.Equal(new ILayoutable[] { root, control1, control2 }, order); Assert.Equal(new ILayoutable[] { root, control1, control2 }, order);
} }
@ -104,7 +100,6 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Measures_Root_And_Grandparent_In_Correct_Order() public void Measures_Root_And_Grandparent_In_Correct_Order()
{ {
var target = new LayoutManager();
LayoutTestControl control1; LayoutTestControl control1;
LayoutTestControl control2; LayoutTestControl control2;
var root = new LayoutTestRoot var root = new LayoutTestRoot
@ -126,13 +121,13 @@ namespace Avalonia.Layout.UnitTests
root.DoMeasureOverride = MeasureOverride; root.DoMeasureOverride = MeasureOverride;
control1.DoMeasureOverride = MeasureOverride; control1.DoMeasureOverride = MeasureOverride;
control2.DoMeasureOverride = MeasureOverride; control2.DoMeasureOverride = MeasureOverride;
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
control2.InvalidateMeasure(); control2.InvalidateMeasure();
root.InvalidateMeasure(); root.InvalidateMeasure();
order.Clear(); order.Clear();
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.Equal(new ILayoutable[] { root, control2 }, order); Assert.Equal(new ILayoutable[] { root, control2 }, order);
} }
@ -140,16 +135,15 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Doesnt_Measure_Non_Invalidated_Root() public void Doesnt_Measure_Non_Invalidated_Root()
{ {
var target = new LayoutManager();
var control = new LayoutTestControl(); var control = new LayoutTestControl();
var root = new LayoutTestRoot { Child = control }; var root = new LayoutTestRoot { Child = control };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
root.Measured = root.Arranged = false; root.Measured = root.Arranged = false;
control.Measured = control.Arranged = false; control.Measured = control.Arranged = false;
control.InvalidateMeasure(); control.InvalidateMeasure();
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.False(root.Measured); Assert.False(root.Measured);
Assert.False(root.Arranged); Assert.False(root.Arranged);
@ -160,16 +154,15 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Doesnt_Measure_Removed_Control() public void Doesnt_Measure_Removed_Control()
{ {
var target = new LayoutManager();
var control = new LayoutTestControl(); var control = new LayoutTestControl();
var root = new LayoutTestRoot { Child = control }; var root = new LayoutTestRoot { Child = control };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
control.Measured = control.Arranged = false; control.Measured = control.Arranged = false;
control.InvalidateMeasure(); control.InvalidateMeasure();
root.Child = null; root.Child = null;
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.False(control.Measured); Assert.False(control.Measured);
Assert.False(control.Arranged); Assert.False(control.Arranged);
@ -178,7 +171,6 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Measures_Root_With_Infinity() public void Measures_Root_With_Infinity()
{ {
var target = new LayoutManager();
var root = new LayoutTestRoot(); var root = new LayoutTestRoot();
var availableSize = default(Size); var availableSize = default(Size);
@ -191,7 +183,7 @@ namespace Avalonia.Layout.UnitTests
return new Size(100, 100); return new Size(100, 100);
}; };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
Assert.Equal(Size.Infinity, availableSize); Assert.Equal(Size.Infinity, availableSize);
} }
@ -199,7 +191,6 @@ namespace Avalonia.Layout.UnitTests
[Fact] [Fact]
public void Arranges_Root_With_DesiredSize() public void Arranges_Root_With_DesiredSize()
{ {
var target = new LayoutManager();
var root = new LayoutTestRoot var root = new LayoutTestRoot
{ {
Width = 100, Width = 100,
@ -213,13 +204,13 @@ namespace Avalonia.Layout.UnitTests
arrangeSize = s; arrangeSize = s;
return s; return s;
}; };
target.ExecuteInitialLayoutPass(root); root.LayoutManager.ExecuteInitialLayoutPass(root);
Assert.Equal(new Size(100, 100), arrangeSize); Assert.Equal(new Size(100, 100), arrangeSize);
root.Width = 120; root.Width = 120;
target.ExecuteLayoutPass(); root.LayoutManager.ExecuteLayoutPass();
Assert.Equal(new Size(120, 100), arrangeSize); Assert.Equal(new Size(120, 100), arrangeSize);
} }

Write Preview
Loading…
Cancel
Save