Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions SemiPlot/SemiPlot.Tests.Unit/UI/Chart/AxisScalePanelDriver.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Threading;
using Avalonia.VisualTree;

using SemiPlot.UI.Chart;

using static SemiPlot.Tests.Unit.UI.Chart.ChartViewTestBuilder;

namespace SemiPlot.Tests.Unit.UI.Chart;

/// <summary>Opens the axis scale panel on a shown chart and reaches its parts, for the panel's view tests.</summary>
internal static class AxisScalePanelDriver
{
public static (Flyout Flyout, AxisScalePanel Panel) OpenPanel(TrendChartViewModel viewModel, ShownChart shown)
{
HeadlessInput.Click(shown.Window, shown.PlotControl, AxisRegionPoint(viewModel));
Dispatcher.UIThread.RunJobs();

var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(shown.PlotControl)!;

return (flyout, (AxisScalePanel)flyout.Content!);
}

public static FlyoutPresenter PresenterOf(AxisScalePanel panel)
{
return panel.GetVisualAncestors().OfType<FlyoutPresenter>().First();
}

public static (Size Panel, Size Message, Size Presenter) SizesOf(AxisScalePanel panel, TextBlock message)
{
return (panel.Bounds.Size, message.Bounds.Size, PresenterOf(panel).Bounds.Size);
}

public static void TypeInto(Window window, AxisScalePanel panel, string fieldName, string text)
{
var field = panel.FindControl<TextBox>(fieldName)!;

HeadlessInput.Clear(window, field);
HeadlessInput.Type(window, field, text);
}
}
189 changes: 189 additions & 0 deletions SemiPlot/SemiPlot.Tests.Unit/UI/Chart/AxisScalePanelLayoutTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Headless.XUnit;
using Avalonia.VisualTree;

using AwesomeAssertions;

using SemiPlot.UI.Localization;

using Xunit;

using static SemiPlot.Tests.Unit.UI.Chart.AxisScalePanelDriver;
using static SemiPlot.Tests.Unit.UI.Chart.ChartViewTestBuilder;
using static SemiPlot.Tests.Unit.UI.InterMeasure;

namespace SemiPlot.Tests.Unit.UI.Chart;

// The axis scale panel's layout and its invalid-field glyph, realised through Avalonia's real pipeline.
[Trait("Component", "UI")]
[Trait("Area", "Chart")]
[Trait("Category", "Unit")]
[Collection(ProcessGlobalStateCollection.Name)]
public sealed class AxisScalePanelLayoutTests
{
[AvaloniaFact]
public void AnInvalidBound_ShowsTheWarningGlyphInsideTheBoxWithoutResizing()
{
using var culture = new CultureScope("en-US");
using var viewModel = CreateLoadedViewModel();
viewModel.SetAxisLimits(1, 10.0, 90.0);
using var shown = ShowChart(viewModel);
var (_, panel) = OpenPanel(viewModel, shown);
var maximum = panel.FindControl<TextBox>("AxisScaleMaximum")!;
var minimum = panel.FindControl<TextBox>("AxisScaleMinimum")!;
var message = panel.FindControl<TextBlock>("AxisScaleValidationMessage")!;
var (sizes, maximumBounds, minimumBounds) = (SizesOf(panel, message), maximum.Bounds, minimum.Bounds);
panel.TryFindResource("WarningGeometry", out var warning).Should().BeTrue();

TypeInto(shown.Window, panel, "AxisScaleMaximum", "1x");
HeadlessInput.Clear(shown.Window, minimum);

var glyphs = new[] { maximum, minimum }.Select(box =>
{
box.Classes.Should().Contain("invalid");
var glyph = box.InnerRightContent.Should().BeOfType<PathIcon>().Subject;
glyph.IsEffectivelyVisible.Should().BeTrue();
glyph.Data.Should().BeSameAs(warning);
ViewProbe.LeftOf(glyph, box).Should().BeGreaterThanOrEqualTo(0);
ViewProbe.RightOf(glyph, box).Should().BeLessThanOrEqualTo(box.Bounds.Width, "the glyph sits inside the box");
ViewProbe.TopOf(glyph, box).Should().BeGreaterThanOrEqualTo(0);
ViewProbe.BottomOf(glyph, box).Should().BeLessThanOrEqualTo(box.Bounds.Height);

return glyph;
}).ToList();

glyphs[0].Should().NotBeSameAs(glyphs[1], "each box carries a glyph of its own");
(SizesOf(panel, message), maximum.Bounds, minimum.Bounds).Should().Be((sizes, maximumBounds, minimumBounds));
}

[AvaloniaFact]
public void AValidBound_ShowsNoWarningGlyph()
{
using var viewModel = CreateLoadedViewModel();
viewModel.SetAxisLimits(1, 10.0, 90.0);
using var shown = ShowChart(viewModel);
var (_, panel) = OpenPanel(viewModel, shown);

foreach (var name in new[] { "AxisScaleMaximum", "AxisScaleMinimum" })
{
var box = panel.FindControl<TextBox>(name)!;
box.Classes.Should().NotContain("invalid", name);
box.InnerRightContent.Should().BeNull(name);
}
}

[AvaloniaFact]
public void ABoundCorrected_DropsTheWarningGlyph()
{
using var culture = new CultureScope("en-US");
using var viewModel = CreateLoadedViewModel();
viewModel.SetAxisLimits(1, 10.0, 90.0);
using var shown = ShowChart(viewModel);
var (_, panel) = OpenPanel(viewModel, shown);
var maximum = panel.FindControl<TextBox>("AxisScaleMaximum")!;

TypeInto(shown.Window, panel, "AxisScaleMaximum", "1x");
maximum.InnerRightContent.Should().BeOfType<PathIcon>();

TypeInto(shown.Window, panel, "AxisScaleMaximum", "50");

maximum.Classes.Should().NotContain("invalid");
maximum.InnerRightContent.Should().BeNull();
}

[AvaloniaTheory]
[InlineData("en-US")]
[InlineData("ru-RU")]
public void TheLogarithmicBox_StartsAtTheFieldEdge_UnderTheScaleTypeLabel(string cultureName)
{
const double Tolerance = 0.5;
using var culture = new CultureScope(cultureName);
using var viewModel = CreateLoadedViewModel();
using var shown = ShowChart(viewModel);
var (_, panel) = OpenPanel(viewModel, shown);
var box = panel.FindControl<CheckBox>("AxisScaleLogarithmic")!;
var bounds = panel.FindControl<Grid>("AxisScaleBounds")!;
var row = panel.FindControl<Grid>("AxisScaleType")!;
var fieldEdge = ViewProbe.LeftOf(panel.FindControl<TextBox>("AxisScaleMaximum")!, panel);

ViewProbe.LeftOf(box, panel).Should().BeApproximately(fieldEdge, Tolerance, "the box starts at the field edge");
ViewProbe.LeftOf(panel.FindControl<TextBox>("AxisScaleMinimum")!, panel).Should()
.BeApproximately(fieldEdge, Tolerance);
row.GetVisualAncestors().Should().NotContain(bounds, "focus onto the box must leave the pair's grid");
box.Parent.Should().BeSameAs(row);
row.ColumnDefinitions[0].ActualWidth.Should()
.BeApproximately(bounds.ColumnDefinitions[0].ActualWidth, Tolerance, "the two grids share one label column");
var label = panel.FindControl<TextBlock>("AxisScaleTypeLabel")!;
label.Text.Should().Be(Resources.PenFormScaleTypeLabel);
label.Parent.Should().BeSameAs(row);
Grid.GetColumn(label).Should().Be(0);
box.Content.Should().Be(Resources.PenFormLogarithmic);
}

[AvaloniaFact]
public void AClickOnTheScaleTypeLabelOrBesideTheBox_LeavesTheFlagAndGivesThePanelTheKeyboard()
{
using var viewModel = CreateLoadedViewModel();
viewModel.SetAxisLimits(1, 1.0, 90.0);
using var shown = ShowChart(viewModel);
var (flyout, panel) = OpenPanel(viewModel, shown);
var box = panel.FindControl<CheckBox>("AxisScaleLogarithmic")!;
var row = panel.FindControl<Grid>("AxisScaleType")!;
var besideTheBox = new Point(
(ViewProbe.RightOf(box, row) + row.Bounds.Width) / 2.0,
row.Bounds.Height / 2.0);

box.Bounds.Width.Should().BeLessThan(row.ColumnDefinitions[1].ActualWidth, "the box does not span its column");

HeadlessInput.Click(shown.Window, panel.FindControl<TextBlock>("AxisScaleTypeLabel")!);

viewModel.ScaleSettings[1].IsLogarithmic.Should().BeFalse("a click on the label does not toggle");
box.IsChecked.Should().BeFalse();
box.IsFocused.Should().BeFalse();
panel.IsFocused.Should().BeTrue("the panel takes the keyboard");

HeadlessInput.Click(shown.Window, row, besideTheBox);

viewModel.ScaleSettings[1].IsLogarithmic.Should().BeFalse("a click beside the box does not toggle");
box.IsChecked.Should().BeFalse();
box.IsFocused.Should().BeFalse();
panel.IsFocused.Should().BeTrue("the panel takes the keyboard");
flyout.IsOpen.Should().BeTrue();
}

[AvaloniaTheory]
[InlineData("en-US")]
[InlineData("ru-RU")]
public void TheScaleTypeRow_FitsThePanelInInter(string cultureName)
{
const double FieldSlack = 24.0;
using var culture = new CultureScope(cultureName);
using var viewModel = CreateLoadedViewModel();
using var shown = ShowChart(viewModel);
var (_, panel) = OpenPanel(viewModel, shown);
var bounds = panel.FindControl<Grid>("AxisScaleBounds")!;
var row = panel.FindControl<Grid>("AxisScaleType")!;
var field = panel.FindControl<TextBox>("AxisScaleMaximum")!;
var box = panel.FindControl<CheckBox>("AxisScaleLogarithmic")!;
var labels = bounds.Children.OfType<TextBlock>()
.Append(panel.FindControl<TextBlock>("AxisScaleTypeLabel")!)
.ToList();
labels.Select(label => label.Text).Should().Equal(
Resources.AxisScaleMaximumLabel, Resources.AxisScaleMinimumLabel, Resources.PenFormScaleTypeLabel);
using var typeface = InterTypeface();
var labelWidths = labels.Select(label =>
{
using var font = InterFont(typeface, label.FontSize);
return (double)font.MeasureText(label.Text);
}).ToList();
var labelColumn = labelWidths.Max();
var boxWidth = ContentWidthInInter(shown.Window, box, typeface);
TestContext.Current.TestOutputHelper?.WriteLine(
$"{cultureName}: labels {string.Join(", ", labelWidths.Select(width => $"{width:0.0}"))} px, "
+ $"label column {labelColumn:0.0} px, box {boxWidth:0.0} px");

(labelColumn + bounds.ColumnSpacing + field.Width).Should().BeLessThanOrEqualTo(panel.Width - FieldSlack);
(labelColumn + row.ColumnSpacing + boxWidth).Should().BeLessThanOrEqualTo(panel.Width);
}
}
32 changes: 2 additions & 30 deletions SemiPlot/SemiPlot.Tests.Unit/UI/Chart/AxisScalePanelViewTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using Avalonia.Headless.XUnit;
using Avalonia.Input;
using Avalonia.Threading;
using Avalonia.VisualTree;

using AwesomeAssertions;

Expand All @@ -16,6 +15,7 @@

using Xunit;

using static SemiPlot.Tests.Unit.UI.Chart.AxisScalePanelDriver;
using static SemiPlot.Tests.Unit.UI.Chart.ChartViewTestBuilder;

namespace SemiPlot.Tests.Unit.UI.Chart;
Expand Down Expand Up @@ -326,7 +326,7 @@ public void TheLogarithmicBox_SwitchesTheAxisAndKeepsThePanelOpenAtItsSize()
var box = panel.FindControl<CheckBox>("AxisScaleLogarithmic")!;
var panelSize = panel.Bounds.Size;
var presenterSize = PresenterOf(panel).Bounds.Size;
box.Content.Should().Be(Resources.AxisScaleLogarithmic);
box.Content.Should().Be(Resources.PenFormLogarithmic);
box.IsChecked.Should().BeFalse();

HeadlessInput.Click(shown.Window, box);
Expand Down Expand Up @@ -393,16 +393,6 @@ public void TheMessageLine_KeepsThePanelsSize_EmptyWithAOneLineRuleAndWithTheLog
logRuleSizes.Should().Be(emptySizes);
}

private static (Flyout Flyout, AxisScalePanel Panel) OpenPanel(TrendChartViewModel viewModel, ShownChart shown)
{
HeadlessInput.Click(shown.Window, shown.PlotControl, AxisRegionPoint(viewModel));
Dispatcher.UIThread.RunJobs();

var flyout = (Flyout)FlyoutBase.GetAttachedFlyout(shown.PlotControl)!;

return (flyout, (AxisScalePanel)flyout.Content!);
}

private static void ClickOutsideThePanel(ShownChart shown)
{
HeadlessInput.Click(shown.Window, shown.PlotControl, new Point(shown.PlotControl.Bounds.Width - 20.0, 20.0));
Expand All @@ -414,22 +404,4 @@ private static void PressThePanelsEmptyArea(ShownChart shown, AxisScalePanel pan

HeadlessInput.Click(shown.Window, panel, new Point(panel.Bounds.Width - 4.0, boundsTop - 5.0));
}

private static FlyoutPresenter PresenterOf(AxisScalePanel panel)
{
return panel.GetVisualAncestors().OfType<FlyoutPresenter>().First();
}

private static (Size Panel, Size Message, Size Presenter) SizesOf(AxisScalePanel panel, TextBlock message)
{
return (panel.Bounds.Size, message.Bounds.Size, PresenterOf(panel).Bounds.Size);
}

private static void TypeInto(Window window, AxisScalePanel panel, string fieldName, string text)
{
var field = panel.FindControl<TextBox>(fieldName)!;

HeadlessInput.Clear(window, field);
HeadlessInput.Type(window, field, text);
}
}
10 changes: 5 additions & 5 deletions SemiPlot/SemiPlot.Tests.Unit/UI/InterMeasure.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ public static SKFont InterFont(SKTypeface typeface, double fontSize)
return new SKFont(typeface, (float)fontSize) { LinearMetrics = true, Subpixel = true };
}

/// <summary>The header's width with its text measured in Inter, its padding and sort slot as realised.</summary>
public static double HeaderWidthInInter(Window window, DataGridColumnHeader header, SKTypeface semiBold)
/// <summary>The control's width with its text content measured in Inter, its chrome as realised.</summary>
public static double ContentWidthInInter(Window window, ContentControl control, SKTypeface typeface)
{
var text = ViewProbe.Descendants<TextBlock>(header).Single(block => Equals(block.Text, header.Content));
var chrome = ViewProbe.UnconstrainedWidthOf(window, header) - ViewProbe.UnconstrainedWidthOf(window, text);
using var font = InterFont(semiBold, header.FontSize);
var text = ViewProbe.Descendants<TextBlock>(control).Single(block => Equals(block.Text, control.Content));
var chrome = ViewProbe.UnconstrainedWidthOf(window, control) - ViewProbe.UnconstrainedWidthOf(window, text);
using var font = InterFont(typeface, text.FontSize);

return chrome + font.MeasureText(text.Text);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,8 @@ public void TheGroupColumns_LeaveTheNameAtLeast100PxInInter(string culture)
var viewport = ViewportOf(list);
var membership = list.Columns[0].ActualWidth;
var actions = Math.Max(
ActionsOpeningWidth, HeaderWidthInInter(window, HeaderOf(list, Resources.PenGroupsColumnActions), semiBold));
var groupHeader = HeaderWidthInInter(window, HeaderOf(list, Resources.PenGroupsColumnGroup), semiBold);
ActionsOpeningWidth, ContentWidthInInter(window, HeaderOf(list, Resources.PenGroupsColumnActions), semiBold));
var groupHeader = ContentWidthInInter(window, HeaderOf(list, Resources.PenGroupsColumnGroup), semiBold);
var groupColumn = viewport - membership - actions;
var name = groupColumn - NameInsets - CountGap - countFont.MeasureText("999");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public void AtTheOpeningWidth_EveryPenListColumnFitsTheViewportInInter(string cu
var widths = list.Columns
.Select((column, index) =>
{
var headerWidth = HeaderWidthInInter(window, HeaderOf(list, (string)column.Header!), semiBold);
var headerWidth = ContentWidthInInter(window, HeaderOf(list, (string)column.Header!), semiBold);

return HeaderMeasuredColumns.GetIsFill(column) ? headerWidth : Math.Max(declaredWidths[index], headerWidth);
})
Expand Down
36 changes: 29 additions & 7 deletions SemiPlot/SemiPlot.UI/Chart/AxisScalePanel.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
</UserControl.KeyBindings>

<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto"
RowSpacing="10">
RowSpacing="10"
Grid.IsSharedSizeScope="True">

<Grid Grid.Row="0"
ColumnDefinitions="Auto,*"
Expand All @@ -40,10 +41,15 @@

<Grid Grid.Row="1"
Name="AxisScaleBounds"
Classes="invalid-glyph"
RowDefinitions="Auto,Auto"
ColumnDefinitions="Auto,*"
ColumnSpacing="14"
RowSpacing="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"
SharedSizeGroup="AxisScaleLabel" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<TextBlock Grid.Row="0"
Grid.Column="0"
Expand Down Expand Up @@ -83,11 +89,27 @@

</Grid>

<CheckBox Grid.Row="2"
Name="AxisScaleLogarithmic"
Content="{x:Static text:Resources.AxisScaleLogarithmic}"
IsChecked="{Binding IsLogarithmic, Mode=OneWay}"
Command="{Binding ToggleLogarithmicCommand}" />
<Grid Grid.Row="2"
Name="AxisScaleType"
ColumnSpacing="14">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"
SharedSizeGroup="AxisScaleLabel" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<TextBlock Grid.Column="0"
Name="AxisScaleTypeLabel"
VerticalAlignment="Center"
Text="{x:Static text:Resources.PenFormScaleTypeLabel}" />

<CheckBox Grid.Column="1"
Name="AxisScaleLogarithmic"
HorizontalAlignment="Left"
Content="{x:Static text:Resources.PenFormLogarithmic}"
IsChecked="{Binding IsLogarithmic, Mode=OneWay}"
Command="{Binding ToggleLogarithmicCommand}" />
</Grid>

<Grid Grid.Row="3"
RowDefinitions="Auto,Auto"
Expand Down
Loading
Loading