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

Remove now-unnecessary casts.

pull/11495/head
Steven Kirk 3 years ago
parent
146ebd201d
commit
0cb590e03b
9 changed files with 47 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
  2. 2
      tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs
  3. 2
      tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
  4. 2
      tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
  5. 16
      tests/Avalonia.Controls.UnitTests/TabControlTests.cs
  6. 8
      tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
  7. 12
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
  8. 14
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
  9. 2
      tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs

36
tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
View File

@ -24,9 +24,9 @@ namespace Avalonia.Controls.UnitTests
target.Content = "Foo";
target.Template = GetTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var child = ((Visual)target).VisualChildren.Single();
var child = target.VisualChildren.Single();
Assert.IsType<Border>(child);
child = child.VisualChildren.Single();
Assert.IsType<ContentPresenter>(child);
@ -55,7 +55,7 @@ namespace Avalonia.Controls.UnitTests
root.Child = target;
target.ApplyTemplate();
((Control)target.Presenter).ApplyTemplate();
target.Presenter.ApplyTemplate();
foreach (Control child in target.GetTemplateChildren())
Assert.Equal("foo", child.Tag);
@ -70,7 +70,7 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = child;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var contentPresenter = child.GetVisualParent<ContentPresenter>();
Assert.Equal(target, contentPresenter.TemplatedParent);
@ -85,7 +85,7 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = child;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Null(child.TemplatedParent);
}
@ -117,7 +117,7 @@ namespace Avalonia.Controls.UnitTests
var child = new Control();
target.Content = child;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(child.Parent, target);
Assert.Equal(child.GetLogicalParent(), target);
@ -135,7 +135,7 @@ namespace Avalonia.Controls.UnitTests
target.Content = "Foo";
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var child = target.Presenter.Child;
@ -152,7 +152,7 @@ namespace Avalonia.Controls.UnitTests
target.Content = "Foo";
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var child = target.Presenter.Child;
@ -192,7 +192,7 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = child;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.True(called);
}
@ -207,12 +207,12 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = child;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
((ILogical)target).LogicalChildren.CollectionChanged += (s, e) => called = true;
target.Content = null;
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.True(called);
}
@ -228,12 +228,12 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = child1;
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
((ILogical)target).LogicalChildren.CollectionChanged += (s, e) => called = true;
target.Content = child2;
((Control)target.Presenter).ApplyTemplate();
target.Presenter.ApplyTemplate();
Assert.True(called);
}
@ -245,13 +245,13 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
target.Content = "Foo";
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal("Foo", ((TextBlock)target.Presenter.Child).Text);
target.Content = "Bar";
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal("Bar", ((TextBlock)target.Presenter.Child).Text);
}
@ -263,7 +263,7 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = "Foo";
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal("Foo", target.Presenter.Child.DataContext);
}
@ -276,7 +276,7 @@ namespace Avalonia.Controls.UnitTests
target.Template = GetTemplate();
target.Content = new TextBlock();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Null(target.Presenter.Child.DataContext);
}

2
tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs
View File

@ -34,7 +34,7 @@ namespace Avalonia.Controls.UnitTests
target.Header = "Foo";
target.ApplyTemplate();
((ContentPresenter)target.HeaderPresenter).UpdateChild();
target.HeaderPresenter.UpdateChild();
var child = target.HeaderPresenter.Child;

2
tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
View File

@ -305,7 +305,7 @@ namespace Avalonia.Controls.UnitTests
scrollViewer.ApplyTemplate();
// Then make the ScrollViewer create its child.
((ContentPresenter)scrollViewer.Presenter).UpdateChild();
scrollViewer.Presenter.UpdateChild();
// Now the ItemsPresenter should be reigstered, so apply its template.
target.Presenter.ApplyTemplate();

2
tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
View File

@ -391,7 +391,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
templatedParent.ApplyTemplate();
return ((ContentPresenter)templatedParent.Presenter, templatedParent);
return (templatedParent.Presenter, templatedParent);
}
private class TestContentControl : ContentControl, IContentPresenterHost

16
tests/Avalonia.Controls.UnitTests/TabControlTests.cs
View File

@ -272,28 +272,28 @@ namespace Avalonia.Controls.UnitTests
ApplyTemplate(target);
((ContentPresenter)target.ContentPart).UpdateChild();
target.ContentPart.UpdateChild();
var dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
Assert.Equal(items[0], dataContext);
target.SelectedIndex = 1;
((ContentPresenter)target.ContentPart).UpdateChild();
target.ContentPart.UpdateChild();
dataContext = ((Button)target.ContentPart.Child).DataContext;
Assert.Equal(items[1], dataContext);
target.SelectedIndex = 2;
((ContentPresenter)target.ContentPart).UpdateChild();
target.ContentPart.UpdateChild();
dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
Assert.Equal("Base", dataContext);
target.SelectedIndex = 3;
((ContentPresenter)target.ContentPart).UpdateChild();
target.ContentPart.UpdateChild();
dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
Assert.Equal("Qux", dataContext);
target.SelectedIndex = 4;
((ContentPresenter)target.ContentPart).UpdateChild();
dataContext = ((Control)target.ContentPart).DataContext;
target.ContentPart.UpdateChild();
dataContext = target.ContentPart.DataContext;
Assert.Equal("Base", dataContext);
}
@ -367,7 +367,7 @@ namespace Avalonia.Controls.UnitTests
var root = new TestRoot(target);
ApplyTemplate(target);
((ContentPresenter)target.ContentPart).UpdateChild();
target.ContentPart.UpdateChild();
var content = Assert.IsType<TextBlock>(target.ContentPart.Child);
Assert.Equal("bar", content.Tag);
@ -608,7 +608,7 @@ namespace Avalonia.Controls.UnitTests
tabItem.ApplyTemplate();
((ContentPresenter)tabItem.Presenter).UpdateChild();
tabItem.Presenter.UpdateChild();
}
target.ContentPart.ApplyTemplate();

8
tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
View File

@ -472,7 +472,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
}
@ -694,7 +694,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
}
@ -727,7 +727,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
}
@ -760,7 +760,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(dataContext.StringProperty, ((TextBlock)target.Presenter.Child).Text);
}

12
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
View File

@ -74,7 +74,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal(Brushes.Red, presenter.Background);
var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
@ -108,7 +108,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal(Brushes.Red, presenter.Background);
var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
@ -139,7 +139,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal(Dock.Top, DockPanel.GetDock(presenter));
var diagnostic = presenter.GetDiagnostic(DockPanel.DockProperty);
@ -173,7 +173,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal(Brushes.Red, presenter.Background);
var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
@ -207,7 +207,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal(Brushes.Red, presenter.Background);
var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
@ -238,7 +238,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
button.ApplyTemplate();
var presenter = (ContentPresenter)button.Presenter;
var presenter = button.Presenter;
Assert.Equal("Foo", presenter.Content);
var diagnostic = presenter.GetDiagnostic(ContentPresenter.ContentProperty);

14
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
View File

@ -32,7 +32,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Null(target.Presenter.Child);
}
@ -59,7 +59,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.IsType<Canvas>(target.Presenter.Child);
}
@ -117,7 +117,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.Equal(typeof(string), template.DataType);
Assert.IsType<Canvas>(target.Presenter.Child);
@ -145,7 +145,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
Assert.IsType<Canvas>(target.Presenter.Child);
}
@ -175,7 +175,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var dataTemplate = (CustomDataTemplate)target.ContentTemplate;
Assert.Null(dataTemplate.FancyDataType);
@ -217,11 +217,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
window.ApplyTemplate();
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var canvas = (Canvas)target.Presenter.Child;
Assert.Same(viewModel, target.DataContext);
Assert.Same(viewModel.Child, ((Control)target.Presenter).DataContext);
Assert.Same(viewModel.Child, target.Presenter.DataContext);
Assert.Same(viewModel.Child.Child, canvas.DataContext);
}
}

2
tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
View File

@ -22,7 +22,7 @@ namespace Avalonia.ReactiveUI.UnitTests
Content = "Foo"
};
target.ApplyTemplate();
((ContentPresenter)target.Presenter).UpdateChild();
target.Presenter.UpdateChild();
var child = ((Visual)target).GetVisualChildren().Single();
Assert.IsType<Border>(child);

Write Preview
Loading…
Cancel
Save