Add mock support and fix source formatting

markcowl · markcowl · commit a4a44040c192 · 2015-03-01T23:02:04.000-08:00
diff --git a/src/Common/Commands.Common/AzurePSCmdlet.cs b/src/Common/Commands.Common/AzurePSCmdlet.cs
@@ -47,14 +47,17 @@ static AzurePSCmdlet()
             }
 
             AzureSession.ClientFactory.UserAgents.Add(AzurePowerShell.UserAgentValue);
-            InitializeTokenCaches();
-            DefaultProfile = InitializeDefaultProfile();
-            CurrentProfile = DefaultProfile;
-            UpdateSessionStateForProfile(CurrentProfile);
-            AzureSession.DataStore = new DiskDataStore();
+            if (!TestMockSupport.RunningMocked)
+            {
+                InitializeTokenCaches();
+                DefaultProfile = InitializeDefaultProfile();
+                CurrentProfile = DefaultProfile;
+                UpdateSessionStateForProfile(CurrentProfile);
+                AzureSession.DataStore = new DiskDataStore();
+            }
         }
 
-                /// <summary>
+        /// <summary>
         /// Create the default profile, based on the default profile path
         /// </summary>
         /// <returns>The default prpofile, serialized from the default location on disk</returns>
@@ -68,7 +71,7 @@ protected static AzureProfile InitializeDefaultProfile()
                 }
                 catch
                 {
-                   // swallow exceptions in creating the profile from disk
+                    // swallow exceptions in creating the profile from disk
                 }
             }
 
@@ -138,9 +141,9 @@ private void InitializeProfile()
         {
             if (Profile == null)
             {
-               Profile = AzurePSCmdlet.CurrentProfile;
+                Profile = AzurePSCmdlet.CurrentProfile;
             }
-            
+
             UpdateSessionStateForProfile(Profile);
         }
 
diff --git a/src/Common/Commands.Profile/Models/AzureProfileSettings.cs b/src/Common/Commands.Profile/Models/AzureProfileSettings.cs
@@ -28,7 +28,7 @@ public class AzureProfileSettings
         public string SubscriptionId { get; set; }
 
         public string StorageAccount { get; set; }
-        
+
         public X509Certificate2 Certificate { get; set; }
 
         public PSCredential Credential { get; set; }
@@ -44,7 +44,7 @@ public static AzureProfileSettings Create(NewAzureProfileCommand command)
             return new AzureProfileSettings
             {
                 Environment = command.Environment,
-                SubscriptionId =  command.SubscriptionId,
+                SubscriptionId = command.SubscriptionId,
                 StorageAccount = command.StorageAccount,
                 Certificate = command.Certificate,
                 Credential = command.Credential,
@@ -53,6 +53,5 @@ public static AzureProfileSettings Create(NewAzureProfileCommand command)
                 AccountId = command.AccountId
             };
         }
-
     }
 }
diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/NewAzureProfileTests.ps1 b/src/ServiceManagement/Services/Commands.Test/Profile/NewAzureProfileTests.ps1
@@ -83,12 +83,11 @@ function Test-NewAzureProfileInRDFEMode
 {
     param([string] $token, [string] $user, [string] $sub)
     $profile = $(Create-Profile $token $user $sub)
-	Assert-AreEqual "AzureCloud" $profile.Context.Environment.Name
-	Clear-AzureProfile -Force
-	$locations = Get-AzureLocation -Profile $profile
-	Assert-NotNull $locations
-	Assert-True {$locations.Count -gt 1}
-
+    Assert-AreEqual "AzureCloud" $profile.Context.Environment.Name
+    Clear-AzureProfile -Force
+    $locations = Get-AzureLocation -Profile $profile
+    Assert-NotNull $locations
+    Assert-True {$locations.Count -gt 1}
 }
 
 <#
diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/ProfileClientHelper.cs b/src/ServiceManagement/Services/Commands.Test/Profile/ProfileClientHelper.cs
@@ -43,7 +43,6 @@ public class MockRdfeSubscriptionOperations : Microsoft.Azure.Subscriptions.Rdfe
 
         private MockRdfeSubscriptionOperations()
         {
-
         }
 
         /// <summary>
@@ -74,7 +73,6 @@ private Azure.Subscriptions.Rdfe.Models.Subscription CreateSubscription(string s
             };
         }
 
-
         public Task<Azure.Subscriptions.Rdfe.Models.SubscriptionListOperationResponse> ListAsync(System.Threading.CancellationToken cancellationToken)
         {
             var response = new Azure.Subscriptions.Rdfe.Models.SubscriptionListOperationResponse
@@ -100,7 +98,7 @@ private Azure.Subscriptions.Rdfe.Models.Subscription CreateSubscription(string s
     public class MockCsmSubscriptionClient : Microsoft.Azure.Subscriptions.Csm.SubscriptionClient
     {
         private IList<string> _subscriptions = new List<string>();
-        private IList<string> _tenants = new List<string>(); 
+        private IList<string> _tenants = new List<string>();
         public IList<String> ReturnedSubscriptions
         {
             get { return this._subscriptions; }
@@ -134,8 +132,8 @@ public override Azure.Subscriptions.Csm.ITenantOperations Tenants
 
     public class MockCsmTenantOperations : Microsoft.Azure.Subscriptions.Csm.ITenantOperations
     {
-        private IList<string> _tenants = new List<string> (); 
- 
+        private IList<string> _tenants = new List<string>();
+
         /// <summary>
         /// Create a tenant mock using the given set of tenants
         /// </summary>
@@ -152,16 +150,16 @@ public static MockCsmTenantOperations Create(IList<string> knownTenants)
             return operations;
         }
 
-       public Task<Azure.Subscriptions.Csm.Models.TenantListResult> ListAsync(System.Threading.CancellationToken cancellationToken)
-       {
-           var result = new Azure.Subscriptions.Csm.Models.TenantListResult
-           {
-               StatusCode = HttpStatusCode.OK,
-               TenantIds = CreateTenantList()
-           };
+        public Task<Azure.Subscriptions.Csm.Models.TenantListResult> ListAsync(System.Threading.CancellationToken cancellationToken)
+        {
+            var result = new Azure.Subscriptions.Csm.Models.TenantListResult
+            {
+                StatusCode = HttpStatusCode.OK,
+                TenantIds = CreateTenantList()
+            };
 
-           return Task.FromResult(result);
-       }
+            return Task.FromResult(result);
+        }
 
         private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(string tenantId)
         {
@@ -172,7 +170,6 @@ private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(s
             };
         }
 
-
         private IList<Azure.Subscriptions.Csm.Models.TenantIdDescription> CreateTenantList()
         {
             var result = new List<Azure.Subscriptions.Csm.Models.TenantIdDescription>();
@@ -183,12 +180,11 @@ private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(s
 
             return result;
         }
-
-     }
+    }
 
     public class MockCsmSubscriptionOperations : Microsoft.Azure.Subscriptions.Csm.ISubscriptionOperations
     {
-        private IList<string> _subscriptions = new List<string> (); 
+        private IList<string> _subscriptions = new List<string>();
 
         /// <summary>
         /// Create a subscription mock using the given set of subscriptions
@@ -236,6 +232,7 @@ public static MockCsmSubscriptionOperations Create(IList<string> knownSubscripti
 
             return Task.FromResult(result);
         }
+
         private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(string subscriptionId)
         {
             return new Azure.Subscriptions.Csm.Models.Subscription
@@ -247,7 +244,6 @@ private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(st
             };
         }
 
-
         private IList<Azure.Subscriptions.Csm.Models.Subscription> CreateSubscriptionList()
         {
             var result = new List<Azure.Subscriptions.Csm.Models.Subscription>();
@@ -259,6 +255,7 @@ private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(st
             return result;
         }
     }
+
     public static class ProfileClientHelper
     {
         public static Microsoft.Azure.Subscriptions.Rdfe.SubscriptionClient CreateRdfeSubscriptionClient(

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,17 @@ static AzurePSCmdlet()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`AzureSession.ClientFactory.UserAgents.Add(AzurePowerShell.UserAgentValue);`
`50`		`- InitializeTokenCaches();`
`51`		`- DefaultProfile = InitializeDefaultProfile();`
`52`		`- CurrentProfile = DefaultProfile;`
`53`		`- UpdateSessionStateForProfile(CurrentProfile);`
`54`		`- AzureSession.DataStore = new DiskDataStore();`
	`50`	`+ if (!TestMockSupport.RunningMocked)`
	`51`	`+ {`
	`52`	`+ InitializeTokenCaches();`
	`53`	`+ DefaultProfile = InitializeDefaultProfile();`
	`54`	`+ CurrentProfile = DefaultProfile;`
	`55`	`+ UpdateSessionStateForProfile(CurrentProfile);`
	`56`	`+ AzureSession.DataStore = new DiskDataStore();`
	`57`	`+ }`
`55`	`58`	`}`
`56`	`59`
`57`		`- /// <summary>`
	`60`	`+ /// <summary>`
`58`	`61`	`/// Create the default profile, based on the default profile path`
`59`	`62`	`/// </summary>`
`60`	`63`	`/// <returns>The default prpofile, serialized from the default location on disk</returns>`
`@@ -68,7 +71,7 @@ protected static AzureProfile InitializeDefaultProfile()`
`68`	`71`	`}`
`69`	`72`	`catch`
`70`	`73`	`{`
`71`		`- // swallow exceptions in creating the profile from disk`
	`74`	`+ // swallow exceptions in creating the profile from disk`
`72`	`75`	`}`
`73`	`76`	`}`
`74`	`77`
`@@ -138,9 +141,9 @@ private void InitializeProfile()`
`138`	`141`	`{`
`139`	`142`	`if (Profile == null)`
`140`	`143`	`{`
`141`		`- Profile = AzurePSCmdlet.CurrentProfile;`
	`144`	`+ Profile = AzurePSCmdlet.CurrentProfile;`
`142`	`145`	`}`
`143`		`-`
	`146`	`+`
`144`	`147`	`UpdateSessionStateForProfile(Profile);`
`145`	`148`	`}`
`146`	`149`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class AzureProfileSettings`
`28`	`28`	`public string SubscriptionId { get; set; }`
`29`	`29`
`30`	`30`	`public string StorageAccount { get; set; }`
`31`		`-`
	`31`	`+`
`32`	`32`	`public X509Certificate2 Certificate { get; set; }`
`33`	`33`
`34`	`34`	`public PSCredential Credential { get; set; }`
`@@ -44,7 +44,7 @@ public static AzureProfileSettings Create(NewAzureProfileCommand command)`
`44`	`44`	`return new AzureProfileSettings`
`45`	`45`	`{`
`46`	`46`	`Environment = command.Environment,`
`47`		`- SubscriptionId = command.SubscriptionId,`
	`47`	`+ SubscriptionId = command.SubscriptionId,`
`48`	`48`	`StorageAccount = command.StorageAccount,`
`49`	`49`	`Certificate = command.Certificate,`
`50`	`50`	`Credential = command.Credential,`
`@@ -53,6 +53,5 @@ public static AzureProfileSettings Create(NewAzureProfileCommand command)`
`53`	`53`	`AccountId = command.AccountId`
`54`	`54`	`};`
`55`	`55`	`}`
`56`		`-`
`57`	`56`	`}`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public class MockRdfeSubscriptionOperations : Microsoft.Azure.Subscriptions.Rdfe`
`43`	`43`
`44`	`44`	`private MockRdfeSubscriptionOperations()`
`45`	`45`	`{`
`46`		`-`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`/// <summary>`
`@@ -74,7 +73,6 @@ private Azure.Subscriptions.Rdfe.Models.Subscription CreateSubscription(string s`
`74`	`73`	`};`
`75`	`74`	`}`
`76`	`75`
`77`		`-`
`78`	`76`	`public Task<Azure.Subscriptions.Rdfe.Models.SubscriptionListOperationResponse> ListAsync(System.Threading.CancellationToken cancellationToken)`
`79`	`77`	`{`
`80`	`78`	`var response = new Azure.Subscriptions.Rdfe.Models.SubscriptionListOperationResponse`
`@@ -100,7 +98,7 @@ private Azure.Subscriptions.Rdfe.Models.Subscription CreateSubscription(string s`
`100`	`98`	`public class MockCsmSubscriptionClient : Microsoft.Azure.Subscriptions.Csm.SubscriptionClient`
`101`	`99`	`{`
`102`	`100`	`private IList<string> _subscriptions = new List<string>();`
`103`		`- private IList<string> _tenants = new List<string>();`
	`101`	`+ private IList<string> _tenants = new List<string>();`
`104`	`102`	`public IList<String> ReturnedSubscriptions`
`105`	`103`	`{`
`106`	`104`	`get { return this._subscriptions; }`
`@@ -134,8 +132,8 @@ public override Azure.Subscriptions.Csm.ITenantOperations Tenants`
`134`	`132`
`135`	`133`	`public class MockCsmTenantOperations : Microsoft.Azure.Subscriptions.Csm.ITenantOperations`
`136`	`134`	`{`
`137`		`- private IList<string> _tenants = new List<string> ();`
`138`		`-`
	`135`	`+ private IList<string> _tenants = new List<string>();`
	`136`	`+`
`139`	`137`	`/// <summary>`
`140`	`138`	`/// Create a tenant mock using the given set of tenants`
`141`	`139`	`/// </summary>`
`@@ -152,16 +150,16 @@ public static MockCsmTenantOperations Create(IList<string> knownTenants)`
`152`	`150`	`return operations;`
`153`	`151`	`}`
`154`	`152`
`155`		`- public Task<Azure.Subscriptions.Csm.Models.TenantListResult> ListAsync(System.Threading.CancellationToken cancellationToken)`
`156`		`- {`
`157`		`- var result = new Azure.Subscriptions.Csm.Models.TenantListResult`
`158`		`- {`
`159`		`- StatusCode = HttpStatusCode.OK,`
`160`		`- TenantIds = CreateTenantList()`
`161`		`- };`
	`153`	`+ public Task<Azure.Subscriptions.Csm.Models.TenantListResult> ListAsync(System.Threading.CancellationToken cancellationToken)`
	`154`	`+ {`
	`155`	`+ var result = new Azure.Subscriptions.Csm.Models.TenantListResult`
	`156`	`+ {`
	`157`	`+ StatusCode = HttpStatusCode.OK,`
	`158`	`+ TenantIds = CreateTenantList()`
	`159`	`+ };`
`162`	`160`
`163`		`- return Task.FromResult(result);`
`164`		`- }`
	`161`	`+ return Task.FromResult(result);`
	`162`	`+ }`
`165`	`163`
`166`	`164`	`private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(string tenantId)`
`167`	`165`	`{`
`@@ -172,7 +170,6 @@ private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(s`
`172`	`170`	`};`
`173`	`171`	`}`
`174`	`172`
`175`		`-`
`176`	`173`	`private IList<Azure.Subscriptions.Csm.Models.TenantIdDescription> CreateTenantList()`
`177`	`174`	`{`
`178`	`175`	`var result = new List<Azure.Subscriptions.Csm.Models.TenantIdDescription>();`
`@@ -183,12 +180,11 @@ private static Azure.Subscriptions.Csm.Models.TenantIdDescription CreateTenant(s`
`183`	`180`
`184`	`181`	`return result;`
`185`	`182`	`}`
`186`		`-`
`187`		`- }`
	`183`	`+ }`
`188`	`184`
`189`	`185`	`public class MockCsmSubscriptionOperations : Microsoft.Azure.Subscriptions.Csm.ISubscriptionOperations`
`190`	`186`	`{`
`191`		`- private IList<string> _subscriptions = new List<string> ();`
	`187`	`+ private IList<string> _subscriptions = new List<string>();`
`192`	`188`
`193`	`189`	`/// <summary>`
`194`	`190`	`/// Create a subscription mock using the given set of subscriptions`
`@@ -236,6 +232,7 @@ public static MockCsmSubscriptionOperations Create(IList<string> knownSubscripti`
`236`	`232`
`237`	`233`	`return Task.FromResult(result);`
`238`	`234`	`}`
	`235`	`+`
`239`	`236`	`private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(string subscriptionId)`
`240`	`237`	`{`
`241`	`238`	`return new Azure.Subscriptions.Csm.Models.Subscription`
`@@ -247,7 +244,6 @@ private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(st`
`247`	`244`	`};`
`248`	`245`	`}`
`249`	`246`
`250`		`-`
`251`	`247`	`private IList<Azure.Subscriptions.Csm.Models.Subscription> CreateSubscriptionList()`
`252`	`248`	`{`
`253`	`249`	`var result = new List<Azure.Subscriptions.Csm.Models.Subscription>();`
`@@ -259,6 +255,7 @@ private static Azure.Subscriptions.Csm.Models.Subscription CreateSubscription(st`
`259`	`255`	`return result;`
`260`	`256`	`}`
`261`	`257`	`}`
	`258`	`+`
`262`	`259`	`public static class ProfileClientHelper`
`263`	`260`	`{`
`264`	`261`	`public static Microsoft.Azure.Subscriptions.Rdfe.SubscriptionClient CreateRdfeSubscriptionClient(`