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

[wasm] Enable System.Resources.Extensions.Tests and System.Resources.ResourceManager.Tests test suites #39513

Merged
merged 1 commit into from
Jul 17, 2020
Merged

[wasm] Enable System.Resources.Extensions.Tests and System.Resources.ResourceManager.Tests test suites #39513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/libraries/System.Resources.Extensions/tests/BinaryResourceWriterUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public static void PrimitiveResourcesAsStrings()
}
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34495", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static void BinaryFormattedResources()
Expand Down Expand Up @@ -300,7 +300,7 @@ public static void BinaryFormattedResources()
}
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34495", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static void BinaryFormattedResourcesWithoutTypeName()
Expand Down Expand Up @@ -436,7 +436,7 @@ public static void StreamResources()
}
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public static void CanReadViaResourceManager()
{
ResourceManager resourceManager = new ResourceManager(typeof(TestData));
Expand Down Expand Up @@ -474,7 +474,7 @@ public static void ResourceManagerLoadsCorrectReader()
Assert.IsType<DeserializingResourceReader>(reader);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public static void EmbeddedResourcesAreUpToDate()
{
// this is meant to catch a case where our embedded test resources are out of date with respect to the current writer.
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Resources.ResourceManager/tests/ResourceManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public static IEnumerable<object[]> EnglishNonStringResourceData()
yield return new object[] { "Size", new Size(20, 30), true };
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
[MemberData(nameof(EnglishNonStringResourceData))]
public static void GetObject(string key, object expectedValue, bool requiresBinaryFormatter)
{
Expand Down Expand Up @@ -299,7 +299,7 @@ public static void GetResourceSet_Strings(string key, string expectedValue)
Assert.Equal(expectedValue, set.GetString(key));
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
[MemberData(nameof(EnglishNonStringResourceData))]
public static void GetResourceSet_NonStrings(string key, object expectedValue, bool requiresBinaryFormatter)
{
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\System.Reflection.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Extensions\tests\System.Resources.Extensions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.ResourceManager\tests\System.Resources.ResourceManager.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Permissions\tests\System.Security.Permissions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Thread\tests\System.Threading.Thread.Tests.csproj" />
Expand Down