Skip to content

Commit 8e256ff

Browse files
linkdotnetlinkdotnet
committed
refactor: All rendering methods are surfaced as "Render"
1 parent 67d51f3 commit 8e256ff

File tree

102 files changed

+461
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+461
-488
lines changed

‎MIGRATION.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ The `AddTestAuthorization` method on `TestContext` has been renamed to `AddAutho
4242

4343
## Merged `TestContext` and `TestContextBase`
4444
The `TestContext` and `TestContextBase` classes have been merged into a single `TestContext` class. All references to `TestContextBase` should replace them with `TestContext` to migrate.
45+
46+
## Renamed all `RenderComponent` and `SetParametersAndRender` to `Render`
47+
To make the API more consistent, `RenderComponent` and `SetParametersAndRender` methods have been renamed to `Render`.

‎bunit.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Global
6969
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7070
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
7171
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Release|Any CPU.Build.0 = Release|Any CPU
72+
{1DA6EFDE-81A1-4324-A56C-40BEE14A75BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
7273
{6127D121-9387-451B-B15D-8350A32D3001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7374
{6127D121-9387-451B-B15D-8350A32D3001}.Release|Any CPU.ActiveCfg = Release|Any CPU
7475
{7972A80F-30DC-4EF4-9294-7D4DD2965882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

‎docs/samples/tests/mstest/HelloWorldExplicitContextTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void HelloWorldComponentRendersCorrectly()
1313
using var ctx = new Bunit.TestContext();
1414

1515
// Act
16-
var cut = ctx.RenderComponent<HelloWorld>();
16+
var cut = ctx.Render<HelloWorld>();
1717

1818
// Assert
1919
cut.MarkupMatches("<h1>Hello world from Blazor</h1>");

‎docs/samples/tests/mstest/HelloWorldTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class HelloWorldTest : BunitTestContext
1010
public void HelloWorldComponentRendersCorrectly()
1111
{
1212
// Act
13-
var cut = RenderComponent<HelloWorld>();
13+
var cut = Render<HelloWorld>();
1414

1515
// Assert
1616
cut.MarkupMatches("<h1>Hello world from Blazor</h1>");

‎docs/samples/tests/nunit/HelloWorldExplicitContextTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void HelloWorldComponentRendersCorrectly()
1212
using var ctx = new Bunit.TestContext();
1313

1414
// Act
15-
var cut = ctx.RenderComponent<HelloWorld>();
15+
var cut = ctx.Render<HelloWorld>();
1616

1717
// Assert
1818
cut.MarkupMatches("<h1>Hello world from Blazor</h1>");

‎docs/samples/tests/nunit/HelloWorldInstancePerTestCase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class HelloWorldInstancePerTestCase : Bunit.TestContext
99
public void HelloWorldComponentRendersCorrectly()
1010
{
1111
// Act
12-
var cut = RenderComponent<HelloWorld>();
12+
var cut = Render<HelloWorld>();
1313

1414
// Assert
1515
cut.MarkupMatches("<h1>Hello world from Blazor</h1>");

‎docs/samples/tests/nunit/HelloWorldTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class HelloWorldTest : BunitTestContext
99
public void HelloWorldComponentRendersCorrectly()
1010
{
1111
// Act
12-
var cut = RenderComponent<HelloWorld>();
12+
var cut = Render<HelloWorld>();
1313

1414
// Assert
1515
cut.MarkupMatches("<h1>Hello world from Blazor</h1>");

‎docs/samples/tests/xunit/AllKindsOfParamsTest.cs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ public class AllKindsOfParamsTest : TestContext
1414
public void NonBlazorParamTypes()
1515
{
1616
// Using C# tuple with hardcoded name
17-
var cut1 = RenderComponent<NonBlazorTypesParams>(
17+
var cut1 = Render<NonBlazorTypesParams>(
1818
("Numbers", 42),
1919
("Lines", new List<string> { "Hello", "World" })
2020
);
2121

2222
// Using C# tuple with refactor safe name
23-
var cut2 = RenderComponent<NonBlazorTypesParams>(
23+
var cut2 = Render<NonBlazorTypesParams>(
2424
(nameof(NonBlazorTypesParams.Numbers), 42),
2525
(nameof(NonBlazorTypesParams.Lines), new List<string> { "Hello", "World" })
2626
);
2727

2828
// Using factory method
29-
var cut3 = RenderComponent<NonBlazorTypesParams>(
29+
var cut3 = Render<NonBlazorTypesParams>(
3030
Parameter("Numbers", 42),
3131
Parameter("Lines", new List<string> { "Hello", "World" })
3232
);
3333

3434
// Using parameter builder
35-
var cut4 = RenderComponent<NonBlazorTypesParams>(parameters => parameters
35+
var cut4 = Render<NonBlazorTypesParams>(parameters => parameters
3636
.Add(p => p.Numbers, 42)
3737
.Add(p => p.Lines, new List<string> { "Hello", "World" })
3838
);
@@ -43,7 +43,7 @@ public void EventCallbackTypes()
4343
{
4444

4545
// Using factory method with hardcoded name
46-
var cut1 = RenderComponent<EventCallbackParams>(
46+
var cut1 = Render<EventCallbackParams>(
4747
EventCallback("OnClick", (MouseEventArgs args) =>
4848
{
4949
/* handle callback */
@@ -55,7 +55,7 @@ public void EventCallbackTypes()
5555
);
5656

5757
// Using factory method refactor safe name
58-
var cut2 = RenderComponent<EventCallbackParams>(
58+
var cut2 = Render<EventCallbackParams>(
5959
EventCallback(nameof(EventCallbackParams.OnClick), (MouseEventArgs args) =>
6060
{
6161
/* handle callback */
@@ -67,7 +67,7 @@ public void EventCallbackTypes()
6767
);
6868

6969
// Using parameter builder
70-
var cut3 = RenderComponent<EventCallbackParams>(parameters => parameters
70+
var cut3 = Render<EventCallbackParams>(parameters => parameters
7171
.Add(p => p.OnClick, args =>
7272
{
7373
/* handle callback */
@@ -83,12 +83,12 @@ public void EventCallbackTypes()
8383
public void HtmlAsChildContent()
8484
{
8585
// Using factory method
86-
var cut1 = RenderComponent<ChildContentParams>(
86+
var cut1 = Render<ChildContentParams>(
8787
ChildContent("<h1>Hello World</h1>")
8888
);
8989

9090
// Using parameter builder
91-
var cut2 = RenderComponent<ChildContentParams>(parameters => parameters
91+
var cut2 = Render<ChildContentParams>(parameters => parameters
9292
.AddChildContent("<h1>Hello World</h1>")
9393
);
9494
}
@@ -97,12 +97,12 @@ public void HtmlAsChildContent()
9797
public void ComponentAsChildContent()
9898
{
9999
// Using factory method
100-
var cut1 = RenderComponent<ChildContentParams>(
100+
var cut1 = Render<ChildContentParams>(
101101
ChildContent<Counter>()
102102
);
103103

104104
// Using parameter builder
105-
var cut2 = RenderComponent<ChildContentParams>(parameters => parameters
105+
var cut2 = Render<ChildContentParams>(parameters => parameters
106106
.AddChildContent<Counter>()
107107
);
108108
}
@@ -111,7 +111,7 @@ public void ComponentAsChildContent()
111111
public void ComponentWithParamsAsChildContent()
112112
{
113113
// Using factory method
114-
var cut1 = RenderComponent<ChildContentParams>(
114+
var cut1 = Render<ChildContentParams>(
115115
ChildContent<Alert>(
116116
("Heading", "Alert heading"),
117117
("Type", AlertType.Warning),
@@ -120,7 +120,7 @@ public void ComponentWithParamsAsChildContent()
120120
);
121121

122122
// Using parameter builder
123-
var cut2 = RenderComponent<ChildContentParams>(parameters => parameters
123+
var cut2 = Render<ChildContentParams>(parameters => parameters
124124
.AddChildContent<Alert>(alertParameters => alertParameters
125125
.Add(p => p.Heading, "Alert heading")
126126
.Add(p => p.Type, AlertType.Warning)
@@ -133,7 +133,7 @@ public void ComponentWithParamsAsChildContent()
133133
public void ComponentAndMarkupAsChildContent()
134134
{
135135
// Using factory method
136-
var cut1 = RenderComponent<ChildContentParams>(
136+
var cut1 = Render<ChildContentParams>(
137137
ChildContent("<h1>Below you will find a most interesting alert!</h1>"),
138138
ChildContent<Alert>(
139139
("Heading", "Alert heading"),
@@ -143,7 +143,7 @@ public void ComponentAndMarkupAsChildContent()
143143
);
144144

145145
// Using parameter builder
146-
var cut2 = RenderComponent<ChildContentParams>(parameters => parameters
146+
var cut2 = Render<ChildContentParams>(parameters => parameters
147147
.AddChildContent("<h1>Below you will find a most interesting alert!</h1>")
148148
.AddChildContent<Alert>(childParams => childParams
149149
.Add(p => p.Heading, "Alert heading")
@@ -157,12 +157,12 @@ public void ComponentAndMarkupAsChildContent()
157157
public void HtmlAsRenderFragment()
158158
{
159159
// Using factory method
160-
var cut1 = RenderComponent<RenderFragmentParams>(
160+
var cut1 = Render<RenderFragmentParams>(
161161
RenderFragment("Content", "<h1>Hello World</h1>")
162162
);
163163

164164
// Using parameter builder
165-
var cut2 = RenderComponent<RenderFragmentParams>(parameters => parameters
165+
var cut2 = Render<RenderFragmentParams>(parameters => parameters
166166
.Add(p => p.Content, "<h1>Hello World</h1>")
167167
);
168168
}
@@ -171,12 +171,12 @@ public void HtmlAsRenderFragment()
171171
public void ComponentAsRenderFragment()
172172
{
173173
// Using factory method
174-
var cut1 = RenderComponent<RenderFragmentParams>(
174+
var cut1 = Render<RenderFragmentParams>(
175175
RenderFragment<Counter>("Content")
176176
);
177177

178178
// Using parameter builder
179-
var cut2 = RenderComponent<RenderFragmentParams>(parameters => parameters
179+
var cut2 = Render<RenderFragmentParams>(parameters => parameters
180180
.Add<Counter>(p => p.Content)
181181
);
182182
}
@@ -185,7 +185,7 @@ public void ComponentAsRenderFragment()
185185
public void ComponentWithParamsAsRenderFragment()
186186
{
187187
// Using factory method
188-
var cut1 = RenderComponent<RenderFragmentParams>(
188+
var cut1 = Render<RenderFragmentParams>(
189189
RenderFragment<Alert>("Content",
190190
("Heading", "Alert heading"),
191191
("Type", AlertType.Warning),
@@ -194,7 +194,7 @@ public void ComponentWithParamsAsRenderFragment()
194194
);
195195

196196
// Using parameter builder
197-
var cut2 = RenderComponent<RenderFragmentParams>(parameters => parameters
197+
var cut2 = Render<RenderFragmentParams>(parameters => parameters
198198
.Add<Alert>(p => p.Content, alertParameters => alertParameters
199199
.Add(p => p.Heading, "Alert heading")
200200
.Add(p => p.Type, AlertType.Warning)
@@ -207,7 +207,7 @@ public void ComponentWithParamsAsRenderFragment()
207207
public void ComponentAndMarkupAsRenderFragment()
208208
{
209209
// Using factory method
210-
var cut1 = RenderComponent<RenderFragmentParams>(
210+
var cut1 = Render<RenderFragmentParams>(
211211
RenderFragment("Content", "<h1>Below you will find a most interesting alert!</h1>"),
212212
RenderFragment<Alert>("Content",
213213
("Heading", "Alert heading"),
@@ -217,7 +217,7 @@ public void ComponentAndMarkupAsRenderFragment()
217217
);
218218

219219
// Using parameter builder
220-
var cut2 = RenderComponent<RenderFragmentParams>(parameters => parameters
220+
var cut2 = Render<RenderFragmentParams>(parameters => parameters
221221
.Add(p => p.Content, "<h1>Below you will find a most interesting alert!</h1>")
222222
.Add<Alert>(p => p.Content, childParams => childParams
223223
.Add(p => p.Heading, "Alert heading")
@@ -231,13 +231,13 @@ public void ComponentAndMarkupAsRenderFragment()
231231
public void HtmlTemplateParams()
232232
{
233233
// Using factory method
234-
var cut1 = RenderComponent<TemplateParams<string>>(
234+
var cut1 = Render<TemplateParams<string>>(
235235
("Items", new string[] { "Foo", "Bar", "Baz" }),
236236
Template<string>("Template", item => $"<span>{item}</span>")
237237
);
238238

239239
// Using parameter builder
240-
var cut2 = RenderComponent<TemplateParams<string>>(parameters => parameters
240+
var cut2 = Render<TemplateParams<string>>(parameters => parameters
241241
.Add(p => p.Items, new[] { "Foo", "Bar", "Baz" })
242242
.Add(p => p.Template, item => $"<span>{item}</span>")
243243
);
@@ -247,7 +247,7 @@ public void HtmlTemplateParams()
247247
public void HtmlAndComponentTemplateParams()
248248
{
249249
// Using factory method
250-
var cut1 = RenderComponent<TemplateParams<string>>(
250+
var cut1 = Render<TemplateParams<string>>(
251251
("Items", new string[] { "Foo", "Bar", "Baz" }),
252252
Template<Item, string>("Template", value => new ComponentParameter[]
253253
{
@@ -256,7 +256,7 @@ public void HtmlAndComponentTemplateParams()
256256
);
257257

258258
// Using parameter builder
259-
var cut2 = RenderComponent<TemplateParams<string>>(parameters => parameters
259+
var cut2 = Render<TemplateParams<string>>(parameters => parameters
260260
.Add(p => p.Items, new[] { "Foo", "Bar", "Baz" })
261261
.Add<Item, string>(p => p.Template, value => itemParams => itemParams
262262
.Add(p => p.Value, value)
@@ -268,12 +268,12 @@ public void HtmlAndComponentTemplateParams()
268268
public void UnmatchedParamsTest()
269269
{
270270
// Using factory method
271-
var cut1 = RenderComponent<UnmatchedParams>(
271+
var cut1 = Render<UnmatchedParams>(
272272
("some-unknown-param", "a value")
273273
);
274274

275275
// Using parameter builder
276-
var cut2 = RenderComponent<UnmatchedParams>(parameters => parameters
276+
var cut2 = Render<UnmatchedParams>(parameters => parameters
277277
.AddUnmatched("some-unknown-param", "a value")
278278
);
279279
}
@@ -284,17 +284,17 @@ public void UnnamedCascadingParamsTest()
284284
var isDarkTheme = true;
285285

286286
// Using factory method
287-
var cut1 = RenderComponent<CascadingParams>(
287+
var cut1 = Render<CascadingParams>(
288288
CascadingValue(isDarkTheme)
289289
);
290290

291291
// Using parameter builder
292-
var cut2 = RenderComponent<CascadingParams>(parameters => parameters
292+
var cut2 = Render<CascadingParams>(parameters => parameters
293293
.AddCascadingValue(isDarkTheme)
294294
);
295295

296296
// Using parameter builder and selecting unnamed cascading parameter
297-
var cut3 = RenderComponent<CascadingParams>(parameters => parameters
297+
var cut3 = Render<CascadingParams>(parameters => parameters
298298
.Add(p => p.IsDarkTheme, isDarkTheme)
299299
);
300300
}
@@ -303,12 +303,12 @@ public void UnnamedCascadingParamsTest()
303303
public void NamedCascadingParamsTest()
304304
{
305305
// Using factory method
306-
var cut1 = RenderComponent<CascadingParams>(
306+
var cut1 = Render<CascadingParams>(
307307
CascadingValue("LoggedInUser", "Egil Hansen")
308308
);
309309

310310
// Using parameter builder
311-
var cut2 = RenderComponent<CascadingParams>(parameters => parameters
311+
var cut2 = Render<CascadingParams>(parameters => parameters
312312
.Add(p => p.UserName, "Egil Hansen")
313313
);
314314
}
@@ -319,21 +319,21 @@ public void UnnamedAndNamedCascadingParamsTest()
319319
var isDarkTheme = true;
320320

321321
// Using factory method
322-
var cut1 = RenderComponent<CascadingParams>(
322+
var cut1 = Render<CascadingParams>(
323323
CascadingValue(isDarkTheme),
324324
CascadingValue("LoggedInUser", "Egil Hansen"),
325325
CascadingValue("LoggedInEmail", "[email protected]")
326326
);
327327

328328
// Using parameter builder
329-
var cut2 = RenderComponent<CascadingParams>(parameters => parameters
329+
var cut2 = Render<CascadingParams>(parameters => parameters
330330
.AddCascadingValue(isDarkTheme)
331331
.Add(p => p.UserName, "Egil Hansen")
332332
.Add(p => p.Email, "[email protected]")
333333
);
334334

335335
// Using parameter builder and selecting unnamed cascading parameter
336-
var cut3 = RenderComponent<CascadingParams>(parameters => parameters
336+
var cut3 = Render<CascadingParams>(parameters => parameters
337337
.Add(p => p.IsDarkTheme, isDarkTheme)
338338
.Add(p => p.UserName, "Egil Hansen")
339339
.Add(p => p.Email, "[email protected]")

‎docs/samples/tests/xunit/AsyncDataTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void LoadDataAsync()
1313
{
1414
// Arrange
1515
var textService = new TaskCompletionSource<string>();
16-
var cut = RenderComponent<AsyncData>(parameters => parameters
16+
var cut = Render<AsyncData>(parameters => parameters
1717
.Add(p => p.TextService, textService.Task)
1818
);
1919

@@ -32,7 +32,7 @@ public void LoadDataAsyncWithTimeout()
3232
{
3333
// Arrange
3434
var textService = new TaskCompletionSource<string>();
35-
var cut = RenderComponent<AsyncData>(parameters => parameters
35+
var cut = Render<AsyncData>(parameters => parameters
3636
.Add(p => p.TextService, textService.Task)
3737
);
3838

@@ -51,7 +51,7 @@ public void LoadDataAsyncAssertion()
5151
{
5252
// Arrange
5353
var textService = new TaskCompletionSource<string>();
54-
var cut = RenderComponent<AsyncData>(parameters => parameters
54+
var cut = Render<AsyncData>(parameters => parameters
5555
.Add(p => p.TextService, textService.Task)
5656
);
5757

‎docs/samples/tests/xunit/CascadingParams1Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void Test()
1515
{
1616
var isDarkTheme = true;
1717

18-
var cut = RenderComponent<CascadingParams>(parameters => parameters
18+
var cut = Render<CascadingParams>(parameters => parameters
1919
.Add(p => p.IsDarkTheme, isDarkTheme)
2020
);
2121
}

0 commit comments

Comments
 (0)