Skip to content
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.

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

Convert Typespec API reviews #9611

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/dotnet/APIView/APIViewUnitTests/APIViewUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<None Update="SampleTestFiles\azure.data.tables.12.9.1.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SampleTestFiles\Azure.Template.cpp.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SampleTestFiles\Azure.Template.cpp_new.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SampleTestFiles\TokenFileWithSectionsRevision3.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
22 changes: 22 additions & 0 deletions src/dotnet/APIView/APIViewUnitTests/CodeFileTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Moq;
using Xunit;
using Xunit.Abstractions;
using APIViewWeb.Helpers;

namespace APIViewUnitTests
{
Expand Down Expand Up @@ -100,5 +101,26 @@ public async Task AreCodeFilesTheSame_Returns_False_For_Different_CodeFile()
//Assert
Assert.False(result);
}

[Fact]
public async Task TestCodeFileConversion()
{
var codeFileA = new CodeFile();
var codeFileB = new CodeFile();
var filePath = Path.Combine("SampleTestFiles", "Azure.Template.cpp.json");
var fileInfo = new FileInfo(filePath);
var fileStream = fileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
codeFileA = await CodeFile.DeserializeAsync(fileStream);

codeFileB = new CodeFile();
filePath = Path.Combine("SampleTestFiles", "Azure.Template.cpp_new.json");
fileInfo = new FileInfo(filePath);
fileStream = fileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
codeFileB = await CodeFile.DeserializeAsync(fileStream);

codeFileA.ConvertToTreeTokenModel();
bool result = CodeFileHelpers.AreCodeFilesSame(codeFileA, codeFileB);
Assert.True(result);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Version":0,"VersionString":"0","Name":"Azure Template API Review","Language":"C\u002B\u002B","LanguageVariant":null,"PackageName":"azure-template","ServiceName":"Azure Template","PackageDisplayName":null,"Tokens":[{"DefinitionId":null,"NavigateToId":null,"Value":"","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"namespace","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure","NavigateToId":null,"Value":"Azure","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"{","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"namespace","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Template","NavigateToId":null,"Value":"Template","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"{","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"struct","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Template::TemplateClientOptions","NavigateToId":"Azure::Template::TemplateClientOptions","Value":"TemplateClientOptions","Kind":6,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":":","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"public","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Core::_internal::ClientOptions","NavigateToId":null,"Value":"Azure::Core::_internal::ClientOptions","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"{","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"}","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":";","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"class","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Template::TemplateClient","NavigateToId":"Azure::Template::TemplateClient","Value":"TemplateClient","Kind":6,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"final","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"{","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"public","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":":","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Template::TemplateClient::TemplateClient","NavigateToId":"Azure::Template::TemplateClient::TemplateClient","Value":"TemplateClient","Kind":6,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"(","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"const Azure::Template::TemplateClientOptions \u0026","Kind":9,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"options","NavigateToId":null,"Value":"options","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"=","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Template::TemplateClientOptions","NavigateToId":null,"Value":"Azure::Template::TemplateClientOptions","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"(","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":")","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":")","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":";","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"int","NavigateToId":null,"Value":"int","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Template::TemplateClient::GetValue","NavigateToId":"Azure::Template::TemplateClient::GetValue","Value":"GetValue","Kind":6,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"(","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"int","Kind":9,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"key","NavigateToId":null,"Value":"key","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":",","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"const Azure::Core::Context \u0026","Kind":9,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"context","NavigateToId":null,"Value":"context","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"=","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":"Azure::Core::Context","NavigateToId":null,"Value":"Azure::Core::Context","Kind":7,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"(","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":")","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":")","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"const","Kind":4,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":";","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"}","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":";","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"}","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"}","Kind":3,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":" ","Kind":2,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":"// namespace Azure::Template","Kind":10,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null},{"DefinitionId":null,"NavigateToId":null,"Value":null,"Kind":1,"CrossLanguageDefId":null,"NumberOfLinesinLeafSection":null}],"LeafSections":[],"Navigation":[{"Text":"Azure::Template","NavigationId":"","ChildItems":[{"Text":"TemplateClient","NavigationId":"Azure::Template::TemplateClient","ChildItems":[],"Tags":{"TypeKind":"class"},"IsHiddenApi":false},{"Text":"TemplateClientOptions","NavigationId":"Azure::Template::TemplateClientOptions","ChildItems":[],"Tags":{"TypeKind":"struct"},"IsHiddenApi":false}],"Tags":{"TypeKind":"namespace"},"IsHiddenApi":false}],"Diagnostics":null}
Loading
Loading