From 10b99ca357d174d65db7154cedca79e1fb72010d Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 22 Nov 2021 15:06:11 -0500 Subject: [PATCH] - updates unit tests for dolarr count fix Signed-off-by: Vincent Biret --- .../Edm/ODataPathProviderTests.cs | 46 +++++++++---------- .../OpenApiPathItemGeneratorTests.cs | 8 +++- .../Generator/OpenApiPathsGeneratorTests.cs | 13 ++++-- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs index fa4f3b6..a0dc92e 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs @@ -48,7 +48,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(13727, paths.Count()); + Assert.Equal(17194, paths.Count()); } [Fact] @@ -67,7 +67,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(13712, paths.Count()); + Assert.Equal(17179, paths.Count()); } [Fact] @@ -83,7 +83,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); } [Fact] @@ -102,7 +102,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(2, paths.Count()); + Assert.Equal(3, paths.Count()); } [Fact] @@ -126,7 +126,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests var paths = provider.GetPaths(model, settings); // Assert - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); } #if DEBUG @@ -151,7 +151,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count()); + Assert.Equal(5, paths.Count()); } [Fact] @@ -170,7 +170,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); } [Fact] @@ -195,7 +195,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count()); + Assert.Equal(5, paths.Count()); } [Fact] @@ -211,8 +211,8 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(2, paths.Count()); - Assert.Equal(new[] { "/Customers", "/Customers({ID})" }, paths.Select(p => p.GetPathItemName())); + Assert.Equal(3, paths.Count()); + Assert.Equal(new[] { "/Customers", "/Customers({ID})", "/Customers/$count" }, paths.Select(p => p.GetPathItemName())); } [Fact] @@ -228,7 +228,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); Assert.Contains("/Me", paths.Select(p => p.GetPathItemName())); } @@ -250,7 +250,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); Assert.Contains("/Customers/NS.delta()", paths.Select(p => p.GetPathItemName())); } @@ -272,7 +272,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(3, paths.Count()); + Assert.Equal(4, paths.Count()); Assert.Contains("/Customers({ID})/NS.renew", paths.Select(p => p.GetPathItemName())); } @@ -301,7 +301,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count()); + Assert.Equal(5, paths.Count()); if (containsTarget) { @@ -338,7 +338,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count()); + Assert.Equal(5, paths.Count()); if (containsTarget) { @@ -373,7 +373,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count()); + Assert.Equal(5, paths.Count()); Assert.Contains("/GetNearestCustomers()", paths.Select(p => p.GetPathItemName())); Assert.Contains("/ResetDataSource", paths.Select(p => p.GetPathItemName())); } @@ -410,7 +410,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(7, paths.Count()); + Assert.Equal(10, paths.Count()); var pathItems = paths.Select(p => p.GetPathItemName()).ToList(); Assert.DoesNotContain("/Orders({id})/SingleCustomer", pathItems); @@ -453,7 +453,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(7, paths.Count()); + Assert.Equal(9, paths.Count()); var pathItems = paths.Select(p => p.GetPathItemName()).ToList(); Assert.DoesNotContain("/Orders({id})/MultipleCustomers({ID})", pathItems); @@ -483,7 +483,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(9, paths.Count()); + Assert.Equal(12, paths.Count()); var pathItems = paths.Select(p => p.GetPathItemName()).ToList(); Assert.Contains("/Orders({id})/MultipleCustomers", pathItems); @@ -516,7 +516,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests // Assert Assert.NotNull(paths); - Assert.Equal(7, paths.Count()); + Assert.Equal(10, paths.Count()); var pathItems = paths.Select(p => p.GetPathItemName()).ToList(); Assert.Contains("/Orders({id})/MultipleCustomers", pathItems); @@ -552,14 +552,14 @@ namespace Microsoft.OpenApi.OData.Edm.Tests { if (hasStream) { - Assert.Equal(13, paths.Count()); + Assert.Equal(15, paths.Count()); Assert.Contains(TodosValuePath, paths.Select(p => p.GetPathItemName())); Assert.Contains(TodosLogoPath, paths.Select(p => p.GetPathItemName())); Assert.DoesNotContain(TodosContentPath, paths.Select(p => p.GetPathItemName())); } else { - Assert.Equal(12, paths.Count()); + Assert.Equal(14, paths.Count()); Assert.Contains(TodosLogoPath, paths.Select(p => p.GetPathItemName())); Assert.DoesNotContain(TodosContentPath, paths.Select(p => p.GetPathItemName())); Assert.DoesNotContain(TodosValuePath, paths.Select(p => p.GetPathItemName())); @@ -567,7 +567,7 @@ namespace Microsoft.OpenApi.OData.Edm.Tests } else if (streamPropName.Equals("content")) { - Assert.Equal(12, paths.Count()); + Assert.Equal(14, paths.Count()); Assert.Contains(TodosContentPath, paths.Select(p => p.GetPathItemName())); Assert.DoesNotContain(TodosLogoPath, paths.Select(p => p.GetPathItemName())); Assert.DoesNotContain(TodosValuePath, paths.Select(p => p.GetPathItemName())); diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathItemGeneratorTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathItemGeneratorTests.cs index b163330..9eae7de 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathItemGeneratorTests.cs +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathItemGeneratorTests.cs @@ -57,13 +57,16 @@ namespace Microsoft.OpenApi.OData.Generator.Tests // Assert Assert.NotNull(pathItems); - Assert.Equal(7, pathItems.Count); + Assert.Equal(10, pathItems.Count); Assert.Contains("/People", pathItems.Keys); + Assert.Contains("/People/$count", pathItems.Keys); Assert.Contains("/People/{UserName}", pathItems.Keys); Assert.Contains("/City", pathItems.Keys); + Assert.Contains("/City/$count", pathItems.Keys); Assert.Contains("/City/{Name}", pathItems.Keys); Assert.Contains("/CountryOrRegion", pathItems.Keys); + Assert.Contains("/CountryOrRegion/$count", pathItems.Keys); Assert.Contains("/CountryOrRegion/{Name}", pathItems.Keys); Assert.Contains("/Me", pathItems.Keys); } @@ -114,9 +117,10 @@ namespace Microsoft.OpenApi.OData.Generator.Tests // Assert Assert.NotNull(pathItems); - Assert.Equal(3, pathItems.Count); + Assert.Equal(4, pathItems.Count); Assert.Contains("/Customers", pathItems.Keys); + Assert.Contains("/Customers/$count", pathItems.Keys); Assert.Contains("/Customers({ID})", pathItems.Keys); Assert.Contains(expected, pathItems.Keys); } diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathsGeneratorTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathsGeneratorTests.cs index ac03f72..a7c63dd 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathsGeneratorTests.cs +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiPathsGeneratorTests.cs @@ -56,13 +56,16 @@ namespace Microsoft.OpenApi.OData.Generator.Tests // Assert Assert.NotNull(paths); - Assert.Equal(7, paths.Count); + Assert.Equal(10, paths.Count); Assert.Contains("/People", paths.Keys); + Assert.Contains("/People/$count", paths.Keys); Assert.Contains("/People/{UserName}", paths.Keys); Assert.Contains("/City", paths.Keys); + Assert.Contains("/City/$count", paths.Keys); Assert.Contains("/City/{Name}", paths.Keys); Assert.Contains("/CountryOrRegion", paths.Keys); + Assert.Contains("/CountryOrRegion/$count", paths.Keys); Assert.Contains("/CountryOrRegion/{Name}", paths.Keys); Assert.Contains("/Me", paths.Keys); } @@ -84,13 +87,16 @@ namespace Microsoft.OpenApi.OData.Generator.Tests // Assert Assert.NotNull(paths); - Assert.Equal(7, paths.Count); + Assert.Equal(10, paths.Count); Assert.Contains("/some/prefix/People", paths.Keys); + Assert.Contains("/some/prefix/People/$count", paths.Keys); Assert.Contains("/some/prefix/People/{UserName}", paths.Keys); Assert.Contains("/some/prefix/City", paths.Keys); + Assert.Contains("/some/prefix/City/$count", paths.Keys); Assert.Contains("/some/prefix/City/{Name}", paths.Keys); Assert.Contains("/some/prefix/CountryOrRegion", paths.Keys); + Assert.Contains("/some/prefix/CountryOrRegion/$count", paths.Keys); Assert.Contains("/some/prefix/CountryOrRegion/{Name}", paths.Keys); Assert.Contains("/some/prefix/Me", paths.Keys); } @@ -112,9 +118,10 @@ namespace Microsoft.OpenApi.OData.Generator.Tests // Assert Assert.NotNull(paths); - Assert.Equal(4, paths.Count); + Assert.Equal(5, paths.Count); Assert.Contains("/Accounts", paths.Keys); + Assert.Contains("/Accounts/$count", paths.Keys); Assert.Contains("/Accounts/{id}", paths.Keys); Assert.Contains("/Accounts/{id}/Attachments()", paths.Keys); Assert.Contains("/Accounts/{id}/AttachmentsAdd", paths.Keys);