Cleaning up tests and adding test for additional environment

Author: markcowl

src/Storage/Commands.Storage.Test/Common/Cmdlet/StorageContextDisconnectedTests.cs

@@ -50,6 +50,14 @@ public override void SetTokenCacheForProfile(IAzureContextContainer profile)
 
         class TestContextContainer : IAzureContextContainer
         {
+            List<IAzureEnvironment> _environments = new List<IAzureEnvironment>();
+            public TestContextContainer()
+            {
+                foreach(var environment in AzureEnvironment.PublicEnvironments)
+                {
+                    _environments.Add(environment.Value);
+                }
+            }
             public IEnumerable<IAzureAccount> Accounts
             {
                 get;
@@ -62,8 +70,8 @@ public IAzureContext DefaultContext
 
             public IEnumerable<IAzureEnvironment> Environments
             {
-                get;
-            } = new List<IAzureEnvironment>();
+                get { return _environments; }
+            } 
 
             public IDictionary<string, string> ExtendedProperties
             {
@@ -111,35 +119,46 @@ public void CanCreateStorageContextNameAndKey()
                 Assert.NotNull(storageContext);
                 Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
 
-                cmdlet = new NewAzureStorageContext
-                {
-                    CommandRuntime = mock,
-                    StorageAccountName = "contosostorage",
-                    Anonymous = true,
-                };
+            }
+            finally
+            {
+                AzureSMProfileProvider.SetInstance(() => smProvider, true);
+                AzureRmProfileProvider.SetInstance(() => rmProvider, true);
+            }
+        }
 
-                cmdlet.SetParameterSet("AnonymousAccount");
-                cmdlet.ExecuteCmdlet();
-                output = mock.OutputPipeline;
-                Assert.NotNull(output);
-                storageContext = output.First() as AzureStorageContext;
-                Assert.NotNull(storageContext);
-                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void CanCreateStorageContextInChinaCloud()
+        {
+            AzureSessionInitializer.InitializeAzureSession();
+            var smProvider = AzureSMProfileProvider.Instance;
+            var rmProvider = AzureRmProfileProvider.Instance;
+            AzureRmProfileProvider.SetInstance(() => new TestProfileProvider(), true);
+            AzureSMProfileProvider.SetInstance(() => new TestSMProfileProvider(), true);
+            try
+            {
+                var mock = new MockCommandRuntime();
 
-                cmdlet = new NewAzureStorageContext
+                AzureSMProfileProvider.Instance.Profile = null;
+                AzureRmProfileProvider.Instance.Profile = new TestContextContainer();
+                var cmdlet = new NewAzureStorageContext
                 {
                     CommandRuntime = mock,
                     StorageAccountName = "contosostorage",
-                    SasToken = "AAAAAAAA",
+                    StorageAccountKey = "AAAAAAAA",
+                    Environment = EnvironmentName.AzureChinaCloud
                 };
 
-                cmdlet.SetParameterSet("SasToken");
+                cmdlet.SetParameterSet("AccountNameAndKeyEnvironment");
                 cmdlet.ExecuteCmdlet();
-                output = mock.OutputPipeline;
+                var output = mock.OutputPipeline;
                 Assert.NotNull(output);
-                storageContext = output.First() as AzureStorageContext;
+                var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
                 Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
+                Assert.True(storageContext.BlobEndPoint.Contains(".cn"));
+
             }
             finally
             {
@@ -148,6 +167,7 @@ public void CanCreateStorageContextNameAndKey()
             }
         }
 
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanCreateStorageContextSASToken()