Skip to content

Commit 4617552

Browse files
author
Vlad Barosan
committed
Fix unit tests and previous build warnings
1 parent eaf13d9 commit 4617552

File tree

7 files changed

+27
-44
lines changed

7 files changed

+27
-44
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### How to install
22
```
3-
npm install -g [email protected].8
3+
npm install -g [email protected].7
44
```
55

66
### Command Usage
@@ -25,7 +25,7 @@ Options:
2525
```
2626

2727
## Build dependencies
28-
- [Node](https://nodejs.org) (6.9.5 or higher)
28+
- [Node](https://nodejs.org) (7.10.0 or higher)
2929
- [Node Package Manager](https://www.npmjs.com/package/npm)
3030
- [.NET CLI tools](https://github.com/dotnet/cli/releases) version 2.0.0 or higher
3131
> You want the **.NET Core SDK Binaries** for your platform <br>

‎openapi-diff/src/common/project-xunittest.proj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project ToolsVersion="15.0">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0.0" />
4-
<!-- <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" /> -->
5-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
7-
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
3+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.2" />
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
5+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
6+
<PackageReference Include="xunit" Version="2.3.0" />
87
</ItemGroup>
98
</Project>

‎openapi-diff/src/core/OpenApiDiff.Core/OpenApiDiff.Core.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
20-
<PackageReference Include="YamlDotNet.Signed" Version="3.8.0" />
20+
<PackageReference Include="YamlDotNet.Signed" Version="4.2.2" />
2121
<PackageReference Include="System.Net.Http" Version="4.3.0" />
2222
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
2323
</ItemGroup>
2424

25-
<ItemGroup>
26-
<Reference Include="AutoRest.Swagger">
27-
<HintPath>..\..\modeler\AutoRest.Swagger\bin\Debug\netstandard2.0\AutoRest.Swagger.dll</HintPath>
28-
</Reference>
29-
</ItemGroup>
3025
<ItemGroup>
3126
<Compile Update="Properties\Resources.Designer.cs">
3227
<DesignTime>True</DesignTime>

‎openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<Import Project="$(common)project-xunittest.proj" />
55

66
<PropertyGroup>
7-
<OutputType>Exe</OutputType>
87
<TargetFramework>netcoreapp2.0</TargetFramework>
98
</PropertyGroup>
109

‎openapi-diff/src/modeler/AutoRest.Swagger.Tests/SwaggerModelerCompareTests.cs‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
namespace AutoRest.Swagger.Tests
1212
{
1313
/// <summary>
14-
/// This class contains tests for the logic comparing two swagger specifications,
14+
/// This class contains tests for the logic comparing two swagger specifications,
1515
/// an older version against newer version.
16-
///
17-
/// For all but the tests that verify that version checks are done properly, the
16+
///
17+
/// For all but the tests that verify that version checks are done properly, the
1818
/// old and new specifications have the same version number, which should force
1919
/// the comparison logic to produce errors rather than warnings for each breaking
2020
/// change.
21-
///
21+
///
2222
/// Non-breaking changes are always presented as informational messages, regardless
2323
/// of whether the version has changed or not.
2424
/// </summary>
@@ -169,10 +169,10 @@ public void PathRemoved()
169169
/// </summary>
170170
[Fact]
171171
public void OperationRemoved()
172-
{
172+
{
173173
var messages = CompareSwagger("removed_operation.json").ToArray();
174174
var missing = messages.Where(m => m.Id == ComparisonMessages.RemovedOperation.Id);
175-
Assert.Equal(1, missing.Count());
175+
Assert.Single(missing);
176176
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Error && m.Path.ReadablePath == "#/paths/api/Operations"));
177177
}
178178

@@ -197,11 +197,11 @@ public void AddedPaths()
197197
{
198198
var messages = CompareSwagger("added_path.json").ToArray();
199199
var missing = messages.Where(m => m.Id == ComparisonMessages.AddedPath.Id);
200-
Assert.Equal(1, missing.Count());
200+
Assert.Single(missing);
201201
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Info && m.Path.ReadablePath == "#/paths/api/Paths"));
202202

203203
missing = messages.Where(m => m.Id == ComparisonMessages.AddedOperation.Id);
204-
Assert.Equal(1, missing.Count());
204+
Assert.Single(missing);
205205
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Info && m.Path.ReadablePath == "#/paths/api/Operations/post"));
206206
}
207207

@@ -213,7 +213,7 @@ public void RequiredParameterRemoved()
213213
{
214214
var messages = CompareSwagger("required_parameter.json").ToArray();
215215
var missing = messages.Where(m => m.Id == ComparisonMessages.RemovedRequiredParameter.Id);
216-
Assert.Equal(1, missing.Count());
216+
Assert.Single(missing);
217217
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Error && m.Path.ReadablePath == "#/paths/api/Parameters/{a}/get/f"));
218218
}
219219

@@ -253,7 +253,7 @@ public void RequiredParameterAdded()
253253
{
254254
var messages = CompareSwagger("required_parameter.json").ToArray();
255255
var missing = messages.Where(m => m.Id == ComparisonMessages.AddingRequiredParameter.Id);
256-
Assert.Equal(1, missing.Count());
256+
Assert.Single(missing);
257257
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Error && m.Path.ReadablePath == "#/paths/api/Parameters/{a}/get/g"));
258258
}
259259

@@ -265,7 +265,7 @@ public void ReadonlyPropertyInResponse()
265265
{
266266
var messages = CompareSwagger("readonly_changes.json").ToArray();
267267
var missing = messages.Where(m => m.Id == ComparisonMessages.AddedReadOnlyPropertyInResponse.Id);
268-
Assert.Equal(1, missing.Count());
268+
Assert.Single(missing);
269269
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Info && m.Path.ReadablePath == "#/paths/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability/post/200/properties"));
270270
}
271271

@@ -277,13 +277,14 @@ public void AddedPropertyInResponse()
277277
{
278278
var messages = CompareSwagger("added_property_in_response.json").ToArray();
279279
var missing = messages.Where(m => m.Id == ComparisonMessages.AddedPropertyInResponse.Id);
280-
Assert.Equal(1, missing.Count());
280+
Assert.Single(missing);
281281
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Error && m.Path.ReadablePath == "#/paths/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability/post/200/properties"));
282282
}
283283

284284
/// <summary>
285285
/// Verifies that rules work on the recurive models
286286
/// </summary>
287+
[Fact]
287288
public void RecursiveModels()
288289
{
289290
var messages = CompareSwagger("recursive_model.json").ToArray();
@@ -330,7 +331,7 @@ public void ParameterStatusLess()
330331
{
331332
var messages = CompareSwagger("required_parameter.json").ToArray();
332333
var missing = messages.Where(m => m.Id == ComparisonMessages.RequiredStatusChange.Id);
333-
Assert.Equal(1, missing.Count());
334+
Assert.Single(missing);
334335
Assert.NotEmpty(missing.Where(m => m.Severity == Category.Error && m.Path.ReadablePath == "#/paths/api/Parameters/{a}/get/e"));
335336
}
336337

@@ -443,7 +444,7 @@ public void ResponseSchemaChanged()
443444
{
444445
var messages = CompareSwagger("operation_check_02.json").ToArray();
445446
var removed = messages.Where(m => m.Id == ComparisonMessages.TypeChanged.Id && m.Path.JsonReference.Contains("Responses")).ToArray();
446-
Assert.Equal(1, removed.Length);
447+
Assert.Single(removed);
447448
Assert.Equal(Category.Error, removed[0].Severity);
448449
Assert.Equal("#/paths/~1api~1Responses/get/400/properties/id", removed[0].Path.JsonReference);
449450
}
@@ -456,7 +457,7 @@ public void ResponseHeaderAdded()
456457
{
457458
var messages = CompareSwagger("operation_check_03.json").ToArray();
458459
var added = messages.Where(m => m.Id == ComparisonMessages.AddingHeader.Id).ToArray();
459-
Assert.Equal(1, added.Length);
460+
Assert.Single(added);
460461
Assert.Equal(Category.Info, added[0].Severity);
461462
Assert.Equal("#/paths/~1api~1Responses/get/200/x-c", added[0].Path.JsonReference);
462463
}
@@ -469,7 +470,7 @@ public void ResponseHeaderRemoved()
469470
{
470471
var messages = CompareSwagger("operation_check_03.json").ToArray();
471472
var removed = messages.Where(m => m.Id == ComparisonMessages.RemovingHeader.Id).ToArray();
472-
Assert.Equal(1, removed.Length);
473+
Assert.Single(removed);
473474
Assert.Equal(Category.Error, removed[0].Severity);
474475
Assert.Equal("#/paths/~1api~1Responses/get/200/x-a", removed[0].Path.JsonReference);
475476
}
@@ -482,7 +483,7 @@ public void ResponseHeaderTypeChanged()
482483
{
483484
var messages = CompareSwagger("operation_check_03.json").ToArray();
484485
var changed = messages.Where(m => m.Id == ComparisonMessages.TypeChanged.Id && m.Path.JsonReference.Contains("Responses")).ToArray();
485-
Assert.Equal(1, changed.Length);
486+
Assert.Single(changed);
486487
Assert.Equal(Category.Error, changed[0].Severity);
487488
Assert.Equal("#/paths/~1api~1Responses/get/200/x-b", changed[0].Path.JsonReference);
488489
}
@@ -647,7 +648,7 @@ public void GlobalResponseTypeConstraintsChanged()
647648
public void RemovedPropertyTest()
648649
{
649650
var messages = CompareSwagger("removed_property.json").ToArray();
650-
Assert.Equal(true, messages.Where(m => m.Id == ComparisonMessages.RemovedProperty.Id).Any());
651+
Assert.True(messages.Where(m => m.Id == ComparisonMessages.RemovedProperty.Id).Any());
651652
}
652653
}
653654
}

‎openapi-diff/src/modeler/AutoRest.Swagger/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
4-
<package id="YamlDotNet.Signed" version="3.8.0" targetFramework="net45" />
4+
<package id="YamlDotNet.Signed" version="4.2.2" targetFramework="net45" />
55
</packages>

‎package-lock.json‎

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)