test

zhiyuanliang-ms · zhiyuanliang-ms · commit b51b184cd64b · 2023-09-27T10:07:06.000+08:00
diff --git a/src/Microsoft.FeatureManagement/FeatureFilters/Recurrence/RecurrenceEvaluator.cs b/src/Microsoft.FeatureManagement/FeatureFilters/Recurrence/RecurrenceEvaluator.cs
@@ -296,7 +296,9 @@ private static bool TryGetPreviousOccurrence(DateTimeOffset time, TimeWindowFilt
 
             if (string.Equals(range.Type, EndDate, StringComparison.OrdinalIgnoreCase))
             {
-                if (previousOccurrence.Year > range.EndDate.Value.Year || previousOccurrence.DayOfYear > range.EndDate.Value.DayOfYear)
+                DateTime alignedPreviousOccurrence = previousOccurrence.DateTime + timeZoneOffset - previousOccurrence.Offset;
+
+                if (alignedPreviousOccurrence.Date > range.EndDate.Value.Date)
                 {
                     return false;
                 }
@@ -450,7 +452,7 @@ private static bool TryValidateSettings(TimeWindowFilterSettings settings, out s
                         return false;
                     }
 
-                    if (!IsDurationComplianceWithDaysOfWeek(timeWindowDuration, interval, recurrence.Pattern.DaysOfWeek, recurrence.Pattern.FirstDayOfWeek))
+                    if (!IsDurationCompliantWithDaysOfWeek(timeWindowDuration, interval, recurrence.Pattern.DaysOfWeek, recurrence.Pattern.FirstDayOfWeek))
                     {
                         paramName = nameof(settings.End);
 
@@ -615,7 +617,7 @@ private static bool TryValidateSettings(TimeWindowFilterSettings settings, out s
             return true;
         }
 
-        private static bool IsDurationComplianceWithDaysOfWeek(TimeSpan duration, int interval, IEnumerable<string> daysOfWeek, string firstDayOfWeek)
+        private static bool IsDurationCompliantWithDaysOfWeek(TimeSpan duration, int interval, IEnumerable<string> daysOfWeek, string firstDayOfWeek)
         {
             if (daysOfWeek == null || daysOfWeek.Count() < 1)
             {
@@ -669,7 +671,6 @@ private static bool IsDurationComplianceWithDaysOfWeek(TimeSpan duration, int in
                 {
                     minGap = gap;
                 }
-
             }
 
             return minGap >= duration;
@@ -858,11 +859,9 @@ private static bool TryValidateEndDate(TimeWindowFilterSettings settings, out st
 
             DateTime alignedStart = start.DateTime + timeZoneOffset - start.Offset;
 
-            DateTimeOffset endDate = recurrence.Range.EndDate.Value;
-
-            DateTime alignedEndDate = endDate.DateTime + timeZoneOffset - endDate.Offset;
+            DateTime endDate = recurrence.Range.EndDate.Value.DateTime;
             
-            if (alignedEndDate.Date < alignedStart.Date)
+            if (endDate.Date < alignedStart.Date)
             {
                 reason = OutOfRange;
 
diff --git a/tests/Tests.FeatureManagement/FeatureManagement.cs b/tests/Tests.FeatureManagement/FeatureManagement.cs
@@ -317,7 +317,7 @@ public async Task Percentage()
                 }
             }
 
-            Assert.True(enabledCount > 0 && enabledCount < 10);
+            Assert.True(enabledCount >= 0 && enabledCount < 10);
         }
 
         [Fact]
diff --git a/tests/Tests.FeatureManagement/RecurrenceEvaluator.cs b/tests/Tests.FeatureManagement/RecurrenceEvaluator.cs
@@ -954,8 +954,8 @@ public IEnumerator<object[]> GetEnumerator()
         {
             yield return new object[] { new TimeWindowFilterSettings()
                                     {
-                                        Start = DateTimeOffset.Parse("2023-9-1T00:00:00+08:00"),
-                                        End = DateTimeOffset.Parse("2023-9-1T00:00:01+08:00"),
+                                        Start = DateTimeOffset.Parse("2023-9-1T23:00:00+00:00"),
+                                        End = DateTimeOffset.Parse("2023-9-1T23:00:01+00:00"),
                                         Recurrence = new Recurrence()
                                         {
                                             Pattern = new RecurrencePattern()
@@ -965,8 +965,8 @@ public IEnumerator<object[]> GetEnumerator()
                                             Range = new RecurrenceRange()
                                             {
                                                 Type = "EndDate",
-                                                EndDate = DateTimeOffset.Parse("2023-8-31"),
-                                                RecurrenceTimeZone = "UTC+00:00"
+                                                EndDate = DateTimeOffset.Parse("2023-9-1"),
+                                                RecurrenceTimeZone = "UTC+08:00"
                                             }
                                         }
                                     },
@@ -1504,11 +1504,11 @@ public IEnumerator<object[]> GetEnumerator()
                                         },
                                         false };
 
-            yield return new object[] { DateTimeOffset.Parse("2023-9-3T00:00:00+08:00"),
+            yield return new object[] { DateTimeOffset.Parse("2023-9-2T17:00:00+00:00"),
                                         new TimeWindowFilterSettings()
                                         {
-                                            Start = DateTimeOffset.Parse("2023-9-1T00:00:00+08:00"),
-                                            End = DateTimeOffset.Parse("2023-9-1T00:00:01+08:00"),
+                                            Start = DateTimeOffset.Parse("2023-9-1T17:00:00+00:00"),
+                                            End = DateTimeOffset.Parse("2023-9-1T17:30:00+00:00"),
                                             Recurrence = new Recurrence()
                                             {
                                                 Pattern = new RecurrencePattern()
@@ -1518,8 +1518,8 @@ public IEnumerator<object[]> GetEnumerator()
                                                 Range = new RecurrenceRange()
                                                 {
                                                     Type = "EndDate",
-                                                    EndDate = DateTimeOffset.Parse("2023-9-2T15:59:59+00:00"),
-                                                    RecurrenceTimeZone = "UTC+00:00"
+                                                    EndDate = DateTimeOffset.Parse("2023-9-2"),
+                                                    RecurrenceTimeZone = "UTC+08:00"
                                                 }
                                             }
                                         },

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,9 @@ private static bool TryGetPreviousOccurrence(DateTimeOffset time, TimeWindowFilt`
`296`	`296`
`297`	`297`	`if (string.Equals(range.Type, EndDate, StringComparison.OrdinalIgnoreCase))`
`298`	`298`	`{`
`299`		`- if (previousOccurrence.Year > range.EndDate.Value.Year \|\| previousOccurrence.DayOfYear > range.EndDate.Value.DayOfYear)`
	`299`	`+ DateTime alignedPreviousOccurrence = previousOccurrence.DateTime + timeZoneOffset - previousOccurrence.Offset;`
	`300`	`+`
	`301`	`+ if (alignedPreviousOccurrence.Date > range.EndDate.Value.Date)`
`300`	`302`	`{`
`301`	`303`	`return false;`
`302`	`304`	`}`
`@@ -450,7 +452,7 @@ private static bool TryValidateSettings(TimeWindowFilterSettings settings, out s`
`450`	`452`	`return false;`
`451`	`453`	`}`
`452`	`454`
`453`		`- if (!IsDurationComplianceWithDaysOfWeek(timeWindowDuration, interval, recurrence.Pattern.DaysOfWeek, recurrence.Pattern.FirstDayOfWeek))`
	`455`	`+ if (!IsDurationCompliantWithDaysOfWeek(timeWindowDuration, interval, recurrence.Pattern.DaysOfWeek, recurrence.Pattern.FirstDayOfWeek))`
`454`	`456`	`{`
`455`	`457`	`paramName = nameof(settings.End);`
`456`	`458`
`@@ -615,7 +617,7 @@ private static bool TryValidateSettings(TimeWindowFilterSettings settings, out s`
`615`	`617`	`return true;`
`616`	`618`	`}`
`617`	`619`
`618`		`- private static bool IsDurationComplianceWithDaysOfWeek(TimeSpan duration, int interval, IEnumerable<string> daysOfWeek, string firstDayOfWeek)`
	`620`	`+ private static bool IsDurationCompliantWithDaysOfWeek(TimeSpan duration, int interval, IEnumerable<string> daysOfWeek, string firstDayOfWeek)`
`619`	`621`	`{`
`620`	`622`	`if (daysOfWeek == null \|\| daysOfWeek.Count() < 1)`
`621`	`623`	`{`
`@@ -669,7 +671,6 @@ private static bool IsDurationComplianceWithDaysOfWeek(TimeSpan duration, int in`
`669`	`671`	`{`
`670`	`672`	`minGap = gap;`
`671`	`673`	`}`
`672`		`-`
`673`	`674`	`}`
`674`	`675`
`675`	`676`	`return minGap >= duration;`
`@@ -858,11 +859,9 @@ private static bool TryValidateEndDate(TimeWindowFilterSettings settings, out st`
`858`	`859`
`859`	`860`	`DateTime alignedStart = start.DateTime + timeZoneOffset - start.Offset;`
`860`	`861`
`861`		`- DateTimeOffset endDate = recurrence.Range.EndDate.Value;`
`862`		`-`
`863`		`- DateTime alignedEndDate = endDate.DateTime + timeZoneOffset - endDate.Offset;`
	`862`	`+ DateTime endDate = recurrence.Range.EndDate.Value.DateTime;`
`864`	`863`
`865`		`- if (alignedEndDate.Date < alignedStart.Date)`
	`864`	`+ if (endDate.Date < alignedStart.Date)`
`866`	`865`	`{`
`867`	`866`	`reason = OutOfRange;`
`868`	`867`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public async Task Percentage()`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`
`320`		`- Assert.True(enabledCount > 0 && enabledCount < 10);`
	`320`	`+ Assert.True(enabledCount >= 0 && enabledCount < 10);`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -954,8 +954,8 @@ public IEnumerator<object[]> GetEnumerator()`
`954`	`954`	`{`
`955`	`955`	`yield return new object[] { new TimeWindowFilterSettings()`
`956`	`956`	`{`
`957`		`- Start = DateTimeOffset.Parse("2023-9-1T00:00:00+08:00"),`
`958`		`- End = DateTimeOffset.Parse("2023-9-1T00:00:01+08:00"),`
	`957`	`+ Start = DateTimeOffset.Parse("2023-9-1T23:00:00+00:00"),`
	`958`	`+ End = DateTimeOffset.Parse("2023-9-1T23:00:01+00:00"),`
`959`	`959`	`Recurrence = new Recurrence()`
`960`	`960`	`{`
`961`	`961`	`Pattern = new RecurrencePattern()`
`@@ -965,8 +965,8 @@ public IEnumerator<object[]> GetEnumerator()`
`965`	`965`	`Range = new RecurrenceRange()`
`966`	`966`	`{`
`967`	`967`	`Type = "EndDate",`
`968`		`- EndDate = DateTimeOffset.Parse("2023-8-31"),`
`969`		`- RecurrenceTimeZone = "UTC+00:00"`
	`968`	`+ EndDate = DateTimeOffset.Parse("2023-9-1"),`
	`969`	`+ RecurrenceTimeZone = "UTC+08:00"`
`970`	`970`	`}`
`971`	`971`	`}`
`972`	`972`	`},`
`@@ -1504,11 +1504,11 @@ public IEnumerator<object[]> GetEnumerator()`
`1504`	`1504`	`},`
`1505`	`1505`	`false };`
`1506`	`1506`
`1507`		`- yield return new object[] { DateTimeOffset.Parse("2023-9-3T00:00:00+08:00"),`
	`1507`	`+ yield return new object[] { DateTimeOffset.Parse("2023-9-2T17:00:00+00:00"),`
`1508`	`1508`	`new TimeWindowFilterSettings()`
`1509`	`1509`	`{`
`1510`		`- Start = DateTimeOffset.Parse("2023-9-1T00:00:00+08:00"),`
`1511`		`- End = DateTimeOffset.Parse("2023-9-1T00:00:01+08:00"),`
	`1510`	`+ Start = DateTimeOffset.Parse("2023-9-1T17:00:00+00:00"),`
	`1511`	`+ End = DateTimeOffset.Parse("2023-9-1T17:30:00+00:00"),`
`1512`	`1512`	`Recurrence = new Recurrence()`
`1513`	`1513`	`{`
`1514`	`1514`	`Pattern = new RecurrencePattern()`
`@@ -1518,8 +1518,8 @@ public IEnumerator<object[]> GetEnumerator()`
`1518`	`1518`	`Range = new RecurrenceRange()`
`1519`	`1519`	`{`
`1520`	`1520`	`Type = "EndDate",`
`1521`		`- EndDate = DateTimeOffset.Parse("2023-9-2T15:59:59+00:00"),`
`1522`		`- RecurrenceTimeZone = "UTC+00:00"`
	`1521`	`+ EndDate = DateTimeOffset.Parse("2023-9-2"),`
	`1522`	`+ RecurrenceTimeZone = "UTC+08:00"`
`1523`	`1523`	`}`
`1524`	`1524`	`}`
`1525`	`1525`	`},`