Unit tests.

sergey-shandar · sergey-shandar · commit 381a9869cab0 · 2017-11-14T14:24:56.000-08:00
diff --git a/experiments/Azure.Experiments/Azure.Experiments/CreateOrUpdateAsyncOperation.cs b/experiments/Azure.Experiments/Azure.Experiments/CreateOrUpdateAsyncOperation.cs
@@ -4,9 +4,9 @@
 
 namespace Microsoft.Azure.Experiments
 {
-    public static class ResourceOperations
+    public static class CreateOrUpdateAsyncOperation
     {
-        public static async Task<IState> CreateAsync<Config>(
+        public static async Task<IState> CreateOrUpdateAsync<Config>(
             this IResourceConfig<Config> config,
             IClient client,
             IState current,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/GetAsyncOperation.cs b/experiments/Azure.Experiments/Azure.Experiments/GetAsyncOperation.cs
@@ -6,9 +6,9 @@
 
 namespace Microsoft.Azure.Experiments
 {
-    public static class CurrentState
+    public static class GetAsyncOperation
     {
-        public static async Task<IState> GetState<Config>(
+        public static async Task<IState> GetAsync<Config>(
             this IResourceConfig<Config> resourceConfig,
             IClient client,
             CancellationToken cancellationToken)
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkPolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkPolicy.cs
@@ -16,7 +16,18 @@ public static class VirtualNetworkPolicy
                     p.ResourceGroupName, p.Name, p.Config, p.CancellationToken));
 
         public static ResourceConfig<VirtualNetwork> CreateVirtualNetworkConfig(
-            this ResourceConfig<ResourceGroup> resourceGroup, string name)
-            => Policy.CreateConfig(resourceGroup, name);
+            this ResourceConfig<ResourceGroup> resourceGroup,
+            string name,
+            string addressPrefix)
+            => Policy.CreateConfig(
+                resourceGroup,
+                name,
+                _ => new VirtualNetwork
+                {
+                    AddressSpace = new AddressSpace
+                    {
+                        AddressPrefixes = new[] { addressPrefix }
+                    }
+                });
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Old/Compute/VirtualMachineObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Old/Compute/VirtualMachineObject.cs
@@ -1,4 +1,5 @@
 ﻿using Azure.Experiments.Network;
+using Microsoft.Azure.Experiments;
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using System.Threading.Tasks;
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Old/Context.cs b/experiments/Azure.Experiments/Azure.Experiments/Old/Context.cs
@@ -1,24 +1,14 @@
-﻿using Microsoft.Azure.Management.Network;
-using Microsoft.Rest;
+﻿using Microsoft.Azure.Experiments;
+using Microsoft.Azure.Management.Network;
 
 namespace Azure.Experiments
 {
-    public class Context
+    public static class ContextEx
     {
-        public Context(ServiceClientCredentials credentials, string subscriptionId)
-        {
-            Credentials = credentials;
-            SubscriptionId = subscriptionId;
-        }
-
-        public ServiceClientCredentials Credentials { get; }
-
-        public string SubscriptionId { get; }
-
-        public NetworkManagementClient CreateNetwork()
-            => new NetworkManagementClient(Credentials)
+        public static NetworkManagementClient CreateNetwork(this Context context)
+            => new NetworkManagementClient(context.Credentials)
             {
-                SubscriptionId = SubscriptionId
+                SubscriptionId = context.SubscriptionId
             };
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Old/ResourceGroupObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Old/ResourceGroupObject.cs
@@ -1,6 +1,7 @@
 ﻿using Microsoft.Azure.Management.ResourceManager.Models;
 using Microsoft.Azure.Management.ResourceManager;
 using System.Threading.Tasks;
+using Microsoft.Azure.Experiments;
 
 namespace Azure.Experiments
 {
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Parameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Parameters.cs
@@ -1,11 +1,13 @@
-﻿using System.Collections.Concurrent;
+﻿using System.Linq;
 
 namespace Microsoft.Azure.Experiments
 {
     public static class Parameters
     {
         public static IState GetParameters<Config>(
-            string subscription, string location, IResourceConfig<Config> config)
+            this IResourceConfig<Config> config,
+            string subscription, 
+            string location)
             where Config : class
         {
             var visitor = new Visitor(subscription, location);
@@ -21,12 +23,19 @@ public Visitor(string subscription, string location)
                 Location = location;
             }
 
+            public object GetUntyped(IResourceConfig config)
+                => Result.GetOrAddUntyped(config, () => config.Apply(this));
+
             public Config Get<Config>(IResourceConfig<Config> config)
                 where Config : class
-                => Result.GetOrAdd(config, () => config.Apply(this) as Config);
+                => GetUntyped(config) as Config;
 
             public object Visit<Config>(ResourceConfig<Config> config) where Config : class
             {
+                foreach (var d in config.Dependencies)
+                {
+                    GetUntyped(d);
+                }
                 var p = config.CreateConfig(Subscription);
                 config.Policy.SetLocation(p, Location);
                 return p;
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourcePolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourcePolicy.cs
@@ -24,6 +24,7 @@ public ResourcePolicy(
             Func<Config, string> getLocation,
             Action<Config, string> setLocation)
         {
+            GetId = getId;
             GetAsync = getAsync;
             CreateOrUpdateAsync = createOrUpdateAsync;
             GetLocation = getLocation;
diff --git a/experiments/Azure.Experiments/Tests/AuthenticationResponse.cs b/experiments/Azure.Experiments/Tests/AuthenticationResponse.cs
@@ -1,4 +1,4 @@
-﻿namespace Azure.Experiments.Tests
+﻿namespace Microsoft.Azure.Experiments.Tests
 {
     internal sealed class AuthenticationResponse
     {
diff --git a/experiments/Azure.Experiments/Tests/Client.cs b/experiments/Azure.Experiments/Tests/Client.cs
@@ -0,0 +1,36 @@
+﻿using Microsoft.Azure.Management.Network;
+using Microsoft.Azure.Management.ResourceManager;
+using System;
+
+namespace Microsoft.Azure.Experiments.Tests
+{
+    class Client : IClient
+    {
+        public Client(Context context)
+        {
+            Context = context;
+        }
+
+        public Context Context { get; }
+
+        public T GetClient<T>()
+            where T: class, IDisposable
+        {
+            if (typeof(T) == typeof(INetworkManagementClient))
+            {
+                return new NetworkManagementClient(Context.Credentials)
+                {
+                    SubscriptionId = Context.SubscriptionId
+                } as T;
+            }
+            else if (typeof(T) == typeof(IResourceManagementClient))
+            {
+                return new ResourceManagementClient(Context.Credentials)
+                {
+                    SubscriptionId = Context.SubscriptionId
+                } as T;
+            }
+            throw new Exception("unknown client type");
+        }
+    }
+}
diff --git a/experiments/Azure.Experiments/Tests/Configuration.cs b/experiments/Azure.Experiments/Tests/Configuration.cs
@@ -1,4 +1,4 @@
-﻿namespace Azure.Experiments.Tests
+﻿namespace Microsoft.Azure.Experiments.Tests
 {
     internal sealed class Configuration
     {
diff --git a/experiments/Azure.Experiments/Tests/Credentials.cs b/experiments/Azure.Experiments/Tests/Credentials.cs
@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using System.IO;
 
-namespace Azure.Experiments.Tests
+namespace Microsoft.Azure.Experiments.Tests
 {
     internal static class Credentials
     {
diff --git a/experiments/Azure.Experiments/Tests/KeyValuePair.cs b/experiments/Azure.Experiments/Tests/KeyValuePair.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace Azure.Experiments.Tests
+namespace Microsoft.Azure.Experiments.Tests
 {
     internal static class KeyValuePair
     {
diff --git a/experiments/Azure.Experiments/Tests/Old/ComputeTest.cs b/experiments/Azure.Experiments/Tests/Old/ComputeTest.cs
@@ -8,61 +8,61 @@ namespace Azure.Experiments.Tests
 {
     public class ComputeTest
     {
-        [Fact]
+        //[Fact]
         public async Task ResourceGroupTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "My");
             //
             var info = await rg.GetOrNullAsync();
             var infoCreate = await rg.GetOrCreateAsync();
             // await rg.DeleteAsync(c);
         }
 
-        [Fact]
+        //[Fact]
         public async Task VirtualNetworkTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "My1");
             var vn = new VirtualNetworkObject(c.CreateNetwork(), "My1", rg, "192.168.0.0/16");
             //
             var info = await vn.GetOrNullAsync();
             var infoCreate = await vn.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task PublicIpAddressTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyPIA");
             var pia = new PublicIpAddressObject(c.CreateNetwork(), "MyPIA", rg);
             //
             var info = await pia.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task NetworkSecurityGroupTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyNSG");
             var nsg = new NetworkSecurityGroupObject(c.CreateNetwork(), "MyNSG", rg);
             var info = await nsg.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task SubnetTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "MySubnet");
             var vn = new VirtualNetworkObject(c.CreateNetwork(), "MySubnet", rg, "192.168.0.0/16");
             var subnet = new SubnetObject("MySubnet", vn, "192.168.1.0/24");
             var info = await subnet.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task NetworkInterfaceObject()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var network = c.CreateNetwork();
             var rg = new ResourceGroupObject(c, "MyNI");
             var vn = new VirtualNetworkObject(network, "MyNI", rg, "192.168.0.0/16");
@@ -73,10 +73,10 @@ public async Task NetworkInterfaceObject()
             var info = await ni.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task VmObject()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var network = c.CreateNetwork();
             var rg = new ResourceGroupObject(c, "MyVM");
             var vn = new VirtualNetworkObject(network, "MyVM", rg, "192.168.0.0/16");
@@ -88,10 +88,10 @@ public async Task VmObject()
             var info = await vm.GetOrCreateAsync();
         }
 
-        [Fact]
+        //[Fact]
         public async Task Test1()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var client = new ComputeManagementClient(c.Credentials)
             {
                 SubscriptionId = c.SubscriptionId
diff --git a/experiments/Azure.Experiments/Tests/Old/UnitTests.cs b/experiments/Azure.Experiments/Tests/Old/UnitTests.cs
@@ -1,5 +1,6 @@
 ﻿using Azure.Experiments.Compute;
 using Azure.Experiments.Network;
+using Microsoft.Azure.Experiments;
 using Microsoft.Rest;
 using Xunit;
 
@@ -36,7 +37,7 @@ public void PublicIpAddressObjectTest()
         //[Fact]
         public void NetworkSecurityGroupTest()
         {
-            var c = Credentials.Get();
+            var c = Microsoft.Azure.Experiments.Tests.Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyNSG");
             var nsg = new NetworkSecurityGroupObject(c.CreateNetwork(), "MyNSG", rg);
             Assert.Equal(2, nsg.Priority);
diff --git a/experiments/Azure.Experiments/Tests/ResourceGroupTest.cs b/experiments/Azure.Experiments/Tests/ResourceGroupTest.cs
@@ -0,0 +1,57 @@
+﻿using Microsoft.Azure.Experiments.ResourceManager;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Azure.Experiments.Tests
+{
+    public class ResourceGroupTest
+    {
+        [Fact]
+        public void CreateConfigTest()
+        {
+            var rg = ResourceGroupPolicy.CreateResourceGroupConfig("new");
+            var id = rg.GetId("12345").IdToString();
+            Assert.Equal("/subscriptions/12345/resourceGroups/new", id);
+        }
+
+        [Fact]
+        public async Task GetAsyncTest()
+        {
+            var rg = ResourceGroupPolicy.CreateResourceGroupConfig("new");
+            var client = new Client(Credentials.Get());
+            var state = await rg.GetAsync(client, new CancellationToken());
+            var location = state.GetLocation(rg);
+            Assert.Null(location);
+        }
+
+        [Fact]
+        public async Task CreateParameterTest()
+        {
+            var rg = ResourceGroupPolicy.CreateResourceGroupConfig("new");
+            var client = new Client(Credentials.Get());
+            var state = await rg.GetAsync(client, new CancellationToken());
+            var location = state.GetLocation(rg);
+            var parameters = rg.GetParameters(client.Context.SubscriptionId, "eastus");
+            var rgc = parameters.GetOrNull(rg);
+            Assert.Equal("eastus", rgc.Location);
+        }
+
+        [Fact]
+        public async Task CreateAsyncTest()
+        {
+            var rg = ResourceGroupPolicy.CreateResourceGroupConfig("new1");
+            var client = new Client(Credentials.Get());
+            var state = await rg.GetAsync(client, new CancellationToken());
+            var location = state.GetLocation(rg);
+            var parameters = rg.GetParameters(client.Context.SubscriptionId, "eastus");
+            var rgc = parameters.GetOrNull(rg);
+            var createState = await rg.CreateOrUpdateAsync(
+                client, state, parameters, new CancellationToken());
+            var rgcc = createState.GetOrNull(rg);
+            Assert.Equal("eastus", rgcc.Location);
+            Assert.Equal("new1", rgcc.Name);
+            Assert.Equal(rg.GetId(client.Context.SubscriptionId).IdToString(), rgcc.Id);
+        }
+    }
+}
diff --git a/experiments/Azure.Experiments/Tests/Tests.csproj b/experiments/Azure.Experiments/Tests/Tests.csproj
@@ -7,7 +7,7 @@
 
     <AssemblyName>Tests</AssemblyName>
 
-    <RootNamespace>Azure.Experiments.Tests</RootNamespace>
+    <RootNamespace>Microsoft.Azure.Experiments.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/experiments/Azure.Experiments/Tests/TokenProvider.cs b/experiments/Azure.Experiments/Tests/TokenProvider.cs
@@ -6,7 +6,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace Azure.Experiments.Tests
+namespace Microsoft.Azure.Experiments.Tests
 {
     sealed class TokenProvider : ITokenProvider
     {           
diff --git a/experiments/Azure.Experiments/Tests/VirtualNetworkTest.cs b/experiments/Azure.Experiments/Tests/VirtualNetworkTest.cs

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Azure.Experiments`
`6`	`6`	`{`
`7`		`- public static class ResourceOperations`
	`7`	`+ public static class CreateOrUpdateAsyncOperation`
`8`	`8`	`{`
`9`		`- public static async Task<IState> CreateAsync<Config>(`
	`9`	`+ public static async Task<IState> CreateOrUpdateAsync<Config>(`
`10`	`10`	`this IResourceConfig<Config> config,`
`11`	`11`	`IClient client,`
`12`	`12`	`IState current,`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Azure.Experiments`
`8`	`8`	`{`
`9`		`- public static class CurrentState`
	`9`	`+ public static class GetAsyncOperation`
`10`	`10`	`{`
`11`		`- public static async Task<IState> GetState<Config>(`
	`11`	`+ public static async Task<IState> GetAsync<Config>(`
`12`	`12`	`this IResourceConfig<Config> resourceConfig,`
`13`	`13`	`IClient client,`
`14`	`14`	`CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Azure.Experiments.Network;`
	`2`	`+using Microsoft.Azure.Experiments;`
`2`	`3`	`using Microsoft.Azure.Management.Compute;`
`3`	`4`	`using Microsoft.Azure.Management.Compute.Models;`
`4`	`5`	`using System.Threading.Tasks;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Microsoft.Azure.Management.ResourceManager.Models;`
`2`	`2`	`using Microsoft.Azure.Management.ResourceManager;`
`3`	`3`	`using System.Threading.Tasks;`
	`4`	`+using Microsoft.Azure.Experiments;`
`4`	`5`
`5`	`6`	`namespace Azure.Experiments`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public ResourcePolicy(`
`24`	`24`	`Func<Config, string> getLocation,`
`25`	`25`	`Action<Config, string> setLocation)`
`26`	`26`	`{`
	`27`	`+ GetId = getId;`
`27`	`28`	`GetAsync = getAsync;`
`28`	`29`	`CreateOrUpdateAsync = createOrUpdateAsync;`
`29`	`30`	`GetLocation = getLocation;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Azure.Experiments.Tests`
	`1`	`+namespace Microsoft.Azure.Experiments.Tests`
`2`	`2`	`{`
`3`	`3`	`internal sealed class AuthenticationResponse`
`4`	`4`	`{`