Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v7 Preparation: Add Nullable & Improve Code Quality #367

Merged
merged 4 commits into from
Apr 13, 2024
Merged

v7 Preparation: Add Nullable & Improve Code Quality #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
866cc23
First Part of Nullable Implementation
mckaragoz Apr 11, 2024
f97d666
Nullable Part 2
mckaragoz Apr 12, 2024
aa6bf50
Nullable Part 3
mckaragoz Apr 13, 2024
3733054
Nullable Part 4
mckaragoz Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...dBlazor.Extensions.UnitTests.Viewer/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>disable</Nullable>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/Shared/NavMenu.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@code {
private bool collapseNavMenu = true;

private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;

private void ToggleNavMenu()
{
Expand Down
2 changes: 1 addition & 1 deletion ...MudBlazor.Extensions.UnitTests.Viewer/TestComponents/Combobox/ComboBoxClearableTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@code {

string value = null;
string? value = null;

public bool ClearButtonClicked { get; set; }

Expand Down
8 changes: 4 additions & 4 deletions ...udBlazor.Extensions.UnitTests.Viewer/TestComponents/Combobox/ComboBoxEventCountTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
public int ItemChangeCount { get; set; }
public int ItemsChangeCount { get; set; }

MudComboBox<string> _combobox;
MudComboBoxItem<string> FirstItem { get; set; }
MudComboBoxItem<string> SecondItem { get; set; }
MudComboBoxItem<string> ThirdItem { get; set; }
MudComboBox<string> _combobox = new();
MudComboBoxItem<string> FirstItem { get; set; } = new();
MudComboBoxItem<string> SecondItem { get; set; } = new();
MudComboBoxItem<string> ThirdItem { get; set; } = new();

//public void SetSelectedItem()
//{
Expand Down
4 changes: 2 additions & 2 deletions ...Blazor.Extensions.UnitTests.Viewer/TestComponents/Combobox/ComboBoxInitialValueTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

@code {
[Parameter]
public string SelectedValue { get; set; }
public string? SelectedValue { get; set; }
[Parameter]
public IEnumerable<string> SelectedValues { get; set; }
public IEnumerable<string?>? SelectedValues { get; set; }
[Parameter]
public bool MultiSelection { get; set; }
}
2 changes: 1 addition & 1 deletion ...xtensions.UnitTests.Viewer/TestComponents/ListExtended/ListExperimentalEnhancedTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@

@code
{
MudListItemExtended<int> selectedItem;
MudListItemExtended<int>? selectedItem;
int selectedValue;
}
4 changes: 2 additions & 2 deletions ...tTests.Viewer/TestComponents/ListExtended/ListExperimentalSelectionInitialValueTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
@code
{
[Parameter] public Color Color { get; set; } = Color.Primary;
MudListExtended<int?> _list;
MudListExtended<int?> _list = new();
public static string __description__ = "Sparkling Water should be selected initially.";
MudListItemExtended<int?> selectedItem;
MudListItemExtended<int?>? selectedItem;
int? selectedValue = 1;

public void SetSelectedValue(int? value)
Expand Down
2 changes: 1 addition & 1 deletion ...tensions.UnitTests.Viewer/TestComponents/ListExtended/ListExperimentalSelectionTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
@code
{
public static string __description__ = "Clicking the drinks selects them. The child lists are updated accordingly.";
MudListItemExtended<int> selectedItem;
MudListItemExtended<int>? selectedItem;
}
12 changes: 6 additions & 6 deletions ...Extensions.UnitTests.Viewer/TestComponents/ListExtended/ListExperimentalVariantTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<MudGrid>
<MudItem xs="12" sm="4">
<MudCheckBox @bind-Checked="_clickable" Color="Color.Primary" Label="Clickable" />
<MudCheckBox @bind-Value="_clickable" Color="Color.Primary" Label="Clickable" />
@*<MudCheckBox @bind-Checked="_multiSelection" Color="Color.Primary" Label="MultiSelection" />*@
<MudCheckBox @bind-Checked="_selectAll" Color="Color.Primary" Label="Select All" />
<MudCheckBox @bind-Value="_selectAll" Color="Color.Primary" Label="Select All" />
<MudDivider />
<MudTextField @bind-Value="_selectedValue" Clearable="true" />

Expand Down Expand Up @@ -48,11 +48,11 @@
bool _clickable = true;
bool _selectAll = false;

MudListExtended<int?> _list;
MudListExtended<int?> _list = new();
int? _selectedValue = 1;
IEnumerable<int?> _selectedValues = new List<int?>();
MudListItemExtended<int?> _selectedItem;
MudListItemExtended<int?> _thirdItem;
MudListItemExtended<int?> _fifthItem;
MudListItemExtended<int?>? _selectedItem;
MudListItemExtended<int?> _thirdItem = new();
MudListItemExtended<int?> _fifthItem = new();
IEnumerable<MudListItemExtended<int?>> _selectedItems = new List<MudListItemExtended<int?>>();
}
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions.UnitTests/CodeBeam.MudBlazor.Extensions.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<Nullable>enable</Nullable>

<!--<IsPackable>false</IsPackable>-->
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions CodeBeam.MudBlazor.Extensions.UnitTests/Components/ComboboxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ public async Task ComboBoxTest1()
comp.WaitForAssertion(() => combobox.Instance.Value.Should().Be("1"));
//Check user on blur implementation works
var @switch = comp.FindComponent<MudSwitch<bool>>();
@switch.Instance.Checked = true;
@switch.Instance.Value = true;
await comp.InvokeAsync(() => combobox.Instance.HandleOnBlur(new FocusEventArgs()));
comp.WaitForAssertion(() => @switch.Instance.Checked.Should().Be(false));
comp.WaitForAssertion(() => @switch.Instance.Value.Should().Be(false));
}

[Test]
Expand Down Expand Up @@ -304,7 +304,7 @@ public async Task ComboBox_MultiSelectTest1()
comp.WaitForAssertion(() => combobox.Instance.GetPresenterText().Should().Be("2, 1, 3"));
items[0].Click();
comp.WaitForAssertion(() => combobox.Instance.GetPresenterText().Should().Be("2, 3"));
combobox.Instance.SelectedValues.Count().Should().Be(2);
combobox.Instance.SelectedValues?.Count().Should().Be(2);
combobox.Instance.SelectedValues.Should().Contain("2");
combobox.Instance.SelectedValues.Should().Contain("3");
//Console.WriteLine(comp.Markup);
Expand Down
6 changes: 1 addition & 5 deletions CodeBeam.MudBlazor.Extensions.UnitTests/Components/RenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using Bunit;
using MudExtensions.UnitTests.Components;
using ComponentViewer.Docs.Pages.Components;
using ComponentViewer.Docs.Pages.Components;
using FluentAssertions;
using MudBlazor;
using MudExtensions;

namespace MudExtensions.UnitTests.Components
{
Expand Down
20 changes: 10 additions & 10 deletions CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ public async Task SelectTest1()
comp.WaitForAssertion(() => select.Instance.Value.Should().Be("1"));
//Check user on blur implementation works
var @switch = comp.FindComponent<MudSwitch<bool>>();
@switch.Instance.Checked = true;
@switch.Instance.Value = true;
await comp.InvokeAsync(() => select.Instance.OnLostFocus(new FocusEventArgs()));
comp.WaitForAssertion(() => @switch.Instance.Checked.Should().Be(false));
comp.WaitForAssertion(() => @switch.Instance.Value.Should().Be(false));
}

/// <summary>
Expand Down Expand Up @@ -391,7 +391,7 @@ public void Select_Should_FireTextChangedWithNewValue()
var comp = Context.RenderComponent<SelectTest1>();
//Console.WriteLine(comp.Markup);
var select = comp.FindComponent<MudSelectExtended<string>>();
string text = null;
string? text = null;
select.SetCallback(s => s.TextChanged, x => text = x);
var menu = comp.Find("div.mud-popover");
var input = comp.Find("div.mud-input-control");
Expand Down Expand Up @@ -433,8 +433,8 @@ public void SingleSelect_Should_FireTextChangedBeforeSelectedValuesChanged()
var comp = Context.RenderComponent<SelectTest1>();
//Console.WriteLine(comp.Markup);
var select = comp.FindComponent<MudSelectExtended<string>>();
string text = null;
IEnumerable<string> selectedValues = null;
string? text = null;
IEnumerable<string>? selectedValues = null;
var eventCounter = 0;
var textChangedCount = 0;
var selectedValuesChangedCount = 0;
Expand Down Expand Up @@ -494,8 +494,8 @@ public void MultiSelect_Should_FireTextChangedBeforeSelectedValuesChanged()
var comp = Context.RenderComponent<SelectTest1>();
//Console.WriteLine(comp.Markup);
var select = comp.FindComponent<MudSelectExtended<string>>();
string text = null;
IEnumerable<string> selectedValues = null;
string? text = null;
IEnumerable<string>? selectedValues = null;
var eventCounter = 0;
var textChangedCount = 0;
var selectedValuesChangedCount = 0;
Expand Down Expand Up @@ -577,7 +577,7 @@ public async Task MultiSelect_ShouldCallValidationFunc()
//Console.WriteLine(comp.Markup);
// select elements needed for the test
var select = comp.FindComponent<MudSelectExtended<string>>();
IEnumerable<string> validatedValue = null;
IEnumerable<string>? validatedValue = null;
select.SetParam(x => x.Validation, new Func<string, bool>(value =>
{
validatedValue = select.Instance.SelectedValues;
Expand Down Expand Up @@ -619,7 +619,7 @@ public void MultiSelect_SelectAll()
var comp = Context.RenderComponent<MultiSelectTest2>();
// select element needed for the test
var select = comp.FindComponent<MudSelectExtended<string>>();
IEnumerable<string> validatedValue = null;
IEnumerable<string>? validatedValue = null;
select.SetParam(x => x.Validation, (object)new Func<string, bool>(value =>
{
validatedValue = select.Instance.SelectedValues; // NOTE: select does only update the value for T string
Expand Down Expand Up @@ -694,7 +694,7 @@ public void SingleSelect_Should_CallValidationFunc()
var comp = Context.RenderComponent<SelectTest1>();
//Console.WriteLine(comp.Markup);
var select = comp.FindComponent<MudSelectExtended<string>>();
string validatedValue = null;
string? validatedValue = null;
select.SetParam(x => x.Validation, (object)new Func<string, bool>(value =>
{
validatedValue = value; // NOTE: select does only update the value for T string
Expand Down
4 changes: 0 additions & 4 deletions CodeBeam.MudBlazor.Extensions.UnitTests/Components/WatchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using Bunit;
using MudExtensions.UnitTests.Components;
using ComponentViewer.Docs.Pages.Components;
using FluentAssertions;
using MudBlazor;
using MudExtensions;
using MudExtensions.UnitTests.TestComponents;

namespace MudExtensions.UnitTests.Components
Expand Down
Loading
Loading