Skip to content

Commit

Permalink
[monotouch-test] Adjust HttpClientHandler tests.
Browse files Browse the repository at this point in the history 
Adjust HttpClientHandler tests to cope with
dotnet/runtime#50859 and
#11392.
  • Loading branch information
@rolfbjarne
rolfbjarne committed Jul 20, 2021
1 parent f90a2f5 commit 7e37fe6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 5 deletions.
3 changes: 0 additions & 3 deletions tests/linker/ios/dont link/CalendarTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ namespace DontLink.Calendars {
[TestFixture]
// we want the tests to be available because we use the linker
[Preserve (AllMembers = true)]
#if NET
[Ignore ("No globalization data yet - https://github.com/xamarin/xamarin-macios/issues/8906")]
#endif
public class CalendarTest {

// application must *NOT* be build with I18N.MidEast and I18N.Other (Thai)
Expand Down
12 changes: 10 additions & 2 deletions tests/linker/ios/link all/CalendarTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace LinkAll.Calendars {
[TestFixture]
// we want the tests to be available because we use the linker
[Preserve (AllMembers = true)]
#if NET
[Ignore ("No globalization data yet - https://github.com/xamarin/xamarin-macios/issues/8906")]
#if NET && __MACCATALYST__
[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
#endif
public class CalendarTest {

Expand All @@ -21,14 +21,22 @@ public class CalendarTest {
public void UmAlQura ()
{
var ci = CultureInfo.GetCultureInfo ("ar");
#if NET // https://github.com/dotnet/runtime/issues/50859
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
#else
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.UmAlQuraCalendar"), "Calendar");
#endif
}

[Test]
public void Hijri ()
{
var ci = CultureInfo.GetCultureInfo ("ps");
#if NET // https://github.com/dotnet/runtime/issues/50859
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.PersianCalendar"), "Calendar");
#else
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.HijriCalendar"), "Calendar");
#endif
}

[Test]
Expand Down
11 changes: 11 additions & 0 deletions tests/linker/ios/link sdk/CalendarTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ namespace LinkSdk.Calendars {
[TestFixture]
// we want the tests to be available because we use the linker
[Preserve (AllMembers = true)]
#if NET && __MACCATALYST__
[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
#endif
public class CalendarTest {

// application must *NOT* be build with I18N.MidEast and I18N.Other (Thai)
Expand All @@ -25,14 +28,22 @@ public void UmAlQura ()
public void Hijri ()
{
var ci = CultureInfo.GetCultureInfo ("ps");
#if NET // https://github.com/dotnet/runtime/issues/50859
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.PersianCalendar"), "Calendar");
#else
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
#endif
}

[Test]
public void ThaiBuddhist ()
{
var ci = CultureInfo.GetCultureInfo ("th");
#if NET // https://github.com/dotnet/runtime/issues/50859
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.ThaiBuddhistCalendar"), "Calendar");
#else
Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
#endif
}
}
}
3 changes: 3 additions & 0 deletions tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ public void OpenTk_Preserved ()
#endif // !__WATCHOS__ && !__MACCATALYST__

[Test]
#if NET && __MACCATALYST__
[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
#endif
public void XElement_3137 ()
{
CultureInfo current = Thread.CurrentThread.CurrentCulture;
Expand Down
6 changes: 6 additions & 0 deletions tests/linker/ios/link sdk/LocaleTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ public class LocaleTest {

[Test]
[SetCulture ("cs-CZ")]
#if NET && __MACCATALYST__
[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
#endif
public void CzechDictComparer ()
{
DictComparer ();
}

[Test]
[SetCulture ("en-US")]
#if NET && __MACCATALYST__
[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
#endif
public void EnglishDictComparer ()
{
DictComparer ();
Expand Down

8 comments on commit 7e37fe6

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)

Packages generated

View packages

Test results

6 tests failed, 215 tests passed.

Failed tests

  • monotouch-test/Mac Catalyst/Debug [dotnet]: Failed (Tests run: 2629 Passed: 2490 Inconclusive: 35 Failed: 3 Ignored: 136)
  • dont link/iOS Unified 64-bits - simulator/Debug [dotnet]: Failed
  • dont link/iOS Unified 64-bits - simulator/Release [dotnet]: Failed
  • dont link/tvOS - simulator/Debug [dotnet]: Failed
  • dont link/tvOS - simulator/Release [dotnet]: Failed
  • DotNet tests: Failed (Execution failed with exit code 1)

Pipeline on Agent XAMBOT-1027.BigSur'
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[monotouch-test] Adjust HttpClientHandler tests.

Please sign in to comment.