Merge pull request #6377 from maddieclayton/ondemand

Move tests from on-demand to checkin

Author: Maddie Clayton

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.cs

@@ -26,6 +26,7 @@ public AEMExtensionTests(Xunit.Abstractions.ITestOutputHelper output)
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAEMExtensionBasicWindowsWAD()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionBasicWindowsWAD");
@@ -81,6 +82,7 @@ public void TestAEMExtensionAdvancedWindowsWAD()
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAEMExtensionAdvancedWindows()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedWindows");
@@ -107,6 +109,7 @@ public void TestAEMExtensionAdvancedLinux()
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAEMExtensionAdvancedWindowsMD()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-AEMExtensionAdvancedWindowsMD");

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.cs

@@ -41,6 +41,7 @@ public void TestHub()
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
 #endif
         public void TestHubWithDataFactoryParameter()
         {
@@ -52,6 +53,7 @@ public void TestHubWithDataFactoryParameter()
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
 #endif
         public void TestHubPiping()
         {

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/ZoneTests.cs

@@ -32,30 +32,35 @@ public void TestZoneCrud()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrud()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrud");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudRegistrationVirtualNetwork()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudRegistrationVnet");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudResolutionVirtualNetwork()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudResolutionVnet");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudByVirtualNetworkIds()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudByVirtualNetworkIds");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudByVirtualNetworkObjects()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudByVirtualNetworkObjects");

src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/ActionGroupsTests.cs

@@ -26,7 +26,7 @@ public ActionGroupsTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, "Scenario")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAddGetListSetRemoveActionGroup()
         {
             TestsController.NewInstance.RunPsTest("Test-AddGetListSetRemoveActionGroup");

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs

@@ -52,27 +52,31 @@ public void TestVirtualNetworkGatewayP2SAndSKU()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestSetVirtualNetworkGatewayCRUD()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-SetVirtualNetworkGatewayCRUD");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void VirtualNetworkGatewayActiveActiveFeatureTest()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayActiveActiveFeatureOperations");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void VirtualNetworkGatewayRouteApiTest()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayBgpRouteApi");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayP2SVpnProfile()
         {
@@ -90,6 +94,7 @@ public void VirtualNetworkGatewayIkeV2Test()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, Category.brooklynft)]
         public void VirtualNetworkGatewayVpnCustomIpsecPolicySetTest()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayVpnCustomIpsecPolicySet");

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/QueryTests.cs

@@ -35,6 +35,7 @@ public void TestSimpleQueryWithTimespan()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestExceptionWithSyntaxError()
         {
             RunDataPowerShellTest("Test-ExceptionWithSyntaxError");
@@ -48,6 +49,7 @@ public void TestExceptionWithShortWait()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAsJob()
         {
             RunDataPowerShellTest("Test-AsJob");

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

@@ -1376,6 +1376,7 @@ public void CancelsActiveDeployment()
         }
 
         [Fact(Skip = "Test produces different outputs since hashtable order is not guaranteed.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SerializeHashtableProperlyHandlesAllDataTypes()
         {
             Hashtable hashtable = new Hashtable();

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ActiveDirectoryTests.cs

@@ -514,6 +514,7 @@ public void TestGetADUserWithUPN()
         }
 
         [Fact(Skip = "Currently not working.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetADUserWithFPOUPN()
         {
             ResourcesController.NewInstance.RunPsTest("Test-GetADUserWithFPOUPN");

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/DeploymentTests.cs

@@ -27,6 +27,7 @@ public DeploymentTests(ITestOutputHelper output)
         }
 
         [Fact(Skip = "Need to implement storage client mock.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestValidateDeployment()
         {
             ResourcesController.NewInstance.RunPsTest("Test-ValidateDeployment");
@@ -42,6 +43,7 @@ public void TestNewDeploymentFromTemplateFile()
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNestedDeploymentFromTemplateFile()
         {
             ResourcesController.NewInstance.RunPsTest("Test-NestedDeploymentFromTemplateFile");
@@ -57,6 +59,7 @@ public void TestCrossResourceGroupDeploymentFromTemplateFile()
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSaveDeploymentTemplateFile()
         {
             ResourcesController.NewInstance.RunPsTest("Test-SaveDeploymentTemplateFile");
@@ -70,13 +73,15 @@ public void TestNestedErrorsDisplayed()
         }
 
         [Fact(Skip = "Fix acquisition of TenantId in KeyVault Test.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewDeploymentWithKeyVaultReference()
         {
             ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentWithKeyVaultReference");
         }
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewDeploymentWithComplexPramaters()
         {
             ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentWithComplexPramaters");

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/MoveResourceTest.cs

@@ -15,6 +15,7 @@
 namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
 {
     using ServiceManagemenet.Common.Models;
+    using WindowsAzure.Commands.ScenarioTest;
     using Xunit;
     using Xunit.Abstractions;
     public class MoveResourceTest
@@ -25,8 +26,7 @@ public MoveResourceTest(ITestOutputHelper output)
         }
 
         [Fact(Skip = "Need to re-record test")]
-        // TODO: test takes too long, reduce time and then add to Category.CheckIn
-        //[Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestMoveAzureResource()
         {
             ResourcesController.NewInstance.RunPsTest("Test-MoveAzureResource");

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.cs

@@ -91,6 +91,7 @@ public void TestResourceGroupWithPositionalParams()
         }
 
         [Fact(Skip = "TODO: Fix the broken test.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAzureTagsEndToEnd()
         {
             ResourcesController.NewInstance.RunPsTest("Test-AzureTagsEndToEnd");
@@ -105,12 +106,14 @@ public void TestNewDeploymentAndProviderRegistration()
 
         [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
         [Trait("Re-record", "ClientRuntime changes")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveDeployment()
         {
             ResourcesController.NewInstance.RunPsTest("Test-RemoveDeployment");
         }
 
         [Fact(Skip = "Doesn't add any value. Will improve negative tests in a future release")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNonExistingResourceGroupWithDebugStream()
         {
             ResourcesController.NewInstance.RunPsTest("Test-GetNonExistingResourceGroupWithDebugStream");

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs

@@ -164,6 +164,7 @@ public void RaGetByUPNWithExpandPrincipalGroups()
         }
 
         [Fact(Skip = "Fix the flaky test and token error and then re-record the test. Token from admin user is being used even when trying to use newly created user.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaUserPermissions()
         {
             User newUser = null;

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

@@ -47,7 +47,7 @@ public void TestCreateSecondaryDatabase()
         }
 
         [Fact]
-        [Trait(Category.Sql, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetReplicationLink()
         {
             RunPowerShellTest("Test-GetReplicationLink");

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs

@@ -28,6 +28,7 @@ public ElasticPoolCrudTests(ITestOutputHelper output) : base(output)
 
         // Currently the test runs too long to be marked as a check-in test.
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestElasticPoolCreate()
         {
             RunPowerShellTest("Test-CreateElasticPool");
@@ -48,6 +49,7 @@ public void TestVcoreElasticPoolCreateWithLicenseType()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestElasticPoolCreateWithZoneRedundancy()
         {
             RunPowerShellTest("Test-CreateElasticPoolWithZoneRedundancy");

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerDisasterRecoveryConfigurationTests.cs

@@ -26,7 +26,7 @@ public ServerDisasterRecoveryConfigurationTests(ITestOutputHelper output) : base
         }
 
         [Fact(Skip = "TODO fix the test failure")]
-        [Trait(Category.AcceptanceType, Category.Sql)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestServerDisasterRecoveryConfiguration()
         {
             RunPowerShellTest("Test-ServerDisasterRecoveryConfiguration");