fix comments

Author: azdevxps

src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceGroupCompleter.cs

@@ -19,6 +19,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters
     using Management.Internal.Resources;
     using Management.Internal.Resources.Models;
     using Properties;
+    using Rest.Azure;
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
@@ -43,7 +44,7 @@ protected static IList<String> ResourceGroupNames
                     var contextHash = HashContext(context);
                     if (!_resourceGroupNamesDictionary.ContainsKey(contextHash))
                     {
-                        _resourceGroupNamesDictionary[contextHash] = new List<string>();
+                        var tempResourceGroupList = new List<string>();
                         try
                         {
                             var instance = AzureSession.Instance;
@@ -56,20 +57,11 @@ protected static IList<String> ResourceGroupNames
                             var resourceGroups = client.ResourceGroups.ListAsync();
                             if (resourceGroups.Wait(TimeSpan.FromSeconds(5)))
                             {
+                                tempResourceGroupList = CreateResourceGroupList(resourceGroups.Result);
                                 if (resourceGroups.Result != null)
                                 {
-                                    var resourceGroupList = resourceGroups.Result;
-                                    foreach (ResourceGroup resourceGroup in resourceGroupList)
-                                    {
-                                        _resourceGroupNamesDictionary[contextHash].Add(resourceGroup.Name);
-                                    }
+                                    _resourceGroupNamesDictionary[contextHash] = tempResourceGroupList;
                                 }
-#if DEBUG
-                                else
-                                {
-                                    throw new Exception("Result from client.ResourceGroups is null");
-                                }
-#endif
                             }
 #if DEBUG
                             else
@@ -85,9 +77,14 @@ protected static IList<String> ResourceGroupNames
                             throw ex;
 #endif
                         }
+
+                        return tempResourceGroupList;
                     }
 
-                    return _resourceGroupNamesDictionary[contextHash];
+                    else
+                    {
+                        return _resourceGroupNamesDictionary[contextHash];
+                    }
                 }
             }
         }
@@ -138,5 +135,24 @@ private static int HashContext(IAzureContext context)
         {
             return (context.Account.Id + context.Environment.Name + context.Subscription.Id + context.Tenant.Id).GetHashCode();
         }
+
+        public static List<string> CreateResourceGroupList(IPage<ResourceGroup> result)
+        {
+            var tempResourceGroupList = new List<string>();
+            if (result != null)
+            {
+                foreach (ResourceGroup resourceGroup in result)
+                {
+                    tempResourceGroupList.Add(resourceGroup.Name);
+                }
+            }
+#if DEBUG
+            else
+            {
+                throw new Exception("Result from client.ResourceGroups is null");
+            }
+#endif
+            return tempResourceGroupList;
+        }
     }
 }

src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj

@@ -203,7 +203,7 @@
     <Compile Include="ProfileController.cs" />
     <Compile Include="ProtectedFileProviderTests.cs" />
     <Compile Include="PSSerializationTests.cs" />
-    <Compile Include="ResourcGroupCompleterUnitTests.cs" />
+    <Compile Include="ResourceGroupCompleterUnitTests.cs" />
     <Compile Include="RPRegistrationDelegatingHandlerTests.cs" />
     <Compile Include="SessionInitializationTests.cs" />
     <Compile Include="SubscriptionCmdletTests.cs" />
@@ -287,4 +287,4 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>

src/ResourceManager/Profile/Commands.Profile.Test/ResourcGroupCompleterUnitTests.cs renamed to src/ResourceManager/Profile/Commands.Profile.Test/ResourceGroupCompleterUnitTests.cs

@@ -13,8 +13,14 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.Azure.Management.Internal.Resources;
+using Microsoft.Azure.Management.Internal.Resources.Models;
+using Microsoft.Rest.Azure.OData;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Moq;
+using System;
 using System.Collections.Generic;
+using System.Threading;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Profile.Test
@@ -82,5 +88,13 @@ public void MultipleResourceGroupsWithDefault()
             Assert.Collection(ResourceGroupCompleterAttribute.GetResourceGroups(resourceGroupsReturned, "test3"), e1 => Assert.Equal("test3", e1),
                 e2 => Assert.Equal("test1", e2), e3 => Assert.Equal("test2", e3), e4 => Assert.Equal("test4", e4));
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ThrowsErrorWhenResultNull()
+        {
+            var ex = Assert.Throws<Exception>(() => ResourceGroupCompleterAttribute.CreateResourceGroupList(null));
+            Assert.Equal(ex.Message, "Result from client.ResourceGroups is null");
+        }
     }
 }