Merge branch 'release/2.2' (#282)

Author: HaoK

src/Microsoft.Extensions.Options/ValidateOptionsResult.cs

@@ -16,7 +16,7 @@ public class ValidateOptionsResult
         /// <summary>
         /// Validation was successful.
         /// </summary>
-        public static readonly ValidateOptionsResult Success = new ValidateOptionsResult() { Skipped = true };
+        public static readonly ValidateOptionsResult Success = new ValidateOptionsResult() { Succeeded = true };
 
         /// <summary>
         /// True if validation was successful.

test/Microsoft.Extensions.Options.Test/OptionsValidationTests.cs

@@ -0,0 +1,78 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.Extensions.Options.Tests
+{
+    public class OptionsValidationTest
+    {
+        [Fact]
+        public void ValidationResultSuccessIfNameMatched()
+        {
+            var services = new ServiceCollection();
+            services.AddOptions<ComplexOptions>()
+                .Validate(o => o.Boolean)
+                .Validate(o => o.Integer > 12);
+
+            var sp = services.BuildServiceProvider();
+
+            var validations = sp.GetService<IEnumerable<IValidateOptions<ComplexOptions>>>();
+            var options = new ComplexOptions
+            {
+                Boolean = true,
+                Integer = 13
+            };
+            foreach (var v in validations)
+            {
+                Assert.True(v.Validate(Options.DefaultName, options).Succeeded);
+                Assert.True(v.Validate("Something", options).Skipped);
+            }
+        }
+
+        [Fact]
+        public void ValidationResultSkippedIfNameNotMatched()
+        {
+            var services = new ServiceCollection();
+            services.AddOptions<ComplexOptions>("Name")
+                .Validate(o => o.Boolean);
+
+            var sp = services.BuildServiceProvider();
+
+            var validations = sp.GetService<IEnumerable<IValidateOptions<ComplexOptions>>>();
+            var options = new ComplexOptions
+            {
+                Boolean = true,
+            };
+            foreach (var v in validations)
+            {
+                Assert.True(v.Validate(Options.DefaultName, options).Skipped);
+                Assert.True(v.Validate("Name", options).Succeeded);
+            }
+        }
+
+        [Fact]
+        public void ValidationResultFailedOrSkipped()
+        {
+            var services = new ServiceCollection();
+            services.AddOptions<ComplexOptions>("Name")
+                .Validate(o => o.Boolean);
+
+            var sp = services.BuildServiceProvider();
+
+            var validations = sp.GetService<IEnumerable<IValidateOptions<ComplexOptions>>>();
+            var options = new ComplexOptions
+            {
+                Boolean = false,
+            };
+            foreach (var v in validations)
+            {
+                Assert.True(v.Validate(Options.DefaultName, options).Skipped);
+                Assert.True(v.Validate("Name", options).Failed);
+            }
+        }
+
+    }
+}