Added smoke tests

darrelmiller · darrelmiller · commit 0f1ee46a5073 · 2018-02-13T15:01:05.000-05:00
diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi", "src\Microsoft.OpenApi\Microsoft.OpenApi.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}"
 EndProject
@@ -15,14 +15,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Workbench
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers", "src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj", "{79933258-0126-4382-8755-D50820ECC483}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Tests", "test\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Tests", "test\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Readers.Tests", "test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers.Tests", "test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E546B92F-20A8-49C3-8323-4B25BB78F3E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2DE4-4900-ADB9-ABC37052040A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.SmokeTests", "test\Microsoft.OpenApi.SmokeTests\Microsoft.OpenApi.SmokeTests.csproj", "{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,6 +51,10 @@ Global
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -59,6 +65,7 @@ Global
 		{79933258-0126-4382-8755-D50820ECC483} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
 		{AD83F991-DBF3-4251-8613-9CC54C826964} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
 		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
+		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F171EFC-0DB5-4B10-ABFA-AF48D52CC565}
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.Interface;
@@ -58,21 +59,31 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
                 ExtensionParsers = _settings.ExtensionParsers
             };
 
-            // Parse the OpenAPI Document
-            var document = context.Parse(yamlDocument, diagnostic);
+            OpenApiDocument document = null;
 
-            // Resolve References if requested
-            switch (_settings.ReferenceResolution) 
+            try
+            {
+                // Parse the OpenAPI Document
+                document = context.Parse(yamlDocument, diagnostic);
+
+                // Resolve References if requested
+                switch (_settings.ReferenceResolution)
+                {
+                    case ReferenceResolutionSetting.ResolveAllReferences:
+                        throw new ArgumentException(Properties.SRResource.CannotResolveRemoteReferencesSynchronously);
+                    case ReferenceResolutionSetting.ResolveLocalReferences:
+                        var resolver = new OpenApiReferenceResolver(document);
+                        var walker = new OpenApiWalker(resolver);
+                        walker.Walk(document);
+                        break;
+                    case ReferenceResolutionSetting.DoNotResolveReferences:
+                        break;
+                }
+
+            }
+            catch (OpenApiException ex)
             {
-                case ReferenceResolutionSetting.ResolveAllReferences:
-                    throw new ArgumentException(Properties.SRResource.CannotResolveRemoteReferencesSynchronously);
-                case ReferenceResolutionSetting.ResolveLocalReferences:
-                    var resolver = new OpenApiReferenceResolver(document);
-                    var walker = new OpenApiWalker(resolver);
-                    walker.Walk(document);
-                    break;
-                case ReferenceResolutionSetting.DoNotResolveReferences:
-                    break;
+                diagnostic.Errors.Add(new OpenApiError(ex));
             }
 
             // Validate the document
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs
@@ -95,6 +95,10 @@ public override Dictionary<string, T> CreateMapWithReference<T>(
                          key = n.Key.GetScalarValue(),
                          value = map(new MapNode(Context, Diagnostic, (YamlMappingNode)n.Value))
                      };
+                     if (entry.value == null)
+                     {
+                         return null;  // Body Parameters shouldn't be converted to Parameters
+                     }
                      entry.value.Reference = new OpenApiReference()
                      {
                          Type = referenceType,
@@ -103,7 +107,7 @@ public override Dictionary<string, T> CreateMapWithReference<T>(
                      return entry;
                  }
                  );
-             return nodes.ToDictionary(k => k.key, v => v.value);
+             return nodes.Where(n => n!= null).ToDictionary(k => k.key, v => v.value);
          }
 
         public override Dictionary<string, T> CreateSimpleMap<T>(Func<ValueNode, T> map)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
@@ -65,6 +65,8 @@ internal static partial class OpenApiV2Deserializer
                     o.Components.Parameters = n.CreateMapWithReference(
                         ReferenceType.Parameter,
                         LoadParameter);
+
+                    //TODO: Convert reusable body parameters into Requestbody parameters
                 }
             },
             {
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -56,20 +56,32 @@ internal static partial class OpenApiV2Deserializer
                     "authorizationUrl",
                     (o, n) =>
                     {
+                        var value = n.GetScalarValue();
+                        if (!String.IsNullOrEmpty(value))
+                        {
                         _flow.AuthorizationUrl = new Uri(n.GetScalarValue());
+                        }
                     }
                 },
                 {
                     "tokenUrl",
                     (o, n) =>
                     {
-                        _flow.TokenUrl = new Uri(n.GetScalarValue());
+                        var value = n.GetScalarValue();
+                        if (!String.IsNullOrEmpty(value))
+                        {
+                            _flow.TokenUrl = new Uri(n.GetScalarValue());
+                        }
                     }
                 },
                 {
                     "scopes", (o, n) =>
                     {
-                        _flow.Scopes = n.CreateSimpleMap(LoadString);
+                        var value = n.GetScalarValue();
+                        if (!String.IsNullOrEmpty(value))
+                        {
+                            _flow.Scopes = n.CreateSimpleMap(LoadString);
+                        }
                     }
                 }
             };
diff --git a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
@@ -0,0 +1,127 @@
+﻿using Microsoft.OpenApi.Readers;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.OpenApi.SmokeTests
+{
+    [Collection("DefaultSettings")]
+    public class ApisGuruTests
+    {
+        private static HttpClient _httpClient = new HttpClient(new HttpClientHandler() {
+            AutomaticDecompression = DecompressionMethods.GZip
+        });
+
+        private readonly ITestOutputHelper output;
+    
+        public ApisGuruTests(ITestOutputHelper output)
+        {
+           
+            this.output = output;
+        }
+
+        static ApisGuruTests()
+        {
+            _httpClient.DefaultRequestHeaders.AcceptEncoding.Add(new System.Net.Http.Headers.StringWithQualityHeaderValue("gzip"));
+            _httpClient.DefaultRequestHeaders.UserAgent.Add(new System.Net.Http.Headers.ProductInfoHeaderValue("OpenApi.Net.Tests", "1.0"));
+           
+        }
+
+        public static IEnumerable<object[]> GetSchemas()
+        {
+
+            var listJsonStr = _httpClient
+                    .GetStringAsync("https://api.apis.guru/v2/list.json")
+                    .GetAwaiter().GetResult();
+
+                var json = JObject.Parse(listJsonStr);
+                foreach (var item in json.Properties())
+                {
+                    var versions = GetProp(item.Value, "versions") as JObject;
+                    if (versions == null)
+                        continue;
+                    foreach (var prop in versions.Properties())
+                    {
+                        var urlToJson = GetProp(prop.Value, "swaggerUrl")?.ToObject<string>();
+                        if (urlToJson != null)
+                            yield return new object[] { urlToJson };
+
+                        var utlToYaml = GetProp(prop.Value, "swaggerYamlUrl")?.ToObject<string>();
+                        if (utlToYaml != null)
+                            yield return new object[] { utlToYaml };
+                    }
+            }
+
+            JToken GetProp(JToken obj, string prop)
+            {
+                if (!(obj is JObject jObj))
+                    return null;
+                if (!jObj.TryGetValue(prop, out var jToken))
+                    return null;
+                return jToken;
+            }
+        }
+
+        [Theory(DisplayName = "APIs.guru")]
+        [MemberData(nameof(GetSchemas))]
+        public async Task EnsureThatICouldParse(string url)
+        {
+            var stopwatch = new Stopwatch();
+            
+            var response = await _httpClient.GetAsync(url);
+            if (!response.IsSuccessStatusCode)
+            {
+                output.WriteLine($"Couldn't load {url}");
+                return;
+            }
+            await response.Content.LoadIntoBufferAsync();
+            var stream = await response.Content.ReadAsStreamAsync();
+
+            stopwatch.Start();
+
+            var openApiDocument = new OpenApiStreamReader().Read(stream, out var diagnostic);
+
+            output.WriteLine(String.Join("\n", diagnostic.Errors));
+                Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
+                Assert.Equal(0, diagnostic.Errors.Count);
+                
+                Assert.NotNull(openApiDocument);
+            stopwatch.Stop();
+                output.WriteLine($"Parsing {url} took {stopwatch.ElapsedMilliseconds} ms.");
+        }
+
+        [Theory(DisplayName = "APIs.guru")]
+        [MemberData(nameof(GetSchemas))]
+        public async Task EnsureAllErrorsAreHandled(string url)
+        {
+            var stopwatch = new Stopwatch();
+
+            var response = await _httpClient.GetAsync(url);
+            if (!response.IsSuccessStatusCode)
+            {
+                output.WriteLine($"Couldn't load {url}");
+                return;
+            }
+            await response.Content.LoadIntoBufferAsync();
+            var stream = await response.Content.ReadAsStreamAsync();
+
+            stopwatch.Start();
+
+            var openApiDocument = new OpenApiStreamReader().Read(stream, out var diagnostic);
+
+            output.WriteLine(String.Join("\n", diagnostic.Errors));
+            Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
+
+            Assert.NotNull(openApiDocument);
+            stopwatch.Stop();
+            output.WriteLine($"Parsing {url} took {stopwatch.ElapsedMilliseconds} ms and has {diagnostic.Errors.Count} errors.");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;net461</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;net46</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,10 @@ public override Dictionary<string, T> CreateMapWithReference<T>(`
`95`	`95`	`key = n.Key.GetScalarValue(),`
`96`	`96`	`value = map(new MapNode(Context, Diagnostic, (YamlMappingNode)n.Value))`
`97`	`97`	`};`
	`98`	`+ if (entry.value == null)`
	`99`	`+ {`
	`100`	`+ return null; // Body Parameters shouldn't be converted to Parameters`
	`101`	`+ }`
`98`	`102`	`entry.value.Reference = new OpenApiReference()`
`99`	`103`	`{`
`100`	`104`	`Type = referenceType,`
`@@ -103,7 +107,7 @@ public override Dictionary<string, T> CreateMapWithReference<T>(`
`103`	`107`	`return entry;`
`104`	`108`	`}`
`105`	`109`	`);`
`106`		`- return nodes.ToDictionary(k => k.key, v => v.value);`
	`110`	`+ return nodes.Where(n => n!= null).ToDictionary(k => k.key, v => v.value);`
`107`	`111`	`}`
`108`	`112`
`109`	`113`	`public override Dictionary<string, T> CreateSimpleMap<T>(Func<ValueNode, T> map)`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ internal static partial class OpenApiV2Deserializer`
`65`	`65`	`o.Components.Parameters = n.CreateMapWithReference(`
`66`	`66`	`ReferenceType.Parameter,`
`67`	`67`	`LoadParameter);`
	`68`	`+`
	`69`	`+ //TODO: Convert reusable body parameters into Requestbody parameters`
`68`	`70`	`}`
`69`	`71`	`},`
`70`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,20 +56,32 @@ internal static partial class OpenApiV2Deserializer`
`56`	`56`	`"authorizationUrl",`
`57`	`57`	`(o, n) =>`
`58`	`58`	`{`
	`59`	`+ var value = n.GetScalarValue();`
	`60`	`+ if (!String.IsNullOrEmpty(value))`
	`61`	`+ {`
`59`	`62`	`_flow.AuthorizationUrl = new Uri(n.GetScalarValue());`
	`63`	`+ }`
`60`	`64`	`}`
`61`	`65`	`},`
`62`	`66`	`{`
`63`	`67`	`"tokenUrl",`
`64`	`68`	`(o, n) =>`
`65`	`69`	`{`
`66`		`- _flow.TokenUrl = new Uri(n.GetScalarValue());`
	`70`	`+ var value = n.GetScalarValue();`
	`71`	`+ if (!String.IsNullOrEmpty(value))`
	`72`	`+ {`
	`73`	`+ _flow.TokenUrl = new Uri(n.GetScalarValue());`
	`74`	`+ }`
`67`	`75`	`}`
`68`	`76`	`},`
`69`	`77`	`{`
`70`	`78`	`"scopes", (o, n) =>`
`71`	`79`	`{`
`72`		`- _flow.Scopes = n.CreateSimpleMap(LoadString);`
	`80`	`+ var value = n.GetScalarValue();`
	`81`	`+ if (!String.IsNullOrEmpty(value))`
	`82`	`+ {`
	`83`	`+ _flow.Scopes = n.CreateSimpleMap(LoadString);`
	`84`	`+ }`
`73`	`85`	`}`
`74`	`86`	`}`
`75`	`87`	`};`