Respond to PR comments, regenerate code for tests

Azure · Oct 14, 2015 · 2acb4ee · 2acb4ee
1 parent 73e51d2
commit 2acb4ee
Show file tree

Hide file tree

Showing 43 changed files with 16 additions and 117 deletions.
diff --git a/AutoRest/Generators/Azure.Common/Azure.Common/AzureCodeGenerator.cs b/AutoRest/Generators/Azure.Common/Azure.Common/AzureCodeGenerator.cs
@@ -219,7 +219,7 @@ public static void AddParameterGroups(ServiceClient serviceClient)
 
             foreach (Method method in serviceClient.Methods)
             {
-                //TODO: Does this group name need to be normalized later, or does that already happen?
+                //This group name is normalized by each languages code generator later, so it need not happen here.
                 Dictionary<string, List<Property>> properties = new Dictionary<string, List<Property>>();
                 foreach (Parameter parameter in method.Parameters)
                 {
@@ -241,10 +241,10 @@ public static void AddParameterGroups(ServiceClient serviceClient)
                             properties[parameterGroupName].Add(new Property()
                                 {
                                     IsReadOnly = false, //Since these properties are used as parameters they are never read only
-                                    Name = CodeNamer.PascalCase(parameter.Name),
+                                    Name = parameter.Name,
                                     IsRequired = parameter.IsRequired,
                                     DefaultValue = parameter.DefaultValue,
-                                    //Constraints = parameter.Constraints, TODO do these need to be copied?
+                                    //Constraints = parameter.Constraints, Omit these since we don't want to perform parameter validation
                                     Documentation = parameter.Documentation,
                                     Type = parameter.Type,
                                     SerializedName = null //Parameter is never serialized directly

diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
@@ -690,31 +690,31 @@ public void CustomNamedRequestIdTest()
         [Fact]
         public void ParameterGroupingTests()
         {
-            const int body = 1234;
-            const string header = "header";
-            const int query = 21;
-            const string path = "path";
+            const int bodyParameter = 1234;
+            const string headerParameter = "header";
+            const int queryParameter = 21;
+            const string pathParameter = "path";
 
             using (var client = new AutoRestParameterGroupingTestService(
                 Fixture.Uri, 
                 new TokenCredentials(Guid.NewGuid().ToString())))
             {
                 //Valid required parameters
-                ParameterGroupingPostRequiredParameters requiredParameters = new ParameterGroupingPostRequiredParameters(body, path)
+                ParameterGroupingPostRequiredParameters requiredParameters = new ParameterGroupingPostRequiredParameters(bodyParameter, pathParameter)
                     {
-                        Header = header,
-                        Query = query
+                        Header = headerParameter,
+                        Query = queryParameter
                     };
 
                 client.ParameterGrouping.PostRequired(requiredParameters);
 
                 //Required parameters but null optional parameters
-                requiredParameters = new ParameterGroupingPostRequiredParameters(body, path);
+                requiredParameters = new ParameterGroupingPostRequiredParameters(bodyParameter, pathParameter);
 
                 client.ParameterGrouping.PostRequired(requiredParameters);
 
                 //Required parameters object is not null, but a required property of the object is
-                requiredParameters = new ParameterGroupingPostRequiredParameters(null, path);
+                requiredParameters = new ParameterGroupingPostRequiredParameters(null, pathParameter);
                 Assert.Throws<ValidationException>(() => client.ParameterGrouping.PostRequired(requiredParameters));
 
                 //null required parameters
@@ -723,8 +723,8 @@ public void ParameterGroupingTests()
                 //Valid optional parameters
                 ParameterGroupingPostOptionalParameters optionalParameters = new ParameterGroupingPostOptionalParameters()
                     {
-                        Header = header,
-                        Query = query
+                        Header = headerParameter,
+                        Query = queryParameter
                     };
 
                 client.ParameterGrouping.PostOptional(optionalParameters);
@@ -733,13 +733,13 @@ public void ParameterGroupingTests()
                 client.ParameterGrouping.PostOptional(null);
 
                 //Multiple grouped parameters
-                FirstParameterGroup firstGroup = new FirstParameterGroup(header, query);
+                FirstParameterGroup firstGroup = new FirstParameterGroup(headerParameter, queryParameter);
                 SecondParameterGroup secondGroup = new SecondParameterGroup("header2", 42);
 
                 client.ParameterGrouping.PostMultipleParameterGroups(firstGroup, secondGroup);
 
                 //Multiple grouped parameters -- some optional parameters omitted
-                firstGroup = new FirstParameterGroup(header);
+                firstGroup = new FirstParameterGroup(headerParameter);
                 secondGroup = new SecondParameterGroup(queryTwo: 42);
 
                 client.ParameterGrouping.PostMultipleParameterGroups(firstGroup, secondGroup);

diff --git a/...p.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Parameters/FirstParameterGroup.cs b/...p.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Parameters/FirstParameterGroup.cs
@@ -9,18 +9,6 @@
 namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping
 {
     using System;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Net;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Additional parameters for the postMultipleParameterGroups operation.

diff --git a/...eptanceTests/AzureParameterGrouping/Parameters/ParameterGroupingPostOptionalParameters.cs b/...eptanceTests/AzureParameterGrouping/Parameters/ParameterGroupingPostOptionalParameters.cs
@@ -9,18 +9,6 @@
 namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping
 {
     using System;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Net;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Additional parameters for the postOptional operation.

diff --git a/...eptanceTests/AzureParameterGrouping/Parameters/ParameterGroupingPostRequiredParameters.cs b/...eptanceTests/AzureParameterGrouping/Parameters/ParameterGroupingPostRequiredParameters.cs
@@ -9,18 +9,6 @@
 namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping
 {
     using System;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Net;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Additional parameters for the postRequired operation.

diff --git a/....Tests/Expected/AcceptanceTests/AzureParameterGrouping/Parameters/SecondParameterGroup.cs b/....Tests/Expected/AcceptanceTests/AzureParameterGrouping/Parameters/SecondParameterGroup.cs
@@ -9,18 +9,6 @@
 namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping
 {
     using System;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Net;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Additional parameters for the postMultipleParameterGroups operation.

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Array.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Array.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyArray
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyBoolean
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/ByteModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/ByteModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyByte
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Array.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Array.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/...st/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/BasicOperations.cs b/...st/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/BasicOperations.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Dictionary.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Dictionary.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Inheritance.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Inheritance.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/...nerators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Polymorphicrecursive.cs b/...nerators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Polymorphicrecursive.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Polymorphism.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Polymorphism.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Primitive.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Primitive.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyComplex
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyDate
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyDateTime
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/...Rest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Dictionary.cs b/...Rest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Dictionary.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyDictionary
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyDuration
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Files.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Files.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyFile
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyInteger
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyNumber
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyString
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/StringModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/StringModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsBodyString
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Header.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Header.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHeader
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpClientFailure.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpClientFailure.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpFailure.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpFailure.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpRedirects.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpRedirects.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpRetry.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpRetry.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpServerFailure.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpServerFailure.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpSuccess.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/HttpSuccess.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/MultipleResponses.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/MultipleResponses.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsHttp
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/...Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs b/...Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsRequiredOptional
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;

diff --git a/...Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ImplicitModel.cs b/...Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ImplicitModel.cs
@@ -11,7 +11,6 @@ namespace Fixtures.AcceptanceTestsRequiredOptional
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;