Address PR feedback

Author: MaggieKimani1

src/Microsoft.OpenApi.Tool/Program.cs

@@ -29,7 +29,7 @@ static async Task<int> Main(string[] args)
                 new Option("--format", "File format",typeof(OpenApiFormat) ),
                 new Option("--inline", "Inline $ref instances", typeof(bool) ),
                 new Option("--resolveExternal","Resolve external $refs", typeof(bool)),
-                new Option("--filterByOperationIds", "Filters OpenApiDocument by OperationId provided", typeof(string)),
+                new Option("--filterByOperationIds", "Filters OpenApiDocument by OperationId(s) provided", typeof(string)),
                 new Option("--filterByTags", "Filters OpenApiDocument by Tag(s) provided", typeof(string))
             };
             transformCommand.Handler = CommandHandler.Create<string, FileInfo, OpenApiSpecVersion, OpenApiFormat, string, string, bool, bool>(

test/Microsoft.OpenApi.Tests/Services/OpenApiFilterServiceTests.cs

@@ -19,33 +19,31 @@ public OpenApiFilterServiceTests()
         }
 
         [Theory]
-        [InlineData("users.user.ListUser", null)]
-        [InlineData("users.user.GetUser", null)]
-        [InlineData("administrativeUnits.restore", null)]
-        [InlineData("graphService.GetGraphService", null)]
-        [InlineData(null, "users.user")]
-        [InlineData(null, "applications.application")]
-        [InlineData(null, "reports.Functions")]
-        public void ReturnFilteredOpenApiDocumentBasedOnOperationIds(string operationIds, string tags)
+        [InlineData("users.user.ListUser", null, 1)]
+        [InlineData("users.user.GetUser", null, 1)]
+        [InlineData("users.user.ListUser,users.user.GetUser", null, 2)]
+        [InlineData("*", null, 12)]
+        [InlineData("administrativeUnits.restore", null, 1)]
+        [InlineData("graphService.GetGraphService", null, 1)]
+        [InlineData(null, "users.user,applications.application", 3)]
+        [InlineData(null, "^users\\.", 3)]
+        [InlineData(null, "users.user", 2)]
+        [InlineData(null, "applications.application", 1)]
+        [InlineData(null, "reports.Functions", 2)]
+        public void ReturnFilteredOpenApiDocumentBasedOnOperationIdsAndTags(string operationIds, string tags, int expectedPathCount)
         {
             // Act
             var predicate = OpenApiFilterService.CreatePredicate(operationIds, tags);
             var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(_openApiDocumentMock, predicate);
 
             // Assert
             Assert.NotNull(subsetOpenApiDocument);
-            if (!string.IsNullOrEmpty(operationIds))
-            {
-                Assert.Single(subsetOpenApiDocument.Paths);
-            }
-            else if (!string.IsNullOrEmpty(tags))
-            {
-                Assert.NotEmpty(subsetOpenApiDocument.Paths);
-            }
+            Assert.NotEmpty(subsetOpenApiDocument.Paths);
+            Assert.Equal(expectedPathCount, subsetOpenApiDocument.Paths.Count);
         }
 
         [Fact]
-        public void ThrowsInvalidOperationExceptionInCreatePredicateWhenInvalidOperationIdIsSpecified()
+        public void ThrowsInvalidOperationExceptionInCreatePredicateWhenInvalidArgumentsArePassed()
         {
             // Act and Assert
             var message = Assert.Throws<InvalidOperationException>(() =>OpenApiFilterService.CreatePredicate(null, null)).Message;