Skip to content

Model uuid format with Guid in CSharp, UUID in Java and node.js #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarzavery merged 5 commits into from
Mar 4, 2016
Merged

Model uuid format with Guid in CSharp, UUID in Java and node.js #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
466c7b7
Model uuid format with Guid in CSharp, UUID in Java
jhancock93 Mar 3, 2016
f6edb1b
Regenerated java fixtures to fix merge issue
jhancock93 Mar 3, 2016
309b3a2
Improved NodeJS support for uuid
amarzavery Mar 4, 2016
d85fe59
Merge pull request #1 from amarzavery/uuid
jhancock93 Mar 4, 2016
26a89bd
Add Assert.fail() in new java test
jhancock93 Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AutoRest/AutoRest.Core/ClientModel/KnownPrimaryType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public enum KnownPrimaryType
DateTimeRfc1123,
TimeSpan,
Boolean,
Credentials
Credentials,
Uuid
}
}
2 changes: 1 addition & 1 deletion AutoRest/AutoRest.Core/GlobalSuppressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.Method.#InputParameterMappings")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Rfc", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.KnownPrimaryType.#DateTimeRfc1123")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.PrimaryType.#Type")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Uuid", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.KnownPrimaryType.#Uuid")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "FileSystem", Scope = "member", Target = "Microsoft.Rest.Generator.Extensibility.ExtensionsLoader.#GetConfigurationFileContent(Microsoft.Rest.Generator.Settings)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.CompositeType.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.EnumType.#Values")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.Method.#InputParameterTransformation")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")]

21 changes: 21 additions & 0 deletions AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,13 @@ public void ArrayTests()
null
}));
Assert.Throws<SerializationException>(() => client.Array.GetDateTimeInvalidChars());

Guid guid1 = new Guid("6DCC7237-45FE-45C4-8A6B-3A8A3F625652");
Guid guid2 = new Guid("D1399005-30F7-40D6-8DA6-DD7C89AD34DB");
Guid guid3 = new Guid("F42F6AA1-A5BC-4DDF-907E-5F915DE43205");
Assert.Equal(new List<Guid?> { guid1, guid2, guid3 }, client.Array.GetUuidValid());
client.Array.PutUuidValid(new List<Guid?> { guid1, guid2, guid3 });
Assert.Throws<SerializationException>(() => client.Array.GetUuidInvalidChars());
}
}

Expand Down Expand Up @@ -1831,6 +1838,14 @@ public void UseDateTimeOffsetInModelTest()
Assert.Equal(typeof(System.DateTime?), productType.GetProperty("DateArray").PropertyType.GetGenericArguments()[0]);
}

[Fact]
public void FormatUuidModeledAsGuidTest()
{
var productType = typeof (Fixtures.MirrorPrimitives.Models.Product);
Assert.Equal(typeof(Guid?), productType.GetProperty("Uuid").PropertyType);
Assert.Equal(typeof(IList<Guid?>), productType.GetProperty("UuidArray").PropertyType);
}

[Fact]
public void RequiredOptionalTests()
{
Expand Down Expand Up @@ -2210,6 +2225,12 @@ public void EnsureTestCoverage()
float totalTests = report.Count;
#endif
float executedTests = report.Values.Count(v => v > 0);

var nullValued = report.Where(p => p.Value == null).Select(p => p.Key);
foreach (var item in nullValued)
{
logger.LogInformation(string.Format(CultureInfo.CurrentCulture, "MISSING: {0}", item));
}
Assert.Equal(totalTests, executedTests);
}
}
Expand Down
Loading