Skip to content

Commit 4f25bf1

Browse files
michael-hawkermichael-hawker
committed
Apply PR Feedback for WrapPanel unit tests
1 parent 8976135 commit 4f25bf1

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_BasicLayout.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
5555
// Force Layout calculations
5656
panel.UpdateLayout();
5757

58-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
58+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
5959

6060
Assert.AreEqual(3, panel.Children.Count);
6161

6262
// Check all children are in expected places.
63-
for (int i = 0; i < children.Count(); i++)
63+
for (int i = 0; i < children.Length; i++)
6464
{
6565
var transform = treeRoot.CoordinatesTo(children[i]);
6666
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -108,12 +108,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
108108
// Force Layout calculations
109109
panel.UpdateLayout();
110110

111-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
111+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
112112

113113
Assert.AreEqual(3, panel.Children.Count);
114114

115115
// Check all children are in expected places.
116-
for (int i = 0; i < children.Count(); i++)
116+
for (int i = 0; i < children.Length; i++)
117117
{
118118
var transform = treeRoot.CoordinatesTo(children[i]);
119119
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -161,12 +161,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
161161
// Force Layout calculations
162162
panel.UpdateLayout();
163163

164-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
164+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
165165

166166
Assert.AreEqual(3, panel.Children.Count);
167167

168168
// Check all children are in expected places.
169-
for (int i = 0; i < children.Count(); i++)
169+
for (int i = 0; i < children.Length; i++)
170170
{
171171
var transform = treeRoot.CoordinatesTo(children[i]);
172172
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -214,12 +214,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
214214
// Force Layout calculations
215215
panel.UpdateLayout();
216216

217-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
217+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
218218

219219
Assert.AreEqual(3, panel.Children.Count);
220220

221221
// Check all children are in expected places.
222-
for (int i = 0; i < children.Count(); i++)
222+
for (int i = 0; i < children.Length; i++)
223223
{
224224
var transform = treeRoot.CoordinatesTo(children[i]);
225225
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -267,12 +267,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
267267
// Force Layout calculations
268268
panel.UpdateLayout();
269269

270-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
270+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
271271

272272
Assert.AreEqual(3, panel.Children.Count);
273273

274274
// Check all children are in expected places.
275-
for (int i = 0; i < children.Count(); i++)
275+
for (int i = 0; i < children.Length; i++)
276276
{
277277
var transform = treeRoot.CoordinatesTo(children[i]);
278278
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -320,12 +320,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
320320
// Force Layout calculations
321321
panel.UpdateLayout();
322322

323-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
323+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
324324

325325
Assert.AreEqual(3, panel.Children.Count);
326326

327327
// Check all children are in expected places.
328-
for (int i = 0; i < children.Count(); i++)
328+
for (int i = 0; i < children.Length; i++)
329329
{
330330
var transform = treeRoot.CoordinatesTo(children[i]);
331331
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");

‎UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_Visibility.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
5757
// Force Layout calculations
5858
panel.UpdateLayout();
5959

60-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
60+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
6161

6262
Assert.AreEqual(4, panel.Children.Count);
6363

6464
// Check all children are in expected places.
65-
for (int i = 0; i < children.Count(); i++)
65+
for (int i = 0; i < children.Length; i++)
6666
{
6767
var transform = treeRoot.CoordinatesTo(children[i]);
6868
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -114,12 +114,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
114114
// Force Layout calculations
115115
panel.UpdateLayout();
116116

117-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
117+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
118118

119119
Assert.AreEqual(4, panel.Children.Count);
120120

121121
// Check all children are in expected places.
122-
for (int i = 0; i < children.Count(); i++)
122+
for (int i = 0; i < children.Length; i++)
123123
{
124124
var transform = treeRoot.CoordinatesTo(children[i]);
125125
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");
@@ -169,12 +169,12 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
169169
// Force Layout calculations
170170
panel.UpdateLayout();
171171

172-
var children = panel.Children.Select(item => item as FrameworkElement).ToArray();
172+
var children = panel.Children.Cast<FrameworkElement>().ToArray();
173173

174174
Assert.AreEqual(4, panel.Children.Count);
175175

176176
// Check all children are in expected places.
177-
for (int i = 0; i < children.Count(); i++)
177+
for (int i = 0; i < children.Length; i++)
178178
{
179179
var transform = treeRoot.CoordinatesTo(children[i]);
180180
Assert.AreEqual(expected[i].u, transform.X, $"Child {i} not in expected X location.");

0 commit comments

Comments
 (0)