add basic tests for moving path parameters to path item

Author: danielmbaluka

src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs

@@ -49,10 +49,7 @@ public virtual OpenApiOperation CreateOperation(ODataContext context, ODataPath
                These need to be set before Responses, as the Parameters
                will be used in the Responses when creating Links.
             */
-            if (!Context.Settings.DeclarePathParametersOnPathItem)
-            {
-                SetParameters(operation);
-            }
+            SetParameters(operation);
 
             // Responses
             SetResponses(operation);
@@ -142,12 +139,15 @@ protected virtual void SetRequestBody(OpenApiOperation operation)
         /// <param name="operation">The <see cref="OpenApiOperation"/>.</param>
         protected virtual void SetParameters(OpenApiOperation operation)
         {
-            foreach (ODataKeySegment keySegment in Path.OfType<ODataKeySegment>())
+            if (!Context.Settings.DeclarePathParametersOnPathItem)
             {
-                IDictionary<string, string> mapping = ParameterMappings[keySegment];
-                foreach (var p in Context.CreateKeyParameters(keySegment, mapping))
+                foreach (ODataKeySegment keySegment in Path.OfType<ODataKeySegment>())
                 {
-                    AppendParameter(operation, p);
+                    IDictionary<string, string> mapping = ParameterMappings[keySegment];
+                    foreach (var p in Context.CreateKeyParameters(keySegment, mapping))
+                    {
+                        AppendParameter(operation, p);
+                    }
                 }
             }
 

test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/EntityPathItemHandlerTests.cs

@@ -76,6 +76,45 @@ public void CreateEntityPathItemReturnsCorrectPathItem()
                 pathItem.Operations.Select(o => o.Key));
         }
 
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CreateEntityPathItemReturnsCorrectPathItemWithPathParameters(bool declarePathParametersOnPathItem)
+        {
+            // Arrange
+            IEdmModel model = EntitySetPathItemHandlerTests.GetEdmModel(annotation: "");
+            OpenApiConvertSettings convertSettings = new OpenApiConvertSettings
+            {
+                DeclarePathParametersOnPathItem = declarePathParametersOnPathItem,
+            };
+            ODataContext context = new ODataContext(model, convertSettings);
+            IEdmEntitySet entitySet = model.EntityContainer.FindEntitySet("Customers");
+            Assert.NotNull(entitySet); // guard
+            ODataPath path = new ODataPath(new ODataNavigationSourceSegment(entitySet), new ODataKeySegment(entitySet.EntityType()));
+
+            // Act
+            var pathItem = _pathItemHandler.CreatePathItem(context, path);
+
+            // Assert
+            Assert.NotNull(pathItem);
+
+            Assert.NotNull(pathItem.Operations);
+            Assert.NotEmpty(pathItem.Operations);
+            Assert.Equal(3, pathItem.Operations.Count);
+            Assert.Equal(new OperationType[] { OperationType.Get, OperationType.Patch, OperationType.Delete },
+                pathItem.Operations.Select(o => o.Key));
+
+            if (declarePathParametersOnPathItem)
+            {
+                Assert.NotEmpty(pathItem.Parameters);
+                Assert.Equal(1, pathItem.Parameters.Count);
+            }
+            else
+            {
+                Assert.Empty(pathItem.Parameters);
+            }
+        }
+
         [Fact]
         public void CreateEntityPathItemReturnsCorrectPathItemWithReferences()
         {

test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs

@@ -95,6 +95,65 @@ public void CreateCollectionNavigationPropertyPathItemReturnsCorrectPathItem(boo
             Assert.NotEmpty(pathItem.Description);
         }
 
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(true, false)]
+        [InlineData(false, true)]
+        [InlineData(false, false)]
+        public void CreateNavigationPropertyPathItemReturnsCorrectPathItemWithPathParameters(bool keySegment, bool declarePathParametersOnPathItem)
+        {
+            // Arrange
+            IEdmModel model = GetEdmModel("");
+            OpenApiConvertSettings settings = new()
+            {
+                DeclarePathParametersOnPathItem = declarePathParametersOnPathItem,
+            };
+            ODataContext context = new ODataContext(model, settings);
+            IEdmEntitySet entitySet = model.EntityContainer.FindEntitySet("Customers");
+            Assert.NotNull(entitySet); // guard
+            IEdmEntityType entityType = entitySet.EntityType();
+
+            IEdmNavigationProperty property = entityType.DeclaredNavigationProperties()
+                .FirstOrDefault(c => c.ContainsTarget == true && c.TargetMultiplicity() == EdmMultiplicity.Many);
+            Assert.NotNull(property);
+
+            ODataPath path = new ODataPath(new ODataNavigationSourceSegment(entitySet),
+                new ODataKeySegment(entityType),
+                new ODataNavigationPropertySegment(property));
+
+            if (keySegment)
+            {
+                path.Push(new ODataKeySegment(property.ToEntityType()));
+            }
+
+            // Act
+            var pathItem = _pathItemHandler.CreatePathItem(context, path);
+
+            // Assert
+            Assert.NotNull(pathItem);
+
+            Assert.NotNull(pathItem.Operations);
+            Assert.NotEmpty(pathItem.Operations);
+            Assert.NotEmpty(pathItem.Description);
+
+            if (declarePathParametersOnPathItem)
+            {
+                Assert.NotEmpty(pathItem.Parameters);
+                if (keySegment)
+                {
+                    Assert.Equal(2, pathItem.Parameters.Count); // Customer ID and ContainedOrderLines Order ID
+                }
+                else
+                {
+                    Assert.Equal(1, pathItem.Parameters.Count); // Customer ID
+                }
+            }
+            else
+            {
+                Assert.Empty(pathItem.Parameters);
+            }
+        }
+
         [Theory]
         [InlineData(true, new OperationType[] { OperationType.Get, OperationType.Patch, OperationType.Delete })]
         [InlineData(false, new OperationType[] { OperationType.Get })]