Skip to content

Commit 6573d21

Browse files
nickprotopnickprotop
committed
Fix type alias conflicts in test files
1 parent 76a1361 commit 6573d21

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎SharpConsoleUI.Tests/Controls/DropdownPortalTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
using SharpConsoleUI.Layout;
1313
using SharpConsoleUI.Tests.Infrastructure;
1414
using Xunit;
15-
using Size = SharpConsoleUI.Helpers.Size;
1615
using Color = SharpConsoleUI.Color;
16+
using Size = System.Drawing.Size;
1717

1818
namespace SharpConsoleUI.Tests.Controls;
1919

‎SharpConsoleUI.Tests/Rendering/Unit/TopLayer/NestedContainerLayoutTests.cs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using SharpConsoleUI.Layout;
1313
using SharpConsoleUI.Tests.Infrastructure;
1414
using Xunit;
15-
using Controls = SharpConsoleUI.Builders.Controls;
15+
using ControlsFactory = SharpConsoleUI.Builders.Controls;
1616

1717
namespace SharpConsoleUI.Tests.Rendering.Unit.TopLayer;
1818

@@ -50,7 +50,7 @@ public void HorizontalGrid_TwoFixedColumns_RenderCorrectly()
5050
var label1 = new MarkupControl(new List<string> { "Left" });
5151
var label2 = new MarkupControl(new List<string> { "Right" });
5252

53-
var grid = Controls.HorizontalGrid()
53+
var grid = ControlsFactory.HorizontalGrid()
5454
.Column(c => c.Width(30).Add(label1))
5555
.Column(c => c.Width(30).Add(label2))
5656
.Build();
@@ -70,7 +70,7 @@ public void HorizontalGrid_FixedAndFlex_FlexFillsRemaining()
7070
var label1 = new MarkupControl(new List<string> { "Fixed" });
7171
var label2 = new MarkupControl(new List<string> { "Flex" });
7272

73-
var grid = Controls.HorizontalGrid()
73+
var grid = ControlsFactory.HorizontalGrid()
7474
.Column(c => c.Width(20).Add(label1))
7575
.Column(c => c.Flex().Add(label2))
7676
.Build();
@@ -90,7 +90,7 @@ public void HorizontalGrid_WithSplitter_RendersSplitter()
9090
var label1 = new MarkupControl(new List<string> { "Col1" });
9191
var label2 = new MarkupControl(new List<string> { "Col2" });
9292

93-
var grid = Controls.HorizontalGrid()
93+
var grid = ControlsFactory.HorizontalGrid()
9494
.Column(c => c.Width(40).Add(label1))
9595
.Column(c => c.Flex().Add(label2))
9696
.WithSplitterAfter(0)
@@ -108,7 +108,7 @@ public void HorizontalGrid_ThreeColumns_AllRender()
108108
{
109109
var (system, window) = CreateTestEnv();
110110

111-
var grid = Controls.HorizontalGrid()
111+
var grid = ControlsFactory.HorizontalGrid()
112112
.Column(c => c.Width(20).Add(new MarkupControl(new List<string> { "A" })))
113113
.Column(c => c.Width(20).Add(new MarkupControl(new List<string> { "B" })))
114114
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "C" })))
@@ -130,14 +130,14 @@ public void ScrollablePanel_InGridColumn_Renders()
130130
{
131131
var (system, window) = CreateTestEnv();
132132

133-
var panel = Controls.ScrollablePanel()
133+
var panel = ControlsFactory.ScrollablePanel()
134134
.AddControl(new MarkupControl(new List<string> { "Inside panel" }))
135135
.WithVerticalAlignment(VerticalAlignment.Fill)
136136
.Build();
137137

138138
var label = new MarkupControl(new List<string> { "Right side" });
139139

140-
var grid = Controls.HorizontalGrid()
140+
var grid = ControlsFactory.HorizontalGrid()
141141
.Column(c => c.Width(40).Add(panel))
142142
.Column(c => c.Flex().Add(label))
143143
.Build();
@@ -154,17 +154,17 @@ public void ScrollablePanel_BothColumns_Renders()
154154
{
155155
var (system, window) = CreateTestEnv();
156156

157-
var leftPanel = Controls.ScrollablePanel()
157+
var leftPanel = ControlsFactory.ScrollablePanel()
158158
.AddControl(new MarkupControl(new List<string> { "Left content" }))
159159
.WithVerticalAlignment(VerticalAlignment.Fill)
160160
.Build();
161161

162-
var rightPanel = Controls.ScrollablePanel()
162+
var rightPanel = ControlsFactory.ScrollablePanel()
163163
.AddControl(new MarkupControl(new List<string> { "Right content" }))
164164
.WithVerticalAlignment(VerticalAlignment.Fill)
165165
.Build();
166166

167-
var grid = Controls.HorizontalGrid()
167+
var grid = ControlsFactory.HorizontalGrid()
168168
.Column(c => c.Width(45).Add(leftPanel))
169169
.Column(c => c.Flex().Add(rightPanel))
170170
.WithSplitterAfter(0)
@@ -182,14 +182,14 @@ public void ScrollablePanel_WithManyItems_InGrid_Scrollable()
182182
{
183183
var (system, window) = CreateTestEnv();
184184

185-
var panel = Controls.ScrollablePanel()
185+
var panel = ControlsFactory.ScrollablePanel()
186186
.WithVerticalAlignment(VerticalAlignment.Fill)
187187
.Build();
188188

189189
for (int i = 0; i < 50; i++)
190190
panel.AddControl(new MarkupControl(new List<string> { $"Line {i}" }));
191191

192-
var grid = Controls.HorizontalGrid()
192+
var grid = ControlsFactory.HorizontalGrid()
193193
.Column(c => c.Width(40).Add(panel))
194194
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Static" })))
195195
.Build();
@@ -212,13 +212,13 @@ public void Dropdown_InScrollablePanel_InGrid_Renders()
212212

213213
var dd = new DropdownControl("Pick:", new[] { "A", "B", "C" });
214214

215-
var panel = Controls.ScrollablePanel()
215+
var panel = ControlsFactory.ScrollablePanel()
216216
.AddControl(new MarkupControl(new List<string> { "Label:" }))
217217
.AddControl(dd)
218218
.WithVerticalAlignment(VerticalAlignment.Fill)
219219
.Build();
220220

221-
var grid = Controls.HorizontalGrid()
221+
var grid = ControlsFactory.HorizontalGrid()
222222
.Column(c => c.Width(45).Add(panel))
223223
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Right" })))
224224
.Build();
@@ -240,12 +240,12 @@ public void Dropdown_InGrid_PortalOpensCorrectly()
240240

241241
var dd = new DropdownControl("S:", new[] { "Alpha", "Beta", "Gamma", "Delta", "Epsilon" });
242242

243-
var panel = Controls.ScrollablePanel()
243+
var panel = ControlsFactory.ScrollablePanel()
244244
.AddControl(dd)
245245
.WithVerticalAlignment(VerticalAlignment.Fill)
246246
.Build();
247247

248-
var grid = Controls.HorizontalGrid()
248+
var grid = ControlsFactory.HorizontalGrid()
249249
.Column(c => c.Width(45).Add(panel))
250250
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Side" })))
251251
.Build();
@@ -271,13 +271,13 @@ public void MultipleDropdowns_InGrid_IndependentSelection()
271271
var dd1 = new DropdownControl("D1:", new[] { "X", "Y" });
272272
var dd2 = new DropdownControl("D2:", new[] { "A", "B" });
273273

274-
var panel = Controls.ScrollablePanel()
274+
var panel = ControlsFactory.ScrollablePanel()
275275
.AddControl(dd1)
276276
.AddControl(dd2)
277277
.WithVerticalAlignment(VerticalAlignment.Fill)
278278
.Build();
279279

280-
var grid = Controls.HorizontalGrid()
280+
var grid = ControlsFactory.HorizontalGrid()
281281
.Column(c => c.Width(45).Add(panel))
282282
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Side" })))
283283
.Build();
@@ -306,12 +306,12 @@ public void DatePicker_InScrollablePanel_InGrid_Renders()
306306
var dp = new DatePickerControl("Due:");
307307
dp.SelectedDate = new DateTime(2026, 3, 15);
308308

309-
var panel = Controls.ScrollablePanel()
309+
var panel = ControlsFactory.ScrollablePanel()
310310
.AddControl(dp)
311311
.WithVerticalAlignment(VerticalAlignment.Fill)
312312
.Build();
313313

314-
var grid = Controls.HorizontalGrid()
314+
var grid = ControlsFactory.HorizontalGrid()
315315
.Column(c => c.Width(45).Add(panel))
316316
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Right" })))
317317
.Build();
@@ -331,15 +331,15 @@ public void MixedControls_InSingleColumn_AllRender()
331331
{
332332
var (system, window) = CreateTestEnv();
333333

334-
var panel = Controls.ScrollablePanel()
334+
var panel = ControlsFactory.ScrollablePanel()
335335
.AddControl(new MarkupControl(new List<string> { "[bold]Header[/]" }))
336336
.AddControl(new DropdownControl("Pick:", new[] { "Opt1", "Opt2" }))
337337
.AddControl(new ButtonControl { Text = "Submit" })
338338
.AddControl(new MarkupControl(new List<string> { "Footer" }))
339339
.WithVerticalAlignment(VerticalAlignment.Fill)
340340
.Build();
341341

342-
var grid = Controls.HorizontalGrid()
342+
var grid = ControlsFactory.HorizontalGrid()
343343
.Column(c => c.Width(45).Add(panel))
344344
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Info" })))
345345
.WithSplitterAfter(0)
@@ -360,7 +360,7 @@ public void ListControl_InGridColumn_Renders()
360360
var list = new ListControl(new[] { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" });
361361
list.VerticalAlignment = VerticalAlignment.Fill;
362362

363-
var grid = Controls.HorizontalGrid()
363+
var grid = ControlsFactory.HorizontalGrid()
364364
.Column(c => c.Width(30).Add(list))
365365
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Details" })))
366366
.Build();
@@ -381,14 +381,14 @@ public void HorizontalGrid_InsideScrollablePanel_Renders()
381381
{
382382
var (system, window) = CreateTestEnv();
383383

384-
var grid = Controls.HorizontalGrid()
384+
var grid = ControlsFactory.HorizontalGrid()
385385
.Column(c => c.Width(30).Add(new MarkupControl(new List<string> { "Left" })))
386386
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Right" })))
387387
.WithAlignment(HorizontalAlignment.Stretch)
388388
.WithVerticalAlignment(VerticalAlignment.Fill)
389389
.Build();
390390

391-
var panel = Controls.ScrollablePanel()
391+
var panel = ControlsFactory.ScrollablePanel()
392392
.AddControl(grid)
393393
.WithVerticalAlignment(VerticalAlignment.Fill)
394394
.Build();
@@ -422,7 +422,7 @@ public void NarrowColumn_ControlTruncates()
422422
{
423423
var (system, window) = CreateTestEnv();
424424

425-
var grid = Controls.HorizontalGrid()
425+
var grid = ControlsFactory.HorizontalGrid()
426426
.Column(c => c.Width(5).Add(new MarkupControl(new List<string> { "Very Long Text Here" })))
427427
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Right" })))
428428
.Build();
@@ -443,12 +443,12 @@ public void Grid_ColumnWithFill_ExpandsVertically()
443443
{
444444
var (system, window) = CreateTestEnv();
445445

446-
var panel = Controls.ScrollablePanel()
446+
var panel = ControlsFactory.ScrollablePanel()
447447
.AddControl(new MarkupControl(new List<string> { "Content" }))
448448
.WithVerticalAlignment(VerticalAlignment.Fill)
449449
.Build();
450450

451-
var grid = Controls.HorizontalGrid()
451+
var grid = ControlsFactory.HorizontalGrid()
452452
.Column(c => c.Width(40).Add(panel))
453453
.Column(c => c.Flex().Add(new MarkupControl(new List<string> { "Side" })))
454454
.WithVerticalAlignment(VerticalAlignment.Fill)
@@ -473,7 +473,7 @@ public void Dropdown_WithMargin_InPanel_RespectsBounds()
473473
var dd = new DropdownControl("S:", new[] { "A", "B" });
474474
dd.Margin = new Margin(2, 1, 2, 1);
475475

476-
var panel = Controls.ScrollablePanel()
476+
var panel = ControlsFactory.ScrollablePanel()
477477
.AddControl(dd)
478478
.WithVerticalAlignment(VerticalAlignment.Fill)
479479
.Build();
@@ -513,7 +513,7 @@ public void FocusableControls_InGrid_BothFocusable()
513513
var dd1 = new DropdownControl("D1:", new[] { "A", "B" });
514514
var dd2 = new DropdownControl("D2:", new[] { "X", "Y" });
515515

516-
var grid = Controls.HorizontalGrid()
516+
var grid = ControlsFactory.HorizontalGrid()
517517
.Column(c => c.Width(40).Add(dd1))
518518
.Column(c => c.Flex().Add(dd2))
519519
.Build();

0 commit comments

Comments
 (0)