add more UTs

Author: zhiyuanliang-ms

src/Microsoft.FeatureManagement/FeatureFilters/Recurrence/RecurrenceEvaluator.cs

@@ -49,9 +49,9 @@ static class RecurrenceEvaluator
         const string Numbered = "Numbered";
         const string NoEnd = "NoEnd";
 
-        const int WeeklyUnitIntervalDuration = 7; // in days
-        const int MonthlyUnitIntervalDuration = 28; // in days
-        const int YearlyUnitIntervalDuration = 365; // in days
+        const int WeekDayNumber = 7;
+        const int MinMonthDayNumber = 28;
+        const int MinYearDayNumber = 365;
 
         public static bool MatchRecurrence(DateTimeOffset time, TimeWindowFilterSettings settings)
         {
@@ -619,13 +619,13 @@ private static bool TryValidateWeeklyRecurrencePattern(TimeWindowFilterSettings
 
             RecurrencePattern pattern = settings.Recurrence.Pattern;
 
-            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * WeeklyUnitIntervalDuration);
+            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * WeekDayNumber);
 
             TimeSpan timeWindowDuration = settings.End.Value - settings.Start.Value;
 
             //
             // Time window duration must be shorter than how frequently it occurs
-            if (settings.End.Value - settings.Start.Value > intervalDuration)
+            if (timeWindowDuration > intervalDuration)
             {
                 paramName = $"{nameof(settings.End)}";
 
@@ -684,7 +684,7 @@ private static bool TryValidateAbsoluteMonthlyRecurrencePattern(TimeWindowFilter
 
             RecurrencePattern pattern = settings.Recurrence.Pattern;
 
-            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MonthlyUnitIntervalDuration);
+            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MinMonthDayNumber);
 
             //
             // Time window duration must be shorter than how frequently it occurs
@@ -730,7 +730,7 @@ private static bool TryValidateRelativeMonthlyRecurrencePattern(TimeWindowFilter
 
             RecurrencePattern pattern = settings.Recurrence.Pattern;
 
-            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MonthlyUnitIntervalDuration);
+            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MinMonthDayNumber);
 
             //
             // Time window duration must be shorter than how frequently it occurs
@@ -782,7 +782,7 @@ private static bool TryValidateAbsoluteYearlyRecurrencePattern(TimeWindowFilterS
 
             RecurrencePattern pattern = settings.Recurrence.Pattern;
 
-            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * YearlyUnitIntervalDuration);
+            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MinYearDayNumber);
 
             //
             // Time window duration must be shorter than how frequently it occurs
@@ -833,7 +833,7 @@ private static bool TryValidateRelativeYearlyRecurrencePattern(TimeWindowFilterS
 
             RecurrencePattern pattern = settings.Recurrence.Pattern;
 
-            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * YearlyUnitIntervalDuration);
+            TimeSpan intervalDuration = TimeSpan.FromDays(pattern.Interval * MinYearDayNumber);
 
             //
             // Time window duration must be shorter than how frequently it occurs

tests/Tests.FeatureManagement/FeatureManagement.cs

@@ -256,6 +256,8 @@ public async Task TimeWindow()
             string feature2 = "feature2";
             string feature3 = "feature3";
             string feature4 = "feature4";
+            string feature5 = "feature5";
+            string feature6 = "feature6";
 
             Environment.SetEnvironmentVariable($"FeatureManagement:{feature1}:EnabledFor:0:Name", "TimeWindow");
             Environment.SetEnvironmentVariable($"FeatureManagement:{feature1}:EnabledFor:0:Parameters:End", DateTimeOffset.UtcNow.AddDays(1).ToString("r"));
@@ -269,6 +271,19 @@ public async Task TimeWindow()
             Environment.SetEnvironmentVariable($"FeatureManagement:{feature4}:EnabledFor:0:Name", "TimeWindow");
             Environment.SetEnvironmentVariable($"FeatureManagement:{feature4}:EnabledFor:0:Parameters:Start", DateTimeOffset.UtcNow.AddDays(1).ToString("r"));
 
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature5}:EnabledFor:0:Name", "TimeWindow");
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature5}:EnabledFor:0:Parameters:Start", DateTimeOffset.UtcNow.AddDays(-2).ToString("r"));
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature5}:EnabledFor:0:Parameters:End", DateTimeOffset.UtcNow.AddDays(-1).ToString("r"));
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature5}:EnabledFor:0:Parameters:Recurrence:Pattern:Type", "Daily");
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature5}:EnabledFor:0:Parameters:Recurrence:Range:Type", "NoEnd");
+
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Name", "TimeWindow");
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Parameters:Start", DateTimeOffset.UtcNow.AddDays(-2).ToString("r"));
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Parameters:End", DateTimeOffset.UtcNow.AddDays(-1).ToString("r"));
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Parameters:Recurrence:Pattern:Type", "Daily");
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Parameters:Recurrence:Pattern:Interval", "3");
+            Environment.SetEnvironmentVariable($"FeatureManagement:{feature6}:EnabledFor:0:Parameters:Recurrence:Range:Type", "NoEnd");
+
             IConfiguration config = new ConfigurationBuilder().AddEnvironmentVariables().Build();
 
             var serviceCollection = new ServiceCollection();
@@ -285,6 +300,8 @@ public async Task TimeWindow()
             Assert.False(await featureManager.IsEnabledAsync(feature2));
             Assert.True(await featureManager.IsEnabledAsync(feature3));
             Assert.False(await featureManager.IsEnabledAsync(feature4));
+            Assert.True(await featureManager.IsEnabledAsync(feature5));
+            Assert.False(await featureManager.IsEnabledAsync(feature6));
         }
 
         [Fact]