Skip to content

Commit

Permalink
Bump xunit
Browse files Browse the repository at this point in the history
  • Loading branch information
PureWeen committed Sep 26, 2024
1 parent 3aea783 commit a1b4583
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 45 deletions.
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
<XunitPackageVersion>2.6.6</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.8.0</XunitRunnerVisualStudioPackageVersion>
<XunitExtensibilityExecutionPackageVersion>2.6.6</XunitExtensibilityExecutionPackageVersion>
<XunitAssertPackageVersion>2.6.6</XunitAssertPackageVersion>
<XUnitAnalyzersPackageVersion>1.13.0</XUnitAnalyzersPackageVersion>
<XunitPackageVersion>2.9.0</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.8.2</XunitRunnerVisualStudioPackageVersion>
<XunitExtensibilityExecutionPackageVersion>2.9.0</XunitExtensibilityExecutionPackageVersion>
<XunitAssertPackageVersion>2.9.0</XunitAssertPackageVersion>
<XUnitAnalyzersPackageVersion>1.15.0</XUnitAnalyzersPackageVersion>
<XunitAbstractionsPackageVersion>2.0.3</XunitAbstractionsPackageVersion>
<NSubstitutePackageVersion>5.1.0</NSubstitutePackageVersion>
<CoverletCollectorPackageVersion>6.0.0</CoverletCollectorPackageVersion>
Expand Down
42 changes: 21 additions & 21 deletions src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,33 +126,33 @@ public async Task RemoveLastPage(bool useMaui)
Assert.Equal(1, pushedPage.DisappearingCount);
}

// [Theory]
// [InlineData(false)]
// [InlineData(true)]
// public async Task RemoveInnerPage(bool useMaui)
// {
// ContentPage initialPage = new ContentPage();
// ContentPage pushedPage = new ContentPage();
[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task RemoveInnerPage(bool useMaui)
{
ContentPage initialPage = new ContentPage();
ContentPage pushedPage = new ContentPage();

// ContentPage initialPageAppearing = null;
// ContentPage pageDisappeared = null;
ContentPage initialPageAppearing = null;
ContentPage pageDisappeared = null;

// NavigationPage nav = new TestNavigationPage(useMaui, initialPage);
// _ = new Window(nav);
// nav.SendAppearing();
NavigationPage nav = new TestNavigationPage(useMaui, initialPage);
_ = new Window(nav);
nav.SendAppearing();

// var pageToRemove = new ContentPage();
// await nav.PushAsync(pageToRemove);
// await nav.PushAsync(pushedPage);
var pageToRemove = new ContentPage();
await nav.PushAsync(pageToRemove);
await nav.PushAsync(pushedPage);


// initialPage.Appearing += (__, _)
// => throw new XunitException("Appearing Fired Incorrectly");
initialPage.Appearing += (__, _)
=> throw new XunitException("Appearing Fired Incorrectly");

// pushedPage.Disappearing += (__, _)
// => throw new XunitException("Appearing Fired Incorrectly");
pushedPage.Disappearing += (__, _)
=> throw new XunitException("Appearing Fired Incorrectly");

// nav.Navigation.RemovePage(pageToRemove);
// }
nav.Navigation.RemovePage(pageToRemove);
}
}
}
38 changes: 19 additions & 19 deletions src/Controls/tests/Core.UnitTests/ShellNavigatingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -534,25 +534,25 @@ public async Task ShellItemContentRouteWithGlobalRouteRelative(bool modal, int d
Assert.Equal("//animals/monkeys/details", shell.CurrentState.Location.ToString());
}

//[Theory]
//[InlineData(true)]
//[InlineData(false)]
//public async Task GotoSameGlobalRoutesCollapsesUriCorrectly(bool modal)
//{
// var shell = new Shell();
// var item1 = CreateShellItem<FlyoutItem>(asImplicit: true, shellItemRoute: "animals", shellContentRoute: "monkeys");

// if (modal)
// Routing.RegisterRoute("details", typeof(ShellModalTests.ModalTestPage));
// else
// Routing.RegisterRoute("details", typeof(ContentPage));

// shell.Items.Add(item1);

// await shell.GoToAsync("details");
// await shell.GoToAsync("details");
// Assert.Equal("//animals/monkeys/details/details", shell.CurrentState.Location.ToString());
//}
[Theory]
[InlineData(true)]
[InlineData(false)]
public async Task GotoSameGlobalRoutesCollapsesUriCorrectly(bool modal)
{
var shell = new Shell();
var item1 = CreateShellItem<FlyoutItem>(asImplicit: true, shellItemRoute: "animals", shellContentRoute: "monkeys");

if (modal)
Routing.RegisterRoute("details", typeof(ShellModalTests.ModalTestPage));
else
Routing.RegisterRoute("details", typeof(ContentPage));

shell.Items.Add(item1);

await shell.GoToAsync("details");
await shell.GoToAsync("details");
Assert.Equal("//animals/monkeys/details/details", shell.CurrentState.Location.ToString());
}

[Fact]
public async Task ShellSectionWithGlobalRouteAbsolute()
Expand Down

0 comments on commit a1b4583

Please sign in to comment.