Skip to content

Refactor Interop Files #148

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

Open
yagizhanyakali wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Refactor Interop Files #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b69a2ba
refactor interop javascript files
yagizhanyakali Jun 29, 2025
8b7e37a
Enhance error handling and input validation in Siemens IX Interop fun…
yagizhanyakali Jun 29, 2025
09abfda
Refactor interop classes to enhance JavaScript functionality and impr…
yagizhanyakali Jun 29, 2025
05aed5d
Update SPDX copyright year to 2025 in interop files
yagizhanyakali Jun 29, 2025
2570450
Add 'Id' parameter to various component tests for improved identifica…
yagizhanyakali Jun 29, 2025
17ce366
Refactor JS interop tests to simplify mock setup and improve assertio…
yagizhanyakali Jun 29, 2025
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
9 changes: 6 additions & 3 deletions SiemensIXBlazor.Tests/ApplicationHeaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ public class ApplicationHeaderTests : TestContextBase
public void ApplicationHeaderRendersWithoutCrashing()
{
// Arrange
var cut = RenderComponent<ApplicationHeader>(parameters => {
var cut = RenderComponent<ApplicationHeader>(parameters =>
{
parameters.Add(p => p.Name, "testName");
parameters.Add(p => p.Id, "testId");
});

// Assert
cut.MarkupMatches("<ix-application-header id='' name='testName'></ix-application-header>");
cut.MarkupMatches("<ix-application-header id='testId' name='testName'></ix-application-header>");
}

[Fact]
Expand All @@ -38,7 +40,8 @@ public void ApplicationHeaderRendersChildContent()
.Add(p => p.ChildContent, builder =>
{
builder.AddContent(0, expectedContent);
}));
})
.Add(p => p.Id, "testId"));

// Assert
Assert.Contains(expectedContent, cut.Markup);
Expand Down
15 changes: 8 additions & 7 deletions SiemensIXBlazor.Tests/BlindTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@

namespace SiemensIXBlazor.Tests
{
public class BlindTests: TestContextBase
public class BlindTests : TestContextBase
{
[Fact]
public void ComponentRendersWithoutCrashing()
{
// Arrange
var cut = RenderComponent<Blind>();
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Id, "testId"));

// Assert
cut.MarkupMatches("<ix-blind id='' variant='insight'></ix-blind>");
cut.MarkupMatches("<ix-blind id='testId' variant='insight'></ix-blind>");
}

[Fact]
Expand All @@ -40,7 +40,7 @@ public void IdPropertyIsSetCorrectly()
public void CollapsedPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Collapsed, true));
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Collapsed, true).Add(p => p.Id, "testId"));

// Assert
Assert.True(cut.Instance.Collapsed);
Expand All @@ -50,7 +50,7 @@ public void CollapsedPropertyIsSetCorrectly()
public void IconPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Icon, "testIcon"));
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Icon, "testIcon").Add(p => p.Id, "testId"));

// Assert
Assert.Equal("testIcon", cut.Instance.Icon);
Expand All @@ -60,7 +60,7 @@ public void IconPropertyIsSetCorrectly()
public void VariantPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Variant, BlindVariant.insight));
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.Variant, BlindVariant.insight).Add(p => p.Id, "testId"));

// Assert
Assert.Equal(BlindVariant.insight, cut.Instance.Variant);
Expand All @@ -71,7 +71,8 @@ public void CollapsedChangedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.CollapsedChangedEvent, EventCallback.Factory.Create<bool>(this, () => eventTriggered = true)));
var cut = RenderComponent<Blind>(parameters => parameters.Add(p => p.CollapsedChangedEvent, EventCallback.Factory.Create<bool>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.CollapsedChangedEvent.InvokeAsync(true);
Expand Down
9 changes: 6 additions & 3 deletions SiemensIXBlazor.Tests/Breadcrumb/BreadcrumbTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public void BreadcrumbRendersChildContent()
.Add(p => p.ChildContent, builder =>
{
builder.AddContent(0, expectedContent);
}));
})
.Add(p => p.Id, "testId"));

// Assert
Assert.Contains(expectedContent, cut.Markup);
Expand All @@ -53,7 +54,8 @@ public void ItemClickedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<Breadcrumb>(parameters => parameters.Add(p => p.ItemClicked, EventCallback.Factory.Create<string>(this, () => eventTriggered = true)));
var cut = RenderComponent<Breadcrumb>(parameters => parameters.Add(p => p.ItemClicked, EventCallback.Factory.Create<string>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ItemClicked.InvokeAsync("test");
Expand All @@ -67,7 +69,8 @@ public void NextItemClickedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<Breadcrumb>(parameters => parameters.Add(p => p.NextItemClicked, EventCallback.Factory.Create<string>(this, () => eventTriggered = true)));
var cut = RenderComponent<Breadcrumb>(parameters => parameters.Add(p => p.NextItemClicked, EventCallback.Factory.Create<string>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.NextItemClicked.InvokeAsync("test");
Expand Down
9 changes: 6 additions & 3 deletions SiemensIXBlazor.Tests/CardListTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public void CollapsedChangedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.CollapseChangedEvent, EventCallback.Factory.Create<bool>(this, () => eventTriggered = true)));
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.CollapseChangedEvent, EventCallback.Factory.Create<bool>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.CollapseChangedEvent.InvokeAsync(true);
Expand All @@ -56,7 +57,8 @@ public void ShowAllClickedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.ShowAllClickEvent, EventCallback.Factory.Create(this, () => eventTriggered = true)));
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.ShowAllClickEvent, EventCallback.Factory.Create(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ShowAllClickEvent.InvokeAsync();
Expand All @@ -70,7 +72,8 @@ public void ShowMoreCardClickedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.ShowMoreCardClickEvent, EventCallback.Factory.Create(this, () => eventTriggered = true)));
var cut = RenderComponent<CardList>(parameters => parameters.Add(p => p.ShowMoreCardClickEvent, EventCallback.Factory.Create(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ShowMoreCardClickEvent.InvokeAsync();
Expand Down
3 changes: 2 additions & 1 deletion SiemensIXBlazor.Tests/ChipTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public void ChipRendersChildContent()
.Add(p => p.ChildContent, builder =>
{
builder.AddContent(0, expectedContent);
}));
})
.Add(p => p.Id, "testId"));

// Assert
Assert.Contains(expectedContent, cut.Markup);
Expand Down
6 changes: 4 additions & 2 deletions SiemensIXBlazor.Tests/ContentHeaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public void ContentHeaderRendersChildContent()
.Add(p => p.ChildContent, builder =>
{
builder.AddContent(0, expectedContent);
}));
})
.Add(p => p.Id, "testId"));

// Assert
Assert.Contains(expectedContent, cut.Markup);
Expand All @@ -54,7 +55,8 @@ public void BackButtonClickedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<ContentHeader>(parameters => parameters.Add(p => p.BackButtonClickedEvent, EventCallback.Factory.Create(this, () => eventTriggered = true)));
var cut = RenderComponent<ContentHeader>(parameters => parameters.Add(p => p.BackButtonClickedEvent, EventCallback.Factory.Create(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.BackButtonClickedEvent.InvokeAsync(true);
Expand Down
5 changes: 3 additions & 2 deletions SiemensIXBlazor.Tests/DateDropdownTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ public class DateDropdownTest : TestContextBase
public void ComponentRendersWithoutCrashing()
{
// Arrange
var cut = RenderComponent<DateDropdown>();
var cut = RenderComponent<DateDropdown>(parameters => parameters
.Add(p => p.Id, "testId"));

// Assert
cut.MarkupMatches(@"
<ix-date-dropdown id='' variant='primary' custom-range-allowed='' week-start-index='0' date-range-id='custom' format='yyyy/LL/dd' i18n-custom-item='Custom...' i18n-done='Done' i18n-no-range='No range set' range=''></ix-date-dropdown>
<ix-date-dropdown id='testId' variant='primary' custom-range-allowed='' week-start-index='0' date-range-id='custom' format='yyyy/LL/dd' i18n-custom-item='Custom...' i18n-done='Done' i18n-no-range='No range set' range=''></ix-date-dropdown>
");
}

Expand Down
3 changes: 2 additions & 1 deletion SiemensIXBlazor.Tests/DateTimePickerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ public void EventCallbacksAreTriggeredCorrectly()
var cut = RenderComponent<DateTimePicker>(parameters => parameters
.Add(p => p.DateChangeEvent, EventCallback.Factory.Create<string>(this, (date) => isDateChangeEventTriggered = true))
.Add(p => p.DateSelectEvent, EventCallback.Factory.Create<DateTimePickerResponse>(this, (response) => isDateSelectEventTriggered = true))
.Add(p => p.TimeChangeEvent, EventCallback.Factory.Create<string>(this, (time) => isTimeChangeEventTriggered = true)));
.Add(p => p.TimeChangeEvent, EventCallback.Factory.Create<string>(this, (time) => isTimeChangeEventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.DateChange("2022/12/31");
Expand Down
3 changes: 2 additions & 1 deletion SiemensIXBlazor.Tests/Dropdown/DropdownTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public void EventCallbacksAreTriggeredCorrectly()

var cut = RenderComponent<Components.Dropdown>(parameters => parameters
.Add(p => p.ShowChangedEvent,
EventCallback.Factory.Create<bool>(this, value => isShowChangedEventTriggered = true)));
EventCallback.Factory.Create<bool>(this, value => isShowChangedEventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ShowChanged(true);
Expand Down
3 changes: 2 additions & 1 deletion SiemensIXBlazor.Tests/EventList/EventListItemTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public void ItemClickEventInvoked()
// Arrange
var wasClicked = false;
var cut = RenderComponent<EventListItem>(parameters => parameters
.Add(p => p.ItemClickEvent, EventCallback.Factory.Create(this, () => wasClicked = true)));
.Add(p => p.ItemClickEvent, EventCallback.Factory.Create(this, () => wasClicked = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ItemClicked();
Expand Down
3 changes: 2 additions & 1 deletion SiemensIXBlazor.Tests/ExpandingSearchTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public void ValueChangedEventInvokedOnValueChange()
var valueChangedEventInvoked = false;
var cut = RenderComponent<ExpandingSearch>(parameters => parameters
.Add(p => p.ValueChangedEvent,
EventCallback.Factory.Create<string>(this, _ => valueChangedEventInvoked = true)));
EventCallback.Factory.Create<string>(this, _ => valueChangedEventInvoked = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ValueChanged(string.Empty);
Expand Down
28 changes: 17 additions & 11 deletions SiemensIXBlazor.Tests/MenuAbout/MenuAboutNewsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ public class MenuAboutNewsTest: TestContextBase
public void ComponentRendersWithoutCrashing()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>();
var cut = RenderComponent<MenuAboutNews>(parameters => parameters
.Add(p => p.Id, "testId"));

// Assert
cut.MarkupMatches("<ix-menu-about-news id='' i-1-8n-show-more='Show more' offset-bottom='0'></ix-menu-about-news>");
cut.MarkupMatches("<ix-menu-about-news id='testId' i-1-8n-show-more='Show more' offset-bottom='0'></ix-menu-about-news>");
}

[Fact]
public void ChildContentPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ChildContent, (RenderFragment)(builder => builder.AddMarkupContent(0, "Test content"))));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ChildContent, (RenderFragment)(builder => builder.AddMarkupContent(0, "Test content")))
.Add(p => p.Id, "testId"));

// Assert
Assert.NotNull(cut.Instance.ChildContent);
Expand All @@ -40,7 +42,8 @@ public void ChildContentPropertyIsSetCorrectly()
public void AboutItemLabelPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.AboutItemLabel, "testAboutItemLabel"));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.AboutItemLabel, "testAboutItemLabel")
.Add(p => p.Id, "testId"));

// Assert
Assert.Equal("testAboutItemLabel", cut.Instance.AboutItemLabel);
Expand All @@ -50,7 +53,7 @@ public void AboutItemLabelPropertyIsSetCorrectly()
public void ExpandedPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Expanded, true));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Expanded, true).Add(p => p.Id, "testId"));

// Assert
Assert.True(cut.Instance.Expanded);
Expand All @@ -60,7 +63,8 @@ public void ExpandedPropertyIsSetCorrectly()
public void I18nShowMorePropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.I18NShowMore, "showMoreTest"));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.I18NShowMore, "showMoreTest")
.Add(p => p.Id, "testId"));

// Assert
Assert.Equal("showMoreTest", cut.Instance.I18NShowMore);
Expand All @@ -70,7 +74,7 @@ public void I18nShowMorePropertyIsSetCorrectly()
public void LablePropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Label, "testLabel"));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Label, "testLabel").Add(p => p.Id, "testId"));

// Assert
Assert.Equal("testLabel", cut.Instance.Label);
Expand All @@ -80,7 +84,7 @@ public void LablePropertyIsSetCorrectly()
public void OffsetBottomPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.OffsetBottom, 1));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.OffsetBottom, 1).Add(p => p.Id, "testId"));

// Assert
Assert.Equal(1, cut.Instance.OffsetBottom);
Expand All @@ -90,7 +94,7 @@ public void OffsetBottomPropertyIsSetCorrectly()
public void ShowPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Show, true));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.Show, true).Add(p => p.Id, "testId"));

// Assert
Assert.True(cut.Instance.Show);
Expand All @@ -101,7 +105,8 @@ public void ClosePopoverEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ClosePopoverEvent, EventCallback.Factory.Create(this, () => eventTriggered = true)));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ClosePopoverEvent, EventCallback.Factory.Create(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ClosePopoverEvent.InvokeAsync();
Expand All @@ -115,7 +120,8 @@ public void ShowMoreEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ShowMoreEvent, EventCallback.Factory.Create<MouseEventArgs>(this, () => eventTriggered = true)));
var cut = RenderComponent<MenuAboutNews>(parameters => parameters.Add(p => p.ShowMoreEvent, EventCallback.Factory.Create<MouseEventArgs>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ShowMoreEvent.InvokeAsync(new MouseEventArgs());
Expand Down
11 changes: 7 additions & 4 deletions SiemensIXBlazor.Tests/MenuAbout/MenuAboutTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ public class MenuAboutTest: TestContextBase
public void ComponentRendersWithoutCrashing()
{
// Arrange
var cut = RenderComponent<Components.MenuAbout.MenuAbout>();
var cut = RenderComponent<Components.MenuAbout.MenuAbout>(parameters => parameters
.Add(p => p.Id, "testId"));

// Assert
cut.MarkupMatches("<ix-menu-about label=\"About &amp; legal information\" id=\"\"></ix-menu-about>");
cut.MarkupMatches("<ix-menu-about label=\"About &amp; legal information\" id=\"testId\"></ix-menu-about>");
}

[Fact]
public void ChildContentPropertyIsSetCorrectly()
{
// Arrange
var cut = RenderComponent<Components.MenuAbout.MenuAbout>(parameters => parameters.Add(p => p.ChildContent, (RenderFragment)(builder => builder.AddMarkupContent(0, "Test content"))));
var cut = RenderComponent<Components.MenuAbout.MenuAbout>(parameters => parameters.Add(p => p.ChildContent, (RenderFragment)(builder => builder.AddMarkupContent(0, "Test content")))
.Add(p => p.Id, "testId"));

// Assert
Assert.NotNull(cut.Instance.ChildContent);
Expand All @@ -49,7 +51,8 @@ public void ClosedEventTriggeredCorrectly()
{
// Arrange
var eventTriggered = false;
var cut = RenderComponent<Components.MenuAbout.MenuAbout>(parameters => parameters.Add(p => p.ClosedEvent, EventCallback.Factory.Create<MouseEventArgs>(this, () => eventTriggered = true)));
var cut = RenderComponent<Components.MenuAbout.MenuAbout>(parameters => parameters.Add(p => p.ClosedEvent, EventCallback.Factory.Create<MouseEventArgs>(this, () => eventTriggered = true))
.Add(p => p.Id, "testId"));

// Act
cut.Instance.ClosedEvent.InvokeAsync(new MouseEventArgs());
Expand Down
2 changes: 1 addition & 1 deletion SiemensIXBlazor.Tests/SliderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void OnAfterRenderAsync_FirstRender_AttachesListenerAndSetsMarker()
"listenEvent",
It.IsAny<object[]>()
))
.ReturnsAsync("fakeEventId");
.ReturnsAsync("eventId");

jsObjectReferenceMock
.Setup(js => js.InvokeAsync<object>(
Expand Down
Loading
Loading