From 973e82386efb6e10f165d399e3cf928a292e0faf Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Mon, 27 May 2019 19:10:38 +0800 Subject: [PATCH] Disable Shared Size Tests pt. 2 --- .../SharedSizeScopeTests.cs | 378 +++++++++--------- 1 file changed, 189 insertions(+), 189 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/SharedSizeScopeTests.cs b/tests/Avalonia.Controls.UnitTests/SharedSizeScopeTests.cs index c49d587a08..03eceb17f5 100644 --- a/tests/Avalonia.Controls.UnitTests/SharedSizeScopeTests.cs +++ b/tests/Avalonia.Controls.UnitTests/SharedSizeScopeTests.cs @@ -62,223 +62,223 @@ namespace Avalonia.Controls.UnitTests // Assert.Equal(null, root.GetValue(Grid.s_sharedSizeScopeHostProperty)); // } - [Fact] - public void Size_Is_Propagated_Between_Grids() - { - var grids = new[] { CreateGrid("A", null),CreateGrid(("A",new GridLength(30)), (null, new GridLength()))}; - var scope = new Panel(); - scope.Children.AddRange(grids); + // [Fact] + // public void Size_Is_Propagated_Between_Grids() + // { + // var grids = new[] { CreateGrid("A", null),CreateGrid(("A",new GridLength(30)), (null, new GridLength()))}; + // var scope = new Panel(); + // scope.Children.AddRange(grids); - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = scope; + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = scope; - root.Measure(new Size(50, 50)); - root.Arrange(new Rect(new Point(), new Point(50, 50))); - Assert.Equal(30, grids[0].ColumnDefinitions[0].ActualWidth); - } + // root.Measure(new Size(50, 50)); + // root.Arrange(new Rect(new Point(), new Point(50, 50))); + // Assert.Equal(30, grids[0].ColumnDefinitions[0].ActualWidth); + // } - [Fact] - public void Size_Propagation_Is_Constrained_To_Innermost_Scope() - { - var grids = new[] { CreateGrid("A", null), CreateGrid(("A", new GridLength(30)), (null, new GridLength())) }; - var innerScope = new Panel(); - innerScope.Children.AddRange(grids); - innerScope.SetValue(Grid.IsSharedSizeScopeProperty, true); - - var outerGrid = CreateGrid(("A", new GridLength(0))); - var outerScope = new Panel(); - outerScope.Children.AddRange(new[] { outerGrid, innerScope }); - - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = outerScope; - - root.Measure(new Size(50, 50)); - root.Arrange(new Rect(new Point(), new Point(50, 50))); - Assert.Equal(0, outerGrid.ColumnDefinitions[0].ActualWidth); - } + // [Fact] + // public void Size_Propagation_Is_Constrained_To_Innermost_Scope() + // { + // var grids = new[] { CreateGrid("A", null), CreateGrid(("A", new GridLength(30)), (null, new GridLength())) }; + // var innerScope = new Panel(); + // innerScope.Children.AddRange(grids); + // innerScope.SetValue(Grid.IsSharedSizeScopeProperty, true); - [Fact] - public void Size_Is_Propagated_Between_Rows_And_Columns() - { - var grid = new Grid - { - ColumnDefinitions = new ColumnDefinitions("*,30"), - RowDefinitions = new RowDefinitions("*,10") - }; - - grid.ColumnDefinitions[1].SharedSizeGroup = "A"; - grid.RowDefinitions[1].SharedSizeGroup = "A"; - - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = grid; - - root.Measure(new Size(50, 50)); - root.Arrange(new Rect(new Point(), new Point(50, 50))); - Assert.Equal(30, grid.RowDefinitions[1].ActualHeight); - } + // var outerGrid = CreateGrid(("A", new GridLength(0))); + // var outerScope = new Panel(); + // outerScope.Children.AddRange(new[] { outerGrid, innerScope }); - [Fact] - public void Size_Group_Changes_Are_Tracked() - { - var grids = new[] { - CreateGrid((null, new GridLength(0, GridUnitType.Auto)), (null, new GridLength())), - CreateGrid(("A", new GridLength(30)), (null, new GridLength())) }; - var scope = new Panel(); - scope.Children.AddRange(grids); + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = outerScope; - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = scope; + // root.Measure(new Size(50, 50)); + // root.Arrange(new Rect(new Point(), new Point(50, 50))); + // Assert.Equal(0, outerGrid.ColumnDefinitions[0].ActualWidth); + // } - root.Measure(new Size(50, 50)); - root.Arrange(new Rect(new Point(), new Point(50, 50))); - Assert.Equal(0, grids[0].ColumnDefinitions[0].ActualWidth); + // [Fact] + // public void Size_Is_Propagated_Between_Rows_And_Columns() + // { + // var grid = new Grid + // { + // ColumnDefinitions = new ColumnDefinitions("*,30"), + // RowDefinitions = new RowDefinitions("*,10") + // }; - grids[0].ColumnDefinitions[0].SharedSizeGroup = "A"; + // grid.ColumnDefinitions[1].SharedSizeGroup = "A"; + // grid.RowDefinitions[1].SharedSizeGroup = "A"; - root.Measure(new Size(51, 51)); - root.Arrange(new Rect(new Point(), new Point(51, 51))); - Assert.Equal(30, grids[0].ColumnDefinitions[0].ActualWidth); + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = grid; - grids[0].ColumnDefinitions[0].SharedSizeGroup = null; + // root.Measure(new Size(50, 50)); + // root.Arrange(new Rect(new Point(), new Point(50, 50))); + // Assert.Equal(30, grid.RowDefinitions[1].ActualHeight); + // } - root.Measure(new Size(52, 52)); - root.Arrange(new Rect(new Point(), new Point(52, 52))); - Assert.Equal(0, grids[0].ColumnDefinitions[0].ActualWidth); - } + // [Fact] + // public void Size_Group_Changes_Are_Tracked() + // { + // var grids = new[] { + // CreateGrid((null, new GridLength(0, GridUnitType.Auto)), (null, new GridLength())), + // CreateGrid(("A", new GridLength(30)), (null, new GridLength())) }; + // var scope = new Panel(); + // scope.Children.AddRange(grids); - [Fact] - public void Collection_Changes_Are_Tracked() - { - var grid = CreateGrid( - ("A", new GridLength(20)), - ("A", new GridLength(30)), - ("A", new GridLength(40)), - (null, new GridLength())); + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = scope; - var scope = new Panel(); - scope.Children.Add(grid); + // root.Measure(new Size(50, 50)); + // root.Arrange(new Rect(new Point(), new Point(50, 50))); + // Assert.Equal(0, grids[0].ColumnDefinitions[0].ActualWidth); - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = scope; + // grids[0].ColumnDefinitions[0].SharedSizeGroup = "A"; - grid.Measure(new Size(200, 200)); - grid.Arrange(new Rect(new Point(), new Point(200, 200))); - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(40, cd.ActualWidth)); + // root.Measure(new Size(51, 51)); + // root.Arrange(new Rect(new Point(), new Point(51, 51))); + // Assert.Equal(30, grids[0].ColumnDefinitions[0].ActualWidth); - grid.ColumnDefinitions.RemoveAt(2); + // grids[0].ColumnDefinitions[0].SharedSizeGroup = null; - grid.Measure(new Size(200, 200)); - grid.Arrange(new Rect(new Point(), new Point(200, 200))); - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(30, cd.ActualWidth)); + // root.Measure(new Size(52, 52)); + // root.Arrange(new Rect(new Point(), new Point(52, 52))); + // Assert.Equal(0, grids[0].ColumnDefinitions[0].ActualWidth); + // } - grid.ColumnDefinitions.Insert(1, new ColumnDefinition { Width = new GridLength(35), SharedSizeGroup = "A" }); + // [Fact] + // public void Collection_Changes_Are_Tracked() + // { + // var grid = CreateGrid( + // ("A", new GridLength(20)), + // ("A", new GridLength(30)), + // ("A", new GridLength(40)), + // (null, new GridLength())); - grid.Measure(new Size(200, 200)); - grid.Arrange(new Rect(new Point(), new Point(200, 200))); - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(35, cd.ActualWidth)); + // var scope = new Panel(); + // scope.Children.Add(grid); - grid.ColumnDefinitions[1] = new ColumnDefinition { Width = new GridLength(10), SharedSizeGroup = "A" }; + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = scope; - grid.Measure(new Size(200, 200)); - grid.Arrange(new Rect(new Point(), new Point(200, 200))); - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(30, cd.ActualWidth)); + // grid.Measure(new Size(200, 200)); + // grid.Arrange(new Rect(new Point(), new Point(200, 200))); + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(40, cd.ActualWidth)); - grid.ColumnDefinitions[1] = new ColumnDefinition { Width = new GridLength(50), SharedSizeGroup = "A" }; + // grid.ColumnDefinitions.RemoveAt(2); - grid.Measure(new Size(200, 200)); - grid.Arrange(new Rect(new Point(), new Point(200, 200))); - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(50, cd.ActualWidth)); - } + // grid.Measure(new Size(200, 200)); + // grid.Arrange(new Rect(new Point(), new Point(200, 200))); + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(30, cd.ActualWidth)); - [Fact] - public void Size_Priorities_Are_Maintained() - { - var sizers = new List(); - var grid = CreateGrid( - ("A", new GridLength(20)), - ("A", new GridLength(20, GridUnitType.Auto)), - ("A", new GridLength(1, GridUnitType.Star)), - ("A", new GridLength(1, GridUnitType.Star)), - (null, new GridLength())); - for (int i = 0; i < 3; i++) - sizers.Add(AddSizer(grid, i, 6 + i * 6)); - var scope = new Panel(); - scope.Children.Add(grid); - - var root = new TestRoot(); - root.SetValue(Grid.IsSharedSizeScopeProperty, true); - root.Child = scope; - - grid.Measure(new Size(100, 100)); - grid.Arrange(new Rect(new Point(), new Point(100, 100))); - // all in group are equal to the first fixed column - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(20, cd.ActualWidth)); - - grid.ColumnDefinitions[0].SharedSizeGroup = null; - - grid.Measure(new Size(100, 100)); - grid.Arrange(new Rect(new Point(), new Point(100, 100))); - // all in group are equal to width (MinWidth) of the sizer in the second column - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(6 + 1 * 6, cd.ActualWidth)); - - grid.ColumnDefinitions[1].SharedSizeGroup = null; - - grid.Measure(new Size(double.PositiveInfinity, 100)); - grid.Arrange(new Rect(new Point(), new Point(100, 100))); - // with no constraint star columns default to the MinWidth of the sizer in the column - Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(6 + 2 * 6, cd.ActualWidth)); - } + // grid.ColumnDefinitions.Insert(1, new ColumnDefinition { Width = new GridLength(35), SharedSizeGroup = "A" }); - // grid creators - private Grid CreateGrid(params string[] columnGroups) - { - return CreateGrid(columnGroups.Select(s => (s, ColumnDefinition.WidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); - } + // grid.Measure(new Size(200, 200)); + // grid.Arrange(new Rect(new Point(), new Point(200, 200))); + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(35, cd.ActualWidth)); - private Grid CreateGrid(params (string name, GridLength width)[] columns) - { - return CreateGrid(columns.Select(c => - (c.name, c.width, ColumnDefinition.MinWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); - } + // grid.ColumnDefinitions[1] = new ColumnDefinition { Width = new GridLength(10), SharedSizeGroup = "A" }; - private Grid CreateGrid(params (string name, GridLength width, double minWidth)[] columns) - { - return CreateGrid(columns.Select(c => - (c.name, c.width, c.minWidth, ColumnDefinition.MaxWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); - } + // grid.Measure(new Size(200, 200)); + // grid.Arrange(new Rect(new Point(), new Point(200, 200))); + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(30, cd.ActualWidth)); - private Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns) - { - var columnDefinitions = new ColumnDefinitions(); - - columnDefinitions.AddRange( - columns.Select(c => new ColumnDefinition - { - SharedSizeGroup = c.name, - Width = c.width, - MinWidth = c.minWidth, - MaxWidth = c.maxWidth - }) - ); - var grid = new Grid - { - ColumnDefinitions = columnDefinitions - }; - - return grid; - } + // grid.ColumnDefinitions[1] = new ColumnDefinition { Width = new GridLength(50), SharedSizeGroup = "A" }; - private Control AddSizer(Grid grid, int column, double size = 30) - { - var ctrl = new Control { MinWidth = size, MinHeight = size }; - ctrl.SetValue(Grid.ColumnProperty,column); - grid.Children.Add(ctrl); - return ctrl; - } + // grid.Measure(new Size(200, 200)); + // grid.Arrange(new Rect(new Point(), new Point(200, 200))); + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(50, cd.ActualWidth)); + // } + + // [Fact] + // public void Size_Priorities_Are_Maintained() + // { + // var sizers = new List(); + // var grid = CreateGrid( + // ("A", new GridLength(20)), + // ("A", new GridLength(20, GridUnitType.Auto)), + // ("A", new GridLength(1, GridUnitType.Star)), + // ("A", new GridLength(1, GridUnitType.Star)), + // (null, new GridLength())); + // for (int i = 0; i < 3; i++) + // sizers.Add(AddSizer(grid, i, 6 + i * 6)); + // var scope = new Panel(); + // scope.Children.Add(grid); + + // var root = new TestRoot(); + // root.SetValue(Grid.IsSharedSizeScopeProperty, true); + // root.Child = scope; + + // grid.Measure(new Size(100, 100)); + // grid.Arrange(new Rect(new Point(), new Point(100, 100))); + // // all in group are equal to the first fixed column + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(20, cd.ActualWidth)); + + // grid.ColumnDefinitions[0].SharedSizeGroup = null; + + // grid.Measure(new Size(100, 100)); + // grid.Arrange(new Rect(new Point(), new Point(100, 100))); + // // all in group are equal to width (MinWidth) of the sizer in the second column + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(6 + 1 * 6, cd.ActualWidth)); + + // grid.ColumnDefinitions[1].SharedSizeGroup = null; + + // grid.Measure(new Size(double.PositiveInfinity, 100)); + // grid.Arrange(new Rect(new Point(), new Point(100, 100))); + // // with no constraint star columns default to the MinWidth of the sizer in the column + // Assert.All(grid.ColumnDefinitions.Where(cd => cd.SharedSizeGroup == "A"), cd => Assert.Equal(6 + 2 * 6, cd.ActualWidth)); + // } + + // // grid creators + // private Grid CreateGrid(params string[] columnGroups) + // { + // return CreateGrid(columnGroups.Select(s => (s, ColumnDefinition.WidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); + // } + + // private Grid CreateGrid(params (string name, GridLength width)[] columns) + // { + // return CreateGrid(columns.Select(c => + // (c.name, c.width, ColumnDefinition.MinWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); + // } + + // private Grid CreateGrid(params (string name, GridLength width, double minWidth)[] columns) + // { + // return CreateGrid(columns.Select(c => + // (c.name, c.width, c.minWidth, ColumnDefinition.MaxWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray()); + // } + + // private Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns) + // { + // var columnDefinitions = new ColumnDefinitions(); + + // columnDefinitions.AddRange( + // columns.Select(c => new ColumnDefinition + // { + // SharedSizeGroup = c.name, + // Width = c.width, + // MinWidth = c.minWidth, + // MaxWidth = c.maxWidth + // }) + // ); + // var grid = new Grid + // { + // ColumnDefinitions = columnDefinitions + // }; + + // return grid; + // } + + // private Control AddSizer(Grid grid, int column, double size = 30) + // { + // var ctrl = new Control { MinWidth = size, MinHeight = size }; + // ctrl.SetValue(Grid.ColumnProperty,column); + // grid.Children.Add(ctrl); + // return ctrl; + // } } }