Skip to content

Commit 748b7e1

Browse files
egilbUnitBot
authored andcommitted
fix: wrong result type returned
1 parent 3ad4fa1 commit 748b7e1

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

src/bunit/Rendering/BunitHtmlParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private BunitHtmlParser(IConfiguration angleSharpConfiguration)
5757
/// </summary>
5858
/// <param name="markup">The markup to parse.</param>
5959
/// <returns>The <see cref="INodeList"/>.</returns>
60-
public INodeList Parse([StringSyntax("Html")]string markup)
60+
public INodeList Parse([StringSyntax("Html")] string markup)
6161
{
6262
ArgumentNullException.ThrowIfNull(markup);
6363

@@ -70,7 +70,7 @@ public INodeList Parse([StringSyntax("Html")]string markup)
7070
: htmlParser.ParseFragment(markup, ctx!);
7171
}
7272

73-
private SingleNodeNodeList ParseSpecial(string markup, string matchedElement)
73+
private INodeList ParseSpecial(string markup, string matchedElement)
7474
{
7575
var doc = htmlParser.ParseDocument(markup);
7676

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
1-
namespace Bunit.TestAssets.SampleComponents
1+
namespace Bunit.TestAssets.SampleComponents;
2+
3+
public partial class PersistentComponentStateSample : ComponentBase
24
{
3-
public partial class PersistentComponentStateSample
4-
{
5-
public const string PersistenceKey = "fetchdata";
5+
public const string PersistenceKey = "fetchdata";
66

7-
public WeatherForecast[] Forecasts { get; private set; }
7+
public WeatherForecast[] Forecasts { get; private set; }
88

9-
[Inject] public PersistentComponentState State { get; set; }
9+
[Inject] public PersistentComponentState State { get; set; }
1010

11-
protected override void OnInitialized()
11+
protected override void OnInitialized()
12+
{
13+
State.RegisterOnPersisting(PersistForecasts);
14+
if (!State.TryTakeFromJson<WeatherForecast[]>(PersistenceKey, out var data))
1215
{
13-
State.RegisterOnPersisting(PersistForecasts);
14-
if (!State.TryTakeFromJson<WeatherForecast[]>(PersistenceKey, out var data))
15-
{
16-
Forecasts = CreateForecasts();
17-
}
18-
else
19-
{
20-
Forecasts = data;
21-
}
16+
Forecasts = CreateForecasts();
2217
}
23-
24-
private Task PersistForecasts()
18+
else
2519
{
26-
State.PersistAsJson(PersistenceKey, Forecasts);
27-
return Task.CompletedTask;
20+
Forecasts = data;
2821
}
22+
}
2923

30-
private WeatherForecast[] CreateForecasts()
31-
{
32-
return new WeatherForecast[]
33-
{
34-
new WeatherForecast{ Temperature = 42 },
35-
};
36-
}
24+
private Task PersistForecasts()
25+
{
26+
State.PersistAsJson(PersistenceKey, Forecasts);
27+
return Task.CompletedTask;
3728
}
3829

39-
public record class WeatherForecast
30+
private WeatherForecast[] CreateForecasts()
4031
{
41-
public int Temperature { get; set; }
32+
return new WeatherForecast[]
33+
{
34+
new WeatherForecast{ Temperature = 42 },
35+
};
4236
}
4337
}
38+
39+
public record class WeatherForecast
40+
{
41+
public int Temperature { get; set; }
42+
}

tests/bunit.tests/BunitContextTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public void Dispose()
275275
WasDisposed = true;
276276
}
277277
}
278-
278+
279279
private sealed class AsyncThrowAfterDelayComponent : ComponentBase, IAsyncDisposable
280280
{
281281
public async ValueTask DisposeAsync()

tests/bunit.web.query.tests/Labels/LabelQueryExtensionsTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void Test007(string labelText)
135135
public void Test009(StringComparison comparison)
136136
{
137137
var expectedLabelText = "LABEL TEXT";
138-
var cut = Render<Wrapper>(ps =>
138+
var cut = Render<Wrapper>(ps =>
139139
ps.AddChildContent("""<label for="input-with-label">Label Text</label><input id="input-with-label" />"""));
140140

141141
Should.Throw<LabelNotFoundException>(() => cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison))
@@ -149,7 +149,7 @@ public void Test009(StringComparison comparison)
149149
public void Test010(StringComparison comparison)
150150
{
151151
var expectedLabelText = "LABEL TEXT";
152-
var cut = Render<Wrapper>(ps =>
152+
var cut = Render<Wrapper>(ps =>
153153
ps.AddChildContent("""<label for="input-1">Label Text</label><input id="input-1" />"""));
154154

155155
var input = cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison);
@@ -166,7 +166,7 @@ public void Test010(StringComparison comparison)
166166
public void Test011(StringComparison comparison)
167167
{
168168
var expectedLabelText = "LABEL TEXT";
169-
var cut = Render<Wrapper>(ps =>
169+
var cut = Render<Wrapper>(ps =>
170170
ps.AddChildContent("""<label>Label Text<input id="input-wrapped-label" /></label>"""));
171171

172172
Should.Throw<LabelNotFoundException>(() => cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison))
@@ -180,7 +180,7 @@ public void Test011(StringComparison comparison)
180180
public void Test012(StringComparison comparison)
181181
{
182182
var expectedLabelText = "LABEL TEXT";
183-
var cut = Render<Wrapper>(ps =>
183+
var cut = Render<Wrapper>(ps =>
184184
ps.AddChildContent("""<label>Label Text<input id="input-1" /></label>"""));
185185

186186
var input = cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison);
@@ -197,7 +197,7 @@ public void Test012(StringComparison comparison)
197197
public void Test013(StringComparison comparison)
198198
{
199199
var expectedLabelText = "LABEL TEXT";
200-
var cut = Render<Wrapper>(ps =>
200+
var cut = Render<Wrapper>(ps =>
201201
ps.AddChildContent("""<input id="input-1" aria-label="Label Text" />"""));
202202

203203
Should.Throw<LabelNotFoundException>(() => cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison))
@@ -211,7 +211,7 @@ public void Test013(StringComparison comparison)
211211
public void Test014(StringComparison comparison)
212212
{
213213
var expectedLabelText = "LABEL TEXT";
214-
var cut = Render<Wrapper>(ps =>
214+
var cut = Render<Wrapper>(ps =>
215215
ps.AddChildContent("""<input id="input-1" aria-label="Label Text" />"""));
216216

217217
var input = cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison);
@@ -228,7 +228,7 @@ public void Test014(StringComparison comparison)
228228
public void Test015(StringComparison comparison)
229229
{
230230
var expectedLabelText = "LABEL TEXT";
231-
var cut = Render<Wrapper>(ps =>
231+
var cut = Render<Wrapper>(ps =>
232232
ps.AddChildContent("""<h2 id="heading-1">Label Text</h2><input aria-labelledby="heading-1" />"""));
233233

234234
Should.Throw<LabelNotFoundException>(() => cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison))
@@ -242,7 +242,7 @@ public void Test015(StringComparison comparison)
242242
public void Test016(StringComparison comparison)
243243
{
244244
var expectedLabelText = "LABEL TEXT";
245-
var cut = Render<Wrapper>(ps =>
245+
var cut = Render<Wrapper>(ps =>
246246
ps.AddChildContent("""<h2 id="heading-1">Label Text</h2><input id="input-1" aria-labelledby="heading-1" />"""));
247247

248248
var input = cut.FindByLabelText(expectedLabelText, o => o.ComparisonType = comparison);

0 commit comments

Comments
 (0)