Resolved build errors in Resource Tests

Author: Hao Chen

src/CLU/Microsoft.Azure.Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

@@ -129,7 +129,6 @@ private IPage<T> GetPagableType<T>(List<T> collection)
         private void SetupListForResourceGroupAsync(string name, List<GenericResource> result)
         {
             resourceOperationsMock.Setup(f => f.ListWithHttpMessagesAsync(
-                null,
                 null,
                 null,
                 new CancellationToken()))
@@ -141,7 +140,6 @@ private void SetupListForResourceGroupAsync(string name, List<GenericResource> r
         private void SetupListForResourceGroupAsync(string name, IPage<GenericResource> result)
         {
             resourceOperationsMock.Setup(f => f.ListAsync(
-                null,
                 null,
                 new CancellationToken()))
                     .Returns(Task.Factory.StartNew(() => result));
@@ -168,7 +166,7 @@ public ResourceClientTests()
             deploymentOperationsMock = new Mock<IDeploymentOperationsOperations>();
             //eventDataOperationsMock = new Mock<IEventDataOperations>();
             providersMock = new Mock<IProvidersOperations>();
-            providersMock.Setup(f => f.ListWithHttpMessagesAsync(It.IsAny<int?>(), null, new CancellationToken()))
+            providersMock.Setup(f => f.ListWithHttpMessagesAsync(null, null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() =>
                 new AzureOperationResponse<IPage<Provider>>()
                 {
@@ -328,7 +326,7 @@ public void NewResourceGroupChecksForPermissionForExistingResource()
                 new CancellationToken()))
                     .Returns(Task.Factory.StartNew(() => new ResourceGroup() { Name = parameters.ResourceGroupName, Location = parameters.Location } ));
 
-            resourceOperationsMock.Setup(f => f.ListAsync(null, null, It.IsAny<CancellationToken>()))
+            resourceOperationsMock.Setup(f => f.ListAsync(null, It.IsAny<CancellationToken>()))
                 .Returns(() => Task.Factory.StartNew(() => 
                 {
                     var resources = new List<GenericResource>()
@@ -883,7 +881,7 @@ public void GetResourceWithSomeParametersReturnsList()
             resourceGroupMock.Setup(f => f.CheckExistenceAsync(parameters.ResourceGroupName, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (bool?) true));
 
-            resourceOperationsMock.Setup(f => f.ListAsync(null, null, It.IsAny<CancellationToken>()))
+            resourceOperationsMock.Setup(f => f.ListAsync(null, It.IsAny<CancellationToken>()))
                 .Returns(() => Task.Factory.StartNew(() => GetPagableType(new List<GenericResource>(new[]
                         {
                             (GenericResource) new Resource(location: "West US", id: null, name: "foo", type: null, tags: null),
@@ -1624,7 +1622,7 @@ public void GetsAllResourcesUsingResourceType()
             var listResult = new List<GenericResource>() { resource1, resource2 };
             var pagableResult = new Page<GenericResource>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceOperationsMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceOperationsMock.Setup(f => f.ListAsync(null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<GenericResource>)pagableResult))
                 .Callback((GenericResourceFilter p, CancellationToken ct) => { actualParameters = p; });
 
@@ -1645,7 +1643,7 @@ public void GetsAllResourceGroupResources()
             var listResult = new List<GenericResource>() { resource1, resource2 };
             var pagableResult = new Page<GenericResource>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceOperationsMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceOperationsMock.Setup(f => f.ListAsync(null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<GenericResource>)pagableResult))
                 .Callback((GenericResourceFilter p, CancellationToken ct) => { actualParameters = p; });
 
@@ -1700,7 +1698,7 @@ public void GetsAllResourceGroups()
             var listResult = new List<ResourceGroup>() { resourceGroup1, resourceGroup2, resourceGroup3, resourceGroup4 };
             var pagableResult = new Page<ResourceGroup>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceGroupMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceGroupMock.Setup(f => f.ListAsync(null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<ResourceGroup>) pagableResult));
             SetupListForResourceGroupAsync(resourceGroup1.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
             SetupListForResourceGroupAsync(resourceGroup2.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
@@ -1731,7 +1729,7 @@ public void GetsAllResourceGroupsWithDetails()
             var listResult = new List<ResourceGroup>() { resourceGroup1, resourceGroup2, resourceGroup3, resourceGroup4 };
             var pagableResult = new Page<ResourceGroup>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceGroupMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceGroupMock.Setup(f => f.ListAsync( null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<ResourceGroup>)pagableResult));
             SetupListForResourceGroupAsync(resourceGroup1.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
             SetupListForResourceGroupAsync(resourceGroup2.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
@@ -1766,7 +1764,7 @@ public void GetsResourceGroupsFilteredByTags()
             var listResult = new List<ResourceGroup>() { resourceGroup1, resourceGroup2, resourceGroup3, resourceGroup4 };
             var pagableResult = new Page<ResourceGroup>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceGroupMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceGroupMock.Setup(f => f.ListAsync(null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<ResourceGroup>)pagableResult));
             SetupListForResourceGroupAsync(resourceGroup1.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
             SetupListForResourceGroupAsync(resourceGroup2.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
@@ -1819,7 +1817,7 @@ public void GetsResourceGroupsFilteredByTagsWithDetails()
             var listResult = new List<ResourceGroup>() { resourceGroup1, resourceGroup2, resourceGroup3, resourceGroup4 };
             var pagableResult = new Page<ResourceGroup>();
             System.Reflection.TypeExtensions.GetProperty(pagableResult.GetType(), "Items").SetValue(pagableResult, listResult);
-            resourceGroupMock.Setup(f => f.ListAsync(null, null, new CancellationToken()))
+            resourceGroupMock.Setup(f => f.ListAsync(null, new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => (IPage<ResourceGroup>)pagableResult));
             SetupListForResourceGroupAsync(resourceGroup1.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
             SetupListForResourceGroupAsync(resourceGroup2.Name, new List<GenericResource>() { CreateGenericResource(null, null, "resource") });
@@ -2095,7 +2093,6 @@ public void FiltersResourceGroupDeployments()
                 resourceGroupName,
                 null,
                 null,
-                null,
                 new CancellationToken()))
                 .Returns(Task.Factory.StartNew(() => new AzureOperationResponse<IPage<DeploymentExtended>>()
                 {
@@ -2204,7 +2201,6 @@ public void CancelsActiveDeployment()
                 resourceGroupName,
                 null,
                 null,
-                null,
                 It.IsAny<CancellationToken>()))
                 .Returns(Task.Factory.StartNew(() => result));
 

src/CLU/Microsoft.Azure.Commands.Resources.Test/Providers/GetAzureProviderCmdletTests.cs

@@ -263,7 +263,7 @@ private void ResetCalls()
         private void VerifyGetCallPatternAndReset()
         {
             this.providerOperationsMock.Verify(f => f.GetWithHttpMessagesAsync(It.IsAny<string>(), null, It.IsAny<CancellationToken>()), Times.Once());
-            this.providerOperationsMock.Verify(f => f.ListWithHttpMessagesAsync(It.IsAny<int?>(), null, It.IsAny<CancellationToken>()), Times.Never);
+            this.providerOperationsMock.Verify(f => f.ListWithHttpMessagesAsync(null, null, It.IsAny<CancellationToken>()), Times.Never);
             this.providerOperationsMock.Verify(f => f.ListNextWithHttpMessagesAsync(It.IsAny<string>(), null, It.IsAny<CancellationToken>()), Times.Never);
             this.commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<object>(), It.IsAny<bool>()), Times.Once());
             this.ResetCalls();
@@ -274,7 +274,7 @@ private void VerifyGetCallPatternAndReset()
         /// </summary>
         private void VerifyListCallPatternAndReset()
         {
-            this.providerOperationsMock.Verify(f => f.ListWithHttpMessagesAsync(It.IsAny<int?>(), null, It.IsAny<CancellationToken>()), Times.Once());
+            this.providerOperationsMock.Verify(f => f.ListWithHttpMessagesAsync(null, null, It.IsAny<CancellationToken>()), Times.Once());
             this.providerOperationsMock.Verify(f => f.ListNextWithHttpMessagesAsync(It.IsAny<string>(), null, It.IsAny<CancellationToken>()), Times.Never());
             this.commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<object>(), It.IsAny<bool>()), Times.Once());
 

src/CLU/Microsoft.Azure.Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs

@@ -151,7 +151,7 @@ public void RaUserPermissions()
                     newUser = controllerAdmin.GraphClient.User.Create(parameter);
 
                     resourceGroup = controllerAdmin.ResourceManagementClient.ResourceGroups
-                                        .List(null, null)
+                                        .List(null)
                                         .First();
 
                     // Wait to allow newly created object changes to propagate