forked from Azure/azure-sdk-for-java
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix AzureResourceSchema projects (Azure#956)
* Automatically detect MSBuild tools version in Windows platform * Add initial AzureResourceSchema project and test project * Update AzureResourceSchema projects and add initial c# files * Add AzureResourceSchema to configuration file * AzureResourceSchemaCodeGenerator shows up in AutoRest help and tests pass * Almost have Storage schema generating from swagger spec * Fix AzureResourceSchema project * Can generate storage schema from swagger * Fix FXCopy issues
- Loading branch information
1 parent
1f4cc35
commit 47753e5
Showing
15 changed files
with
771 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
...rs/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. See License.txt in the project root for license information. | ||
|
|
||
| using Microsoft.Rest.Generator.ClientModel; | ||
| using Microsoft.Rest.Generator.Utilities; | ||
| using Newtonsoft.Json.Linq; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Xunit; | ||
|
|
||
| namespace Microsoft.Rest.Generator.AzureResourceSchema.Tests | ||
| { | ||
| [Collection("AutoRest Tests")] | ||
| public class AzureResourceSchemaCodeGeneratorTests | ||
| { | ||
| [Fact] | ||
| public void Description() | ||
| { | ||
| Assert.Equal("Azure Resource Schema generator", CreateGenerator().Description); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void ImplementationFileExtension() | ||
| { | ||
| Assert.Equal(".json", CreateGenerator().ImplementationFileExtension); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Name() | ||
| { | ||
| Assert.Equal("AzureResourceSchema", CreateGenerator().Name); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void UsageInstructionsWithNoOutputFileSetting() | ||
| { | ||
| AzureResourceSchemaCodeGenerator codeGen = CreateGenerator(); | ||
| Assert.Equal("Your Azure Resource Schema can be found at " + codeGen.SchemaPath, codeGen.UsageInstructions); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void UsageInstructionsWithOutputFileSetting() | ||
| { | ||
| Settings settings = new Settings() | ||
| { | ||
| OutputFileName = "spam.json" | ||
| }; | ||
| AzureResourceSchemaCodeGenerator codeGen = CreateGenerator(settings); | ||
|
|
||
| Assert.Equal("Your Azure Resource Schema can be found at " + codeGen.SchemaPath, codeGen.UsageInstructions); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async void GenerateWithEmptyServiceClient() | ||
| { | ||
| await TestGenerate(new string[0], | ||
| @"{ | ||
| 'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#', | ||
| '$schema': 'http://json-schema.org/draft-04/schema#', | ||
| 'title': 'Microsoft.Storage', | ||
| 'description': 'Microsoft Storage Resource Types', | ||
| 'resourceDefinitions': { } | ||
| }"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async void GenerateWithServiceClientWithOneType() | ||
| { | ||
| await TestGenerate(new string[] | ||
| { | ||
| "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType" | ||
| }, | ||
| @"{ | ||
| 'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#', | ||
| '$schema': 'http://json-schema.org/draft-04/schema#', | ||
| 'title': 'Microsoft.Storage', | ||
| 'description': 'Microsoft Storage Resource Types', | ||
| 'resourceDefinitions': { | ||
| 'mockType': { | ||
| } | ||
| } | ||
| }"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async void GenerateWithServiceClientWithTwoTypes() | ||
| { | ||
| await TestGenerate(new string[] | ||
| { | ||
| "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType1", | ||
| "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType2" | ||
| }, | ||
| @"{ | ||
| 'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#', | ||
| '$schema': 'http://json-schema.org/draft-04/schema#', | ||
| 'title': 'Microsoft.Storage', | ||
| 'description': 'Microsoft Storage Resource Types', | ||
| 'resourceDefinitions': { | ||
| 'mockType1': { | ||
| }, | ||
| 'mockType2': { | ||
| } | ||
| } | ||
| }"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void NormalizeClientModelDoesNothing() | ||
| { | ||
| ServiceClient serviceClient = new ServiceClient(); | ||
| CreateGenerator().NormalizeClientModel(serviceClient); | ||
|
|
||
| // Nothing happens | ||
| } | ||
|
|
||
| private static AzureResourceSchemaCodeGenerator CreateGenerator() | ||
| { | ||
| return CreateGenerator(new Settings()); | ||
| } | ||
| private static AzureResourceSchemaCodeGenerator CreateGenerator(Settings settings) | ||
| { | ||
| return new AzureResourceSchemaCodeGenerator(settings); | ||
| } | ||
|
|
||
| private static async Task TestGenerate(string[] methodUrls, string expectedJsonString) | ||
| { | ||
| MemoryFileSystem fileSystem = new MemoryFileSystem(); | ||
|
|
||
| Settings settings = new Settings(); | ||
| settings.FileSystem = fileSystem; | ||
|
|
||
| ServiceClient serviceClient = new ServiceClient(); | ||
| foreach(string methodUrl in methodUrls) | ||
| { | ||
| serviceClient.Methods.Add(new Method() | ||
| { | ||
| Url = methodUrl | ||
| }); | ||
| } | ||
| await CreateGenerator(settings).Generate(serviceClient); | ||
|
|
||
| Assert.Equal(2, fileSystem.VirtualStore.Count); | ||
|
|
||
| string folderPath = fileSystem.VirtualStore.Keys.First(); | ||
| Assert.Equal("Folder", fileSystem.VirtualStore[folderPath].ToString()); | ||
|
|
||
| JObject expectedJSON = JObject.Parse(expectedJsonString); | ||
|
|
||
| string fileContents = fileSystem.VirtualStore[fileSystem.VirtualStore.Keys.Skip(1).First()].ToString(); | ||
| JObject actualJson = JObject.Parse(fileContents); | ||
|
|
||
| Assert.Equal(expectedJSON, actualJson); | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.