Skip to content

Commit e155d9a

Browse files
committed
Feedback on TestCategory rename:
native => native-mono native-coreclr => native
1 parent e4e5c27 commit e155d9a

33 files changed

Lines changed: 56 additions & 56 deletions

src/libraries/sendtohelix-browser.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<_XUnitTraitArg Condition="'$(TestUsingWorkloads)' != 'true'">-trait category=no-workload</_XUnitTraitArg>
179179
<_XUnitTraitArg Condition="'$(WasmFingerprintAssets)' == 'false'">$(_XUnitTraitArg) -trait category=no-fingerprinting</_XUnitTraitArg>
180180
<_XUnitTraitArg Condition="'$(WasmBundlerFriendlyBootConfig)' == 'true'">$(_XUnitTraitArg) -trait category=bundler-friendly</_XUnitTraitArg>
181-
<_XUnitTraitArg Condition="'$(RuntimeFlavor)' == 'CoreCLR'">-notrait category=native -notrait category=mono -notrait category=workload</_XUnitTraitArg>
181+
<_XUnitTraitArg Condition="'$(RuntimeFlavor)' == 'CoreCLR'">-notrait category=native-mono -notrait category=mono -notrait category=workload</_XUnitTraitArg>
182182
</PropertyGroup>
183183

184184
<PropertyGroup>

src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(Configuration config, bool testUn
5050

5151
[Theory]
5252
[MemberData(nameof(TestDataForDefaultTemplate_WithWorkload), parameters: new object[] { true })]
53-
[TestCategory("native")]
53+
[TestCategory("native-mono")]
5454
public void DefaultTemplate_AOT_WithWorkload(Configuration config, bool testUnicode)
5555
{
5656
ProjectInfo info = CopyTestAsset(config, aot: false, TestAsset.BlazorBasicTestApp, "blz_aot", appendUnicodeToPath: testUnicode);
@@ -130,7 +130,7 @@ void AssertResourcesDlls(string basePath)
130130
[Theory]
131131
[InlineData("", true)] // Default case
132132
[InlineData("false", false)] // the other case
133-
[TestCategory("native")]
133+
[TestCategory("native-mono")]
134134
public async Task Test_WasmStripILAfterAOT(string stripILAfterAOT, bool expectILStripping)
135135
{
136136
Configuration config = Configuration.Release;
@@ -150,7 +150,7 @@ public async Task Test_WasmStripILAfterAOT(string stripILAfterAOT, bool expectIL
150150

151151
[Theory]
152152
[InlineData(Configuration.Debug)]
153-
[TestCategory("native")]
153+
[TestCategory("native-mono")]
154154
public void BlazorWasm_CannotAOT_InDebug(Configuration config)
155155
{
156156
ProjectInfo info = CopyTestAsset(

src/mono/wasm/Wasm.Build.Tests/Blazor/CleanTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Wasm.Build.Tests.Blazor;
1515

16-
[TestCategory("native")]
16+
[TestCategory("native-mono")]
1717
public class CleanTests : BlazorWasmTestBase
1818
{
1919
public CleanTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)

src/mono/wasm/Wasm.Build.Tests/Blazor/DllImportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Wasm.Build.Tests.Blazor;
1717

18-
[TestCategory("native")]
18+
[TestCategory("native-mono")]
1919
public class DllImportTests : BlazorWasmTestBase
2020
{
2121
public DllImportTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)

src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC
3131
[InlineData(Configuration.Release, true)]
3232
[InlineData(Configuration.Release, false)]
3333
[ActiveIssue("https://github.com/dotnet/runtime/issues/103566")]
34-
[TestCategory("native")]
34+
[TestCategory("native-mono")]
3535
public void NativeBuild_WithDeployOnBuild_UsedByVS(Configuration config, bool nativeRelink)
3636
{
3737
string extraProperties = config == Configuration.Debug
@@ -59,7 +59,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(Configuration config, bool na
5959

6060
[Theory]
6161
[InlineData(Configuration.Release)]
62-
[TestCategory("native")]
62+
[TestCategory("native-mono")]
6363
public void DefaultTemplate_AOT_InProjectFile(Configuration config)
6464
{
6565
string extraProperties = config == Configuration.Debug
@@ -80,7 +80,7 @@ public void DefaultTemplate_AOT_InProjectFile(Configuration config)
8080
}
8181

8282
[Fact]
83-
[TestCategory("native")]
83+
[TestCategory("native-mono")]
8484
public void BugRegression_60479_WithRazorClassLib()
8585
{
8686
Configuration config = Configuration.Release;

src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Wasm.Build.Tests.Blazor;
1111

12-
[TestCategory("native")]
12+
[TestCategory("native-mono")]
1313
public class NativeTests : BlazorWasmTestBase
1414
{
1515
public NativeTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)

src/mono/wasm/Wasm.Build.Tests/Blazor/NoopNativeRebuildTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Wasm.Build.Tests.Blazor
1313
{
14-
[TestCategory("native")]
14+
[TestCategory("native-mono")]
1515
public class NoopNativeRebuildTest : BlazorWasmTestBase
1616
{
1717
public NoopNativeRebuildTest(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)

src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public async Task BlazorBuildAndRunForDifferentOutputPaths(Configuration config,
6464
[InlineData(Configuration.Debug, false)]
6565
[InlineData(Configuration.Release, false)]
6666
[InlineData(Configuration.Release, true)]
67-
[TestCategory("native")]
67+
[TestCategory("native-mono")]
6868
public async Task BlazorPublishRunTest(Configuration config, bool aot)
6969
{
7070
ProjectInfo info = CopyTestAsset(config, aot, TestAsset.BlazorBasicTestApp, "blazor_publish");

src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
2323

2424
[Theory]
2525
[BuildAndRun(config: Configuration.Debug, aot: true)]
26-
[TestCategory("native")]
26+
[TestCategory("native-mono")]
2727
public void Wasm_CannotAOT_InDebug(Configuration config, bool aot)
2828
{
2929
ProjectInfo info = CopyTestAsset(config, aot, TestAsset.WasmBasicTestApp, "no_aot_in_debug");
@@ -51,7 +51,7 @@ public async Task BuildThenPublishNoAOT(Configuration config, bool aot)
5151

5252
[Theory]
5353
[BuildAndRun(config: Configuration.Release, aot: true)]
54-
[TestCategory("native")]
54+
[TestCategory("native-mono")]
5555
public async Task BuildThenPublishWithAOT(Configuration config, bool aot)
5656
{
5757
ProjectInfo info = CopyTestAsset(config, aot, TestAsset.WasmBasicTestApp, "build_publish");

src/mono/wasm/Wasm.Build.Tests/DllImportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void UnmanagedCallback_WithFunctionPointers_CompilesWithWarnings(Configur
120120
"with.per.iod",
121121
"with🚀unicode#"
122122
} })]
123-
[TestCategory("native")]
123+
[TestCategory("native-mono")]
124124
public async Task CallIntoLibrariesWithNonAlphanumericCharactersInTheirNames(Configuration config, bool aot, string[] libraryNames)
125125
{
126126
var extraItems = @"<NativeFileReference Include=""*.c"" />";

0 commit comments

Comments
 (0)