Skip to content

Commit 2520fa8

Browse files
xuzhgxuzhg
committed
resolve the comments
1 parent 712b75b commit 2520fa8

15 files changed

+48
-90
lines changed

‎test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,6 @@
1212
<SignAssembly>true</SignAssembly>
1313
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
15-
<ItemGroup>
16-
<None Remove="ReferenceService\Samples\multipleReferences.v2.yaml" />
17-
<None Remove="V2Tests\Samples\basic.v2.yaml" />
18-
<None Remove="V2Tests\Samples\basic.v3.yaml" />
19-
<None Remove="V2Tests\Samples\minimal.v2.yaml" />
20-
<None Remove="V2Tests\Samples\minimal.v3.yaml" />
21-
<None Remove="V2Tests\Samples\OpenApiParameter\bodyParameter.yaml" />
22-
<None Remove="V2Tests\Samples\OpenApiParameter\formDataParameter.yaml" />
23-
<None Remove="V2Tests\Samples\OpenApiParameter\headerParameter.yaml" />
24-
<None Remove="V2Tests\Samples\OpenApiParameter\pathParameter.yaml" />
25-
<None Remove="V2Tests\Samples\OpenApiParameter\queryParameter.yaml" />
26-
<None Remove="V2Tests\Samples\OpenApiSecurityScheme\apiKeySecurityScheme.yaml" />
27-
<None Remove="V2Tests\Samples\OpenApiSecurityScheme\httpSecurityScheme.yaml" />
28-
<None Remove="V2Tests\Samples\OpenApiSecurityScheme\oauth2AccessCodeSecurityScheme.yaml" />
29-
<None Remove="V2Tests\Samples\OpenApiSecurityScheme\oauth2ApplicationSecurityScheme.yaml" />
30-
<None Remove="V2Tests\Samples\OpenApiSecurityScheme\oauth2PasswordSecurityScheme.yaml" />
31-
<None Remove="V3Tests\Samples\OpenApiCallback\basicCallback.yaml" />
32-
<None Remove="V3Tests\Samples\OpenApiDiscriminator\basicDiscriminator.yaml" />
33-
<None Remove="V3Tests\Samples\OpenApiDocument\basicDocumentWithMultipleServers.yaml" />
34-
<None Remove="V3Tests\Samples\OpenApiDocument\brokenMinimalDocument.yaml" />
35-
<None Remove="V3Tests\Samples\OpenApiDocument\minimalDocument.yaml" />
36-
<None Remove="V3Tests\Samples\OpenApiDocument\petStore.yaml" />
37-
<None Remove="V3Tests\Samples\OpenApiDocument\petStoreExpanded.yaml" />
38-
<None Remove="V3Tests\Samples\OpenApiDocument\petStoreWithTagAndSecurity.yaml" />
39-
<None Remove="V3Tests\Samples\OpenApiEncoding\advancedEncoding.yaml" />
40-
<None Remove="V3Tests\Samples\OpenApiEncoding\basicEncoding.yaml" />
41-
<None Remove="V3Tests\Samples\OpenApiExample\advancedExample.yaml" />
42-
<None Remove="V3Tests\Samples\OpenApiInfo\basicInfo.yaml" />
43-
<None Remove="V3Tests\Samples\OpenApiInfo\minimalInfo.yaml" />
44-
<None Remove="V3Tests\Samples\OpenApiSchema\advancedSchemaWithReference.yaml" />
45-
<None Remove="V3Tests\Samples\OpenApiSchema\basicSchemaWithExample.yaml" />
46-
<None Remove="V3Tests\Samples\OpenApiSchema\dictionarySchema.yaml" />
47-
<None Remove="V3Tests\Samples\OpenApiSchema\primitiveSchema.yaml" />
48-
<None Remove="V3Tests\Samples\OpenApiSchema\simpleSchema.yaml" />
49-
<None Remove="V3Tests\Samples\OpenApiSecurityScheme\apiKeySecurityScheme.yaml" />
50-
<None Remove="V3Tests\Samples\OpenApiSecurityScheme\bearerSecurityScheme.yaml" />
51-
<None Remove="V3Tests\Samples\OpenApiSecurityScheme\httpSecurityScheme.yaml" />
52-
<None Remove="V3Tests\Samples\OpenApiSecurityScheme\oauth2SecurityScheme.yaml" />
53-
<None Remove="V3Tests\Samples\OpenApiSecurityScheme\openIdConnectSecurityScheme.yaml" />
54-
<None Remove="V3Tests\Samples\OpenApiXml\basicXml.yaml" />
55-
</ItemGroup>
5615
<ItemGroup>
5716
<EmbeddedResource Include="ReferenceService\Samples\multipleReferences.v2.yaml">
5817
<CopyToOutputDirectory>Never</CopyToOutputDirectory>

‎test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void LoadSchemaReference()
2525
var diagnostic = new OpenApiDiagnostic();
2626
RootNode rootNode;
2727

28-
using (var stream = Resources.GetStream(SampleFolderPath + "multipleReferences.v2.yaml"))
28+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
2929
{
3030
var yamlStream = new YamlStream();
3131
yamlStream.Load(new StreamReader(stream));
@@ -82,7 +82,7 @@ public void LoadParameterReference()
8282
var diagnostic = new OpenApiDiagnostic();
8383
RootNode rootNode;
8484

85-
using (var stream = Resources.GetStream(SampleFolderPath + "multipleReferences.v2.yaml"))
85+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
8686
{
8787
var yamlStream = new YamlStream();
8888
yamlStream.Load(new StreamReader(stream));
@@ -127,7 +127,7 @@ public void LoadSecuritySchemeReference()
127127
var diagnostic = new OpenApiDiagnostic();
128128
RootNode rootNode;
129129

130-
using (var stream = Resources.GetStream(SampleFolderPath + "multipleReferences.v2.yaml"))
130+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
131131
{
132132
var yamlStream = new YamlStream();
133133
yamlStream.Load(new StreamReader(stream));
@@ -165,7 +165,7 @@ public void LoadResponseReference()
165165
var diagnostic = new OpenApiDiagnostic();
166166
RootNode rootNode;
167167

168-
using (var stream = Resources.GetStream(SampleFolderPath + "multipleReferences.v2.yaml"))
168+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
169169
{
170170
var yamlStream = new YamlStream();
171171
yamlStream.Load(new StreamReader(stream));
@@ -202,7 +202,7 @@ public void LoadResponseAndSchemaReference()
202202
var diagnostic = new OpenApiDiagnostic();
203203
RootNode rootNode;
204204

205-
using (var stream = Resources.GetStream(SampleFolderPath + "multipleReferences.v2.yaml"))
205+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
206206
{
207207
var yamlStream = new YamlStream();
208208
yamlStream.Load(new StreamReader(stream));

‎test/Microsoft.OpenApi.Readers.Tests/Resources.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ public static Stream GetStream(string fileName)
4242

4343
private static string GetPath(string fileName)
4444
{
45-
const string projectDefaultNamespace = "Microsoft.OpenApi.Readers.Tests";
46-
const string resourcesFolderName = "Resources";
4745
const string pathSeparator = ".";
46+
string projectDefaultNamespace = typeof(Resources).Namespace;
4847

4948
if (fileName.Contains("/"))
5049
{
5150
string temp = fileName.Replace('/', '.');
5251
return projectDefaultNamespace + pathSeparator + temp;
5352
}
5453

55-
return projectDefaultNamespace + pathSeparator + resourcesFolderName + pathSeparator + fileName;
54+
return projectDefaultNamespace + pathSeparator + fileName;
5655
}
5756
}
5857
}

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public class ComparisonTests
1818
//[InlineData("definitions")] //Currently broken due to V3 references not behaving the same as V2
1919
public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string fileName)
2020
{
21-
using (var streamV2 = Resources.GetStream(SampleFolderPath + $"{fileName}.v2.yaml"))
22-
using (var streamV3 = Resources.GetStream(SampleFolderPath + $"{fileName}.v3.yaml"))
21+
using (var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml")))
22+
using (var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml")))
2323
{
2424
var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var contextV2);
2525
var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var contextV3);

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void ParseBodyParameterShouldSucceed()
2020
{
2121
// Arrange
2222
MapNode node;
23-
using (var stream = Resources.GetStream(SampleFolderPath + "bodyParameter.yaml"))
23+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "bodyParameter.yaml")))
2424
{
2525
node = TestHelper.CreateYamlMapNode(stream);
2626
}
@@ -39,7 +39,7 @@ public void ParsePathParameterShouldSucceed()
3939
{
4040
// Arrange
4141
MapNode node;
42-
using (var stream = Resources.GetStream(SampleFolderPath + "pathParameter.yaml"))
42+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "pathParameter.yaml")))
4343
{
4444
node = TestHelper.CreateYamlMapNode(stream);
4545
}
@@ -67,7 +67,7 @@ public void ParseQueryParameterShouldSucceed()
6767
{
6868
// Arrange
6969
MapNode node;
70-
using (var stream = Resources.GetStream(SampleFolderPath + "queryParameter.yaml"))
70+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameter.yaml")))
7171
{
7272
node = TestHelper.CreateYamlMapNode(stream);
7373
}
@@ -101,7 +101,7 @@ public void ParseFormDataParameterShouldSucceed()
101101
{
102102
// Arrange
103103
MapNode node;
104-
using (var stream = Resources.GetStream(SampleFolderPath + "formDataParameter.yaml"))
104+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "formDataParameter.yaml")))
105105
{
106106
node = TestHelper.CreateYamlMapNode(stream);
107107
}
@@ -120,7 +120,7 @@ public void ParseHeaderParameterShouldSucceed()
120120
{
121121
// Arrange
122122
MapNode node;
123-
using (var stream = Resources.GetStream(SampleFolderPath + "headerParameter.yaml"))
123+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerParameter.yaml")))
124124
{
125125
node = TestHelper.CreateYamlMapNode(stream);
126126
}

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class OpenApiSecuritySchemeTests
2121
[Fact]
2222
public void ParseHttpSecuritySchemeShouldSucceed()
2323
{
24-
using (var stream = Resources.GetStream(SampleFolderPath + "basicSecurityScheme.yaml"))
24+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicSecurityScheme.yaml")))
2525
{
2626
var yamlStream = new YamlStream();
2727
yamlStream.Load(new StreamReader(stream));
@@ -48,7 +48,7 @@ public void ParseHttpSecuritySchemeShouldSucceed()
4848
[Fact]
4949
public void ParseApiKeySecuritySchemeShouldSucceed()
5050
{
51-
using (var stream = Resources.GetStream(SampleFolderPath + "apiKeySecurityScheme.yaml"))
51+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "apiKeySecurityScheme.yaml")))
5252
{
5353
var yamlStream = new YamlStream();
5454
yamlStream.Load(new StreamReader(stream));
@@ -76,7 +76,7 @@ public void ParseApiKeySecuritySchemeShouldSucceed()
7676
[Fact]
7777
public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
7878
{
79-
using (var stream = Resources.GetStream(SampleFolderPath + "oauth2ImplicitSecurityScheme.yaml"))
79+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ImplicitSecurityScheme.yaml")))
8080
{
8181
var yamlStream = new YamlStream();
8282
yamlStream.Load(new StreamReader(stream));
@@ -114,7 +114,7 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
114114
[Fact]
115115
public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
116116
{
117-
using (var stream = Resources.GetStream(SampleFolderPath + "oauth2PasswordSecurityScheme.yaml"))
117+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2PasswordSecurityScheme.yaml")))
118118
{
119119
var yamlStream = new YamlStream();
120120
yamlStream.Load(new StreamReader(stream));
@@ -152,7 +152,7 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
152152
[Fact]
153153
public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
154154
{
155-
using (var stream = Resources.GetStream(SampleFolderPath + "oauth2ApplicationSecurityScheme.yaml"))
155+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ApplicationSecurityScheme.yaml")))
156156
{
157157
var yamlStream = new YamlStream();
158158
yamlStream.Load(new StreamReader(stream));
@@ -190,7 +190,7 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
190190
[Fact]
191191
public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed()
192192
{
193-
using (var stream = Resources.GetStream(SampleFolderPath + "oauth2AccessCodeSecurityScheme.yaml"))
193+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2AccessCodeSecurityScheme.yaml")))
194194
{
195195
var yamlStream = new YamlStream();
196196
yamlStream.Load(new StreamReader(stream));

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class OpenApiCallbackTests
2121
[Fact]
2222
public void ParseBasicCallbackShouldSucceed()
2323
{
24-
using (var stream = Resources.GetStream(SampleFolderPath + "basicCallback.yaml"))
24+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicCallback.yaml")))
2525
{
2626
// Arrange
2727
var yamlStream = new YamlStream();
@@ -77,7 +77,7 @@ public void ParseBasicCallbackShouldSucceed()
7777
[Fact]
7878
public void ParseAdvancedCallbackWithReferenceShouldSucceed()
7979
{
80-
using (var stream = Resources.GetStream(SampleFolderPath + "advancedCallbackWithReference.yaml"))
80+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedCallbackWithReference.yaml")))
8181
{
8282
// Act
8383
var openApiDoc = new OpenApiStreamReader().Read(stream, out var context);

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class OpenApiDiscriminatorTests
2020
[Fact]
2121
public void ParseBasicDiscriminatorShouldSucceed()
2222
{
23-
using (var stream = Resources.GetStream(SampleFolderPath + "basicDiscriminator.yaml"))
23+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicDiscriminator.yaml")))
2424
{
2525
var yamlStream = new YamlStream();
2626
yamlStream.Load(new StreamReader(stream));

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void ParseDocumentFromInlineStringShouldSucceed()
5353
[Fact]
5454
public void ParseBasicDocumentWithMultipleServersShouldSucceed()
5555
{
56-
using (var stream = Resources.GetStream(SampleFolderPath + "basicDocumentWithMultipleServers.yaml"))
56+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicDocumentWithMultipleServers.yaml")))
5757
{
5858
var openApiDoc = new OpenApiStreamReader().Read(stream, out var context);
5959

@@ -87,7 +87,7 @@ public void ParseBasicDocumentWithMultipleServersShouldSucceed()
8787
[Fact]
8888
public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
8989
{
90-
using (var stream = Resources.GetStream(SampleFolderPath + "brokenMinimalDocument.yaml"))
90+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "brokenMinimalDocument.yaml")))
9191
{
9292
var openApiDoc = new OpenApiStreamReader().Read(stream, out var context);
9393

@@ -114,7 +114,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
114114
[Fact]
115115
public void ParseMinimalDocumentShouldSucceed()
116116
{
117-
using (var stream = Resources.GetStream(SampleFolderPath + "minimalDocument.yaml"))
117+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "minimalDocument.yaml")))
118118
{
119119
var openApiDoc = new OpenApiStreamReader().Read(stream, out var context);
120120

@@ -137,7 +137,7 @@ public void ParseMinimalDocumentShouldSucceed()
137137
public void ParseStandardPetStoreDocumentShouldSucceed()
138138
{
139139
OpenApiDiagnostic context;
140-
using (var stream = Resources.GetStream(SampleFolderPath + "petStore.yaml"))
140+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml")))
141141
{
142142
var actual = new OpenApiStreamReader().Read(stream, out context);
143143

@@ -548,7 +548,7 @@ public void ParseStandardPetStoreDocumentShouldSucceed()
548548
public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
549549
{
550550
OpenApiDiagnostic context;
551-
using (var stream = Resources.GetStream(SampleFolderPath + "petStoreWithTagAndSecurity.yaml"))
551+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStoreWithTagAndSecurity.yaml")))
552552
{
553553
var actual = new OpenApiStreamReader().Read(stream, out context);
554554

@@ -1050,7 +1050,7 @@ public void ParsePetStoreExpandedShouldSucceed()
10501050
{
10511051
OpenApiDiagnostic context;
10521052

1053-
using (var stream = Resources.GetStream(SampleFolderPath + "petStoreExpanded.yaml"))
1053+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStoreExpanded.yaml")))
10541054
{
10551055
var actual = new OpenApiStreamReader().Read(stream, out context);
10561056

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class OpenApiEncodingTests
2020
[Fact]
2121
public void ParseBasicEncodingShouldSucceed()
2222
{
23-
using (var stream = Resources.GetStream(SampleFolderPath + "basicEncoding.yaml"))
23+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicEncoding.yaml")))
2424
{
2525
var yamlStream = new YamlStream();
2626
yamlStream.Load(new StreamReader(stream));
@@ -46,7 +46,7 @@ public void ParseBasicEncodingShouldSucceed()
4646
[Fact]
4747
public void ParseAdvancedEncodingShouldSucceed()
4848
{
49-
using (var stream = Resources.GetStream(SampleFolderPath + "advancedEncoding.yaml"))
49+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedEncoding.yaml")))
5050
{
5151
var yamlStream = new YamlStream();
5252
yamlStream.Load(new StreamReader(stream));

0 commit comments

Comments
 (0)