From 26f1124c75966d55148d6d55db9f05829b0e0654 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 24 Dec 2015 13:09:15 +0000 Subject: [PATCH] Fixed failing test. Also fixed spelling mistakes and formatting. --- .../GridSplitterTests.cs | 80 +++++++++++-------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/tests/Perspex.Controls.UnitTests/GridSplitterTests.cs b/tests/Perspex.Controls.UnitTests/GridSplitterTests.cs index 2fd2c71034..5fa3e4294d 100644 --- a/tests/Perspex.Controls.UnitTests/GridSplitterTests.cs +++ b/tests/Perspex.Controls.UnitTests/GridSplitterTests.cs @@ -11,29 +11,34 @@ namespace Perspex.Controls.UnitTests public class GridSplitterTests { [Fact] - public void Vertical_Stays_Within_Constrains() + public void Vertical_Stays_Within_Constraints() { var cursorFactoryImpl = new Mock(); PerspexLocator.CurrentMutable.Bind().ToConstant(cursorFactoryImpl.Object); var control1 = new Border { [Grid.ColumnProperty] = 0 }; - var splitter = new GridSplitter { [Grid.ColumnProperty] = 1}; + var splitter = new GridSplitter + { + Orientation = Orientation.Vertical, + [Grid.ColumnProperty] = 1, + }; var control2 = new Border { [Grid.ColumnProperty] = 2 }; - var columnDefenitions = new ColumnDefinitions() - { - new ColumnDefinition(1, GridUnitType.Star) {MinWidth = 10, MaxWidth = 190}, - new ColumnDefinition(GridLength.Auto), - new ColumnDefinition(1, GridUnitType.Star) {MinWidth = 80, MaxWidth = 120}, - }; + var columnDefinitions = new ColumnDefinitions() + { + new ColumnDefinition(1, GridUnitType.Star) {MinWidth = 10, MaxWidth = 190}, + new ColumnDefinition(GridLength.Auto), + new ColumnDefinition(1, GridUnitType.Star) {MinWidth = 80, MaxWidth = 120}, + }; + var grid = new Grid() - { - ColumnDefinitions = columnDefenitions, - Children = new Controls() - { - control1, splitter, control2 - } - }; + { + ColumnDefinitions = columnDefinitions, + Children = new Controls() + { + control1, splitter, control2 + } + }; var root = new TestRoot { Child = grid }; Assert.Equal(splitter.Orientation, Orientation.Vertical); @@ -46,40 +51,45 @@ namespace Perspex.Controls.UnitTests RoutedEvent = Thumb.DragDeltaEvent, Vector = new Vector(-100,0) }); - Assert.Equal(columnDefenitions[0].Width, new GridLength(80,GridUnitType.Star)); - Assert.Equal(columnDefenitions[2].Width, new GridLength(120,GridUnitType.Star)); + Assert.Equal(columnDefinitions[0].Width, new GridLength(80,GridUnitType.Star)); + Assert.Equal(columnDefinitions[2].Width, new GridLength(120,GridUnitType.Star)); splitter.RaiseEvent(new VectorEventArgs { RoutedEvent = Thumb.DragDeltaEvent, Vector = new Vector(100, 0) }); - Assert.Equal(columnDefenitions[0].Width, new GridLength(120, GridUnitType.Star)); - Assert.Equal(columnDefenitions[2].Width, new GridLength(80, GridUnitType.Star)); + Assert.Equal(columnDefinitions[0].Width, new GridLength(120, GridUnitType.Star)); + Assert.Equal(columnDefinitions[2].Width, new GridLength(80, GridUnitType.Star)); } [Fact] - public void Horizontal_Stays_Within_Constrains() + public void Horizontal_Stays_Within_Constraints() { var cursorFactoryImpl = new Mock(); PerspexLocator.CurrentMutable.Bind().ToConstant(cursorFactoryImpl.Object); var control1 = new Border { [Grid.RowProperty] = 0 }; - var splitter = new GridSplitter { [Grid.RowProperty] = 1 }; + var splitter = new GridSplitter + { + Orientation = Orientation.Horizontal, + [Grid.RowProperty] = 1, + }; var control2 = new Border { [Grid.RowProperty] = 2 }; - var rowDefenitions = new RowDefinitions() - { - new RowDefinition(1, GridUnitType.Star) {MinHeight = 70, MaxHeight = 110}, - new RowDefinition(GridLength.Auto), - new RowDefinition(1, GridUnitType.Star) { MinHeight = 10, MaxHeight = 140}, - }; + var rowDefinitions = new RowDefinitions() + { + new RowDefinition(1, GridUnitType.Star) {MinHeight = 70, MaxHeight = 110}, + new RowDefinition(GridLength.Auto), + new RowDefinition(1, GridUnitType.Star) { MinHeight = 10, MaxHeight = 140}, + }; + var grid = new Grid() { - RowDefinitions = rowDefenitions, + RowDefinitions = rowDefinitions, Children = new Controls() - { - control1, splitter, control2 - } + { + control1, splitter, control2 + } }; var root = new TestRoot { Child = grid }; @@ -92,15 +102,15 @@ namespace Perspex.Controls.UnitTests RoutedEvent = Thumb.DragDeltaEvent, Vector = new Vector(0, -100) }); - Assert.Equal(rowDefenitions[0].Height, new GridLength(70, GridUnitType.Star)); - Assert.Equal(rowDefenitions[2].Height, new GridLength(130, GridUnitType.Star)); + Assert.Equal(rowDefinitions[0].Height, new GridLength(70, GridUnitType.Star)); + Assert.Equal(rowDefinitions[2].Height, new GridLength(130, GridUnitType.Star)); splitter.RaiseEvent(new VectorEventArgs { RoutedEvent = Thumb.DragDeltaEvent, Vector = new Vector(0, 100) }); - Assert.Equal(rowDefenitions[0].Height, new GridLength(110, GridUnitType.Star)); - Assert.Equal(rowDefenitions[2].Height, new GridLength(90, GridUnitType.Star)); + Assert.Equal(rowDefinitions[0].Height, new GridLength(110, GridUnitType.Star)); + Assert.Equal(rowDefinitions[2].Height, new GridLength(90, GridUnitType.Star)); } } } \ No newline at end of file