From d26558092b0fe5edb6974bb8e59e317f147edfa6 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Fri, 10 Mar 2023 12:32:23 -0600 Subject: [PATCH] [ci] Remove separate SmokeTests jobs. --- build-tools/automation/azure-pipelines.yaml | 82 +------------------ .../yaml-templates/build-macos.yaml | 8 -- .../yaml-templates/run-msbuild-tests.yaml | 2 - .../stage-msbuild-emulator-tests.yaml | 4 +- .../yaml-templates/stage-msbuild-tests.yaml | 8 +- .../AndroidUpdateResourcesTest.cs | 1 - .../Xamarin.Android.Build.Tests/AotTests.cs | 6 +- .../BindingBuildTest.cs | 2 - .../Xamarin.Android.Build.Tests/BuildTest.cs | 7 +- .../Xamarin.Android.Build.Tests/BuildTest2.cs | 4 +- .../DeferredBuildTest.cs | 1 - .../DesignerTests.cs | 1 - .../EnvironmentContentTests.cs | 1 - .../IncrementalBuildTest.cs | 3 - .../ManifestTest.cs | 1 - .../PackagingTest.cs | 4 +- .../Tasks/ManagedResourceParserTests.cs | 2 - .../Xamarin.Android.Build.Tests/XASdkTests.cs | 3 - .../Tests/DebuggingTest.cs | 2 +- .../Tests/InstallAndRunTests.cs | 2 +- .../Tests/XASdkDeployTests.cs | 2 +- 21 files changed, 17 insertions(+), 129 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 322d09b2753..fd57e8e59e0 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -93,7 +93,7 @@ stages: - template: yaml-templates/build-linux.yaml - stage: smoke_tests - displayName: Smoke Tests + displayName: Package Tests dependsOn: mac_build jobs: # Check - "Xamarin.Android (macOS > Tests > APKs Classic)" @@ -453,80 +453,6 @@ stages: - template: yaml-templates/fail-on-issue.yaml - # MSBuild Smoke Tests - Mac - - template: yaml-templates/run-msbuild-tests.yaml - parameters: - testOS: macOS - jobName: mac_smoke_msbuild_tests - jobDisplayName: macOS > Tests > MSBuild - agentCount: 2 - testFilter: cat = SmokeTests - installApkDiff: true - - # MSBuild Smoke Tests - Win - - template: yaml-templates/run-msbuild-tests.yaml - parameters: - testOS: Windows - jobName: win_smoke_msbuild_tests - jobDisplayName: Windows > Tests > MSBuild - agentCount: 2 - testFilter: cat = SmokeTests - installApkDiff: true - - # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator)" - - job: mac_msbuilddevice_tests - displayName: macOS > Tests > MSBuild+Emulator One .NET - pool: - vmImage: $(HostedMacImage) - timeoutInMinutes: 180 - workspace: - clean: all - steps: - - template: yaml-templates/setup-test-environment.yaml - parameters: - provisionClassic: false - provisionatorChannel: ${{ parameters.provisionatorChannel }} - - - template: yaml-templates/run-xaprepare.yaml - parameters: - displayName: install emulator - arguments: --s=EmulatorTestDependencies - - - task: DownloadPipelineArtifact@2 - inputs: - artifactName: $(TestAssembliesArtifactName) - downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration) - - - task: MSBuild@1 - displayName: start emulator - inputs: - solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: /t:AcquireAndroidTarget /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog - - - template: yaml-templates/run-nunit-tests.yaml - parameters: - testRunTitle: MSBuildDeviceIntegration Smoke - macOS - testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll - dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)" - testResultsFile: TestResult-MSBuildDeviceIntegrationSmoke-$(XA.Build.Configuration).xml - - - task: MSBuild@1 - displayName: shut down emulator - inputs: - solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: >- - /t:AcquireAndroidTarget,ReleaseAndroidTarget - /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog - condition: always() - - - template: yaml-templates/upload-results.yaml - parameters: - artifactName: Test Results - MSBuild Smoke With Emulator - macOS - One .NET - - - template: yaml-templates/fail-on-issue.yaml - - stage: linux_tests displayName: Linux Tests dependsOn: @@ -567,18 +493,14 @@ stages: - template: yaml-templates/fail-on-issue.yaml - template: yaml-templates/stage-msbuild-tests.yaml - parameters: - stageCondition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuild'))) - template: yaml-templates/stage-msbuild-emulator-tests.yaml - parameters: - stageCondition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice'))) - stage: bcl_tests displayName: BCL Emulator Tests dependsOn: mac_build # Disabled on .NET release branches - condition: and(succeeded(), eq(variables.IsRelOrTargetingRel, 'False'), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'BCL'))) + condition: and(succeeded(), eq(variables.IsRelOrTargetingRel, 'False')) jobs: # Check - "Xamarin.Android (macOS > Tests > BCL (Emulator))" - job: mac_bcl_tests diff --git a/build-tools/automation/yaml-templates/build-macos.yaml b/build-tools/automation/yaml-templates/build-macos.yaml index fa0a3b60db2..d061baebcdc 100644 --- a/build-tools/automation/yaml-templates/build-macos.yaml +++ b/build-tools/automation/yaml-templates/build-macos.yaml @@ -80,11 +80,3 @@ stages: xaSourcePath: $(System.DefaultWorkingDirectory)/xamarin-android artifactName: ${{ parameters.buildResultArtifactName }} includeBuildResults: true - - - template: run-xaprepare.yaml - parameters: - arguments: --s=DetermineApplicableTests - xaSourcePath: $(System.DefaultWorkingDirectory)/xamarin-android - displayName: determine which test stages to run - name: TestConditions - condition: and(succeeded(), eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR')) diff --git a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml index cab9c50cb26..93f0785627f 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml @@ -4,7 +4,6 @@ parameters: jobDisplayName: # Display name of the job agentCount: # Number of build agents to run in parallel testFilter: # Filter used to select tests (NUnit test selection language, not dotnet test filter language) - installApkDiff: false # Smoke tests use apkdiff, others do not jobs: - job: ${{ parameters.jobName }} @@ -30,7 +29,6 @@ jobs: parameters: provisionClassic: false installTestSlicer: true - installApkDiff: ${{ parameters.installApkDiff }} installLegacyDotNet: false restoreNUnitConsole: false updateMono: false diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml index 17e3e068666..7482109b42a 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml @@ -2,7 +2,7 @@ parameters: job_name: 'mac_dotnetdevice_tests' - agent_count: 6 + agent_count: 8 stageCondition: succeeded() stages: @@ -50,7 +50,7 @@ stages: - template: run-sliced-nunit-tests.yaml parameters: testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll - testFilter: cat != TimeZoneInfo & cat != Localization & cat != SmokeTests $(ExcludedNUnitCategories) + testFilter: cat != TimeZoneInfo & cat != Localization $(ExcludedNUnitCategories) testRunTitle: MSBuildDeviceIntegration On Device - macOS testResultsTitle: TestResult-MSBuildDeviceIntegration-${{ parameters.job_name }} diff --git a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml index c61f394e2e4..09c1d8b5f2f 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml @@ -14,13 +14,13 @@ stages: testOS: macOS jobName: mac_msbuild_tests jobDisplayName: macOS > Tests > MSBuild - agentCount: 8 - testFilter: cat != SmokeTests + agentCount: 10 + testFilter: cat != Dummy # This is because $(ExcludedNUnitCategories) gets appended which starts with '&' - template: run-msbuild-tests.yaml parameters: testOS: Windows jobName: win_msbuild_tests jobDisplayName: Windows > Tests > MSBuild - agentCount: 4 - testFilter: cat != SmokeTests + agentCount: 6 + testFilter: cat != Dummy # This is because $(ExcludedNUnitCategories) gets appended which starts with '&' diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs index 3c451be0eb9..43d6b89a580 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs @@ -87,7 +87,6 @@ public void BuildAppWithSystemNamespace () } [Test] - [Category ("SmokeTests")] public void DesignTimeBuild ([Values(false, true)] bool isRelease, [Values (false, true)] bool useManagedParser, [Values (false, true)] bool useAapt2) { AssertAaptSupported (useAapt2); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs index 6bcc05cde0d..48ea5d3d6f4 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs @@ -57,7 +57,7 @@ void AssertProfiledAotBuildMessages(ProjectBuilder b) StringAssertEx.ContainsRegex (@$"Method.*emitted at", b.LastBuildOutput, "Should contain verbose AOT compiler output", RegexOptions.IgnoreCase); } - [Test, Category ("SmokeTests"), Category ("ProfiledAOT")] + [Test, Category ("ProfiledAOT")] public void BuildBasicApplicationReleaseProfiledAot ([Values (true, false)] bool enableLLVM) { if (Builder.UseDotNet && enableLLVM) { @@ -75,7 +75,7 @@ public void BuildBasicApplicationReleaseProfiledAot ([Values (true, false)] bool AssertProfiledAotBuildMessages (b); } - [Test, Category ("SmokeTests"), Category ("ProfiledAOT")] + [Test, Category ("ProfiledAOT")] public void BuildBasicApplicationReleaseWithCustomAotProfile () { var proj = new XamarinAndroidApplicationProject () { @@ -255,7 +255,7 @@ public void BuildAotApplicationAndÜmläüts (string supportedAbis, bool enableL [Test] [NonParallelizable] - [Category ("SmokeTests"), Category ("XamarinBuildDownload")] + [Category ("XamarinBuildDownload")] public void BuildAMassiveApp () { var testPath = Path.Combine ("temp", "BuildAMassiveApp"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs index b6f1a554ead..d258a865619 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs @@ -22,7 +22,6 @@ public class BindingBuildTest : BaseTest { [Test] [TestCaseSource (nameof (ClassParseOptions))] - [Category ("SmokeTests")] public void BuildBasicBindingLibrary (string classParser) { var targets = new List { @@ -154,7 +153,6 @@ public void BuildAarBindigLibraryWithNuGetPackageOfJar (string classParser) [Test] [TestCaseSource (nameof (ClassParseOptions))] [NonParallelizable] - [Category ("SmokeTests")] public void BuildLibraryZipBindigLibraryWithAarOfJar (string classParser) { var proj = new XamarinAndroidBindingProject () { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index 3c0a310055d..3d9f88b2cbe 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -100,7 +100,6 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b [Test] [TestCaseSource (nameof (CheckAssemblyCountsSource))] [NonParallelizable] - [Category ("SmokeTests")] public void CheckAssemblyCounts (bool isRelease, bool aot) { var proj = new XamarinFormsAndroidApplicationProject { @@ -145,7 +144,6 @@ public void CheckAssemblyCounts (bool isRelease, bool aot) // DotNet fails, see https://github.com/dotnet/runtime/issues/65484 // Enable the commented out signature (and AOT) once the above is fixed [Test] - [Category ("SmokeTests")] public void SmokeTestBuildWithSpecialCharacters ([Values (false, true)] bool forms, [Values (false /*, true*/)] bool aot) { var testName = "テスト"; @@ -281,7 +279,6 @@ public void CheckSequencePointGeneration (bool isRelease, bool monoSymbolArchive [Test] [NonParallelizable] - [Category ("SmokeTests")] public void BuildWithNativeLibraries ([Values (true, false)] bool isRelease) { var dll = new XamarinAndroidLibraryProject () { @@ -409,7 +406,6 @@ public void BuildWithNativeLibraryUnknownAbi () } [Test] - [Category ("SmokeTests")] public void BuildWithExternalJavaLibrary () { var path = Path.Combine ("temp", TestName); @@ -777,7 +773,7 @@ public interface OnFooListener } [Test] - [Category ("SmokeTests"), Category ("AOT")] + [Category ("AOT")] [NonParallelizable] public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enableMultiDex, [Values ("", "r8")] string linkTool) { @@ -1041,7 +1037,6 @@ public void CompileBeforeUpgradingNuGet () } [Test] - [Category ("SmokeTests")] [Category ("DotNetIgnore")] // .mdb and non-portable .pdb files not supported in .NET 5+ public void BuildBasicApplicationCheckPdb () { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 1e7064a39d5..679b7afc62e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -117,7 +117,6 @@ public void BuildBasicApplication ([ValueSource (nameof (SupportedTargetFramewor } [Test] - [Category ("SmokeTests")] public void BuildBasicApplicationThenMoveIt ([Values (true, false)] bool isRelease) { string path = Path.Combine (Root, "temp", TestName, "App1"); @@ -157,7 +156,6 @@ public static string GetLinkedPath (ProjectBuilder builder, bool isRelease, stri } [Test] - [Category ("SmokeTests")] public void BuildReleaseArm64 ([Values (false, true)] bool forms) { var proj = forms ? @@ -511,7 +509,7 @@ public void DuplicateRJavaOutput () } [Test] - [Category ("SmokeTests"), Category ("XamarinBuildDownload")] + [Category ("XamarinBuildDownload")] [NonParallelizable] // parallel NuGet restore causes failures public void BuildXamarinFormsMapsApplication ([Values (true, false)] bool multidex) { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DeferredBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DeferredBuildTest.cs index f53a7a2dd23..e486cf3c7a8 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DeferredBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DeferredBuildTest.cs @@ -8,7 +8,6 @@ namespace Xamarin.Android.Build.Tests public class DeferredBuildTest : BaseTest { [Test] - [Category ("SmokeTests")] public void SelectivelyRunUpdateAndroidResources () { var path = Path.Combine ("temp", TestName); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs index 136875eb436..9285060c65b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs @@ -137,7 +137,6 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context, } [Test] - [Category ("SmokeTests")] public void IncrementalDesignTimeBuild () { var proj = new XamarinFormsAndroidApplicationProject (); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/EnvironmentContentTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/EnvironmentContentTests.cs index 061dc191585..24b03b51b49 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/EnvironmentContentTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/EnvironmentContentTests.cs @@ -15,7 +15,6 @@ public class EnvironmentContentTests : BaseTest { [Test] [NonParallelizable] - [Category ("SmokeTests")] public void BuildApplicationWithMonoEnvironment ([Values ("", "Normal", "Offline")] string sequencePointsMode) { const string supportedAbis = "armeabi-v7a;x86"; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs index 51dc7b3cb14..06636e8da12 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs @@ -42,7 +42,6 @@ public void BasicApplicationRepetitiveBuild () } [Test] - [Category ("SmokeTests")] public void BasicApplicationRepetitiveReleaseBuild () { var proj = new XamarinAndroidApplicationProject () { IsRelease = true }; @@ -422,7 +421,6 @@ public Class2 () //https://github.com/xamarin/xamarin-android/issues/2247 [Test] - [Category ("SmokeTests")] [NonParallelizable] // Do not run timing sensitive tests in parallel public void AppProjectTargetsDoNotBreak () { @@ -566,7 +564,6 @@ public void ManifestMergerIncremental () } [Test] - [Category ("SmokeTests")] public void ProduceReferenceAssembly () { var path = Path.Combine ("temp", TestName); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs index 776526501fe..2e5dcb46203 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs @@ -771,7 +771,6 @@ public class TestActivity2 : FragmentActivity { } [Test] - [Category ("SmokeTests")] public void AllActivityAttributeProperties ([Values ("legacy", "manifestmerger.jar")] string manifestMerger) { var proj = new XamarinAndroidApplicationProject { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs index 8ff3b007fcb..0d04960bb38 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs @@ -350,7 +350,6 @@ public void CheckMetadataSkipItemsAreProcessedCorrectly () } [Test] - [Category ("SmokeTests")] public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true, false)] bool perAbiApk) { string ext = Environment.OSVersion.Platform != PlatformID.Unix ? ".bat" : ""; @@ -483,7 +482,6 @@ public void CheckAapt2WarningsDoNotGenerateErrors () } [Test] - [Category ("SmokeTests")] public void CheckAppBundle ([Values (true, false)] bool isRelease) { var proj = new XamarinAndroidApplicationProject () { @@ -512,7 +510,7 @@ public void CheckAppBundle ([Values (true, false)] bool isRelease) } [Test] - [Category ("SmokeTests"), Category ("DotNetIgnore")] // Xamarin.Forms version is too old, uses net45 MSBuild tasks + [Category ("DotNetIgnore")] // Xamarin.Forms version is too old, uses net45 MSBuild tasks public void NetStandardReferenceTest () { var netStandardProject = new DotNetStandard () { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs index e32a27319d5..60636a1f884 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs @@ -512,7 +512,6 @@ public void UpdateLayoutIdIsIncludedInDesigner ([Values(true, false)] bool useRt } [Test] - [Category ("SmokeTests")] public void RtxtGeneratorOutput () { var path = Path.Combine ("temp", TestName); @@ -545,7 +544,6 @@ public void RtxtGeneratorOutput () } [Test] - [Category ("SmokeTests")] public void CompareAapt2AndManagedParserOutput () { var path = Path.Combine ("temp", TestName); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index 5d991e35954..cd7d01d0ed5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -59,7 +59,6 @@ public class XASdkTests : BaseTest }; [Test] - [Category ("SmokeTests")] [TestCaseSource (nameof (DotNetBuildLibrarySource))] public void DotNetBuildLibrary (bool isRelease, bool duplicateAar, bool useDesignerAssembly) { @@ -542,7 +541,6 @@ public void GenerateResourceDesigner_false([Values (false, true)] bool useDesign } [Test] - [Category ("SmokeTests")] public void DotNetBuildBinding () { var proj = new XASdkProject (outputType: "Library"); @@ -861,7 +859,6 @@ public void SupportedOSPlatformVersion ([Values (21, 31)] int minSdkVersion) } [Test] - [Category ("SmokeTests")] public void DotNetBuildXamarinForms ([Values (true, false)] bool useInterpreter) { var proj = new XamarinFormsXASdkProject (); diff --git a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs index ac74bd613fa..4e37d31b556 100755 --- a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs @@ -329,7 +329,7 @@ public override void OnCreate () }; #pragma warning restore 414 - [Test, Category ("SmokeTests"), Category ("Debugger")] + [Test, Category ("Debugger")] [TestCaseSource (nameof(DebuggerTestCases))] [Retry (5)] public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool allowDeltaInstall, string username, string debugType) diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs index bb503c04ec7..73ed9b6530e 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -206,7 +206,7 @@ public void MonoSymbolicateAndroidStackTrace () } [Test] - [Category ("UsesDevice"), Category ("SmokeTests")] + [Category ("UsesDevice")] public void SmokeTestBuildAndRunWithSpecialCharacters () { var testName = "テスト"; diff --git a/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs b/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs index 6b02e4d3b59..f122402c3b2 100644 --- a/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs @@ -16,7 +16,7 @@ namespace Xamarin.Android.Build.Tests { [TestFixture] - [Category ("UsesDevice"), Category ("SmokeTests"), Category ("WearOS")] + [Category ("UsesDevice"), Category ("WearOS")] public class XASdkDeployTests : DeviceTest { static object [] DotNetInstallAndRunSource = new object [] {