@@ -106,6 +106,10 @@ Public Class ScheduleElement Dim schedule As IMonitorSchedule = SiphonConfigurationSection.CreateInstance(Me.Type) schedule.Initialize(Me) + For Each exclusion As ExclusionElement In Me.Exclusions + schedule.Exclusions.Add(New ScheduleExclusion(exclusion.From, exclusion.To)) + Next + Return schedule End Function Siphon/Configuration/ScheduleElement.vb @@ -30,6 +30,27 @@ Public Class ScheduleExclusion End Sub ''' <summary> + ''' Creates a new ScheduleExclusion using strings containing DateTime or TimeSpan formats. + ''' </summary> + ''' <param name="from">String. The start of the schedules exclusion.</param> + ''' <param name="to">String. The end of the schedules exclusion.</param> + ''' <remarks>This is used to load an exclusion dynamically from strings read from config.</remarks> + Public Sub New(ByVal from As String, ByVal [to] As String) + Dim ts As TimeSpan + Dim dt As DateTime + + If TimeSpan.TryParse(from, ts) AndAlso TimeSpan.TryParse([to], ts) Then + _from = Date.MinValue + TimeSpan.Parse(from) + _to = Date.MinValue + TimeSpan.Parse([to]) + ElseIf DateTime.TryParse(from, dt) AndAlso DateTime.TryParse([to], dt) Then + _from = from + _to = [to] + Else + Throw New FormatException("From/To must both be TimeSpan or Datetime parsable strings") + End If + End Sub + + ''' <summary> ''' Returns the next available DateTime, checking if the start is within the current exclusion. ''' </summary> ''' <param name="start">DateTime. The proposed next date time.</param> Siphon/Schedules/ScheduleExclusion.vb @@ -72,6 +72,7 @@ Public Class ConfigurationTests Assert.IsInstanceOfType(GetType(MockProcessor), monitor.Processor) Assert.AreEqual(DataActions.Rename Or DataActions.Move, monitor.ProcessCompleteActions) Assert.AreEqual(DataActions.Delete, monitor.ProcessFailureActions) + Assert.AreEqual(2, monitor.Schedule.Exclusions.Count) monitor = section.Monitors(1).CreateInstance Assert.IsInstanceOfType(GetType(FtpDirectoryMonitor), monitor) SiphonTests/Configuration/ConfigurationTests.vb @@ -121,4 +121,36 @@ Public Class ExclusionTests End Sub #End Region +#Region "String Tests" + + <Test(Description:="Can create an exclusion with strings")> _ + Public Sub CanCreateUsingString() + Dim exclusion As New ScheduleExclusion("1:20:00", "2:30:00") + + Assert.IsInstanceOfType(GetType(ScheduleExclusion), exclusion) + End Sub + + <Test(Description:="Returns first available DateTime after excluded String range")> _ + Public Sub ReturnsFirstAvailableDateTimeAfterStringDateTimeRange() + Dim from As DateTime = DateTime.Parse("10/10/2010 1:00PM") + Dim [to] As DateTime = from.AddHours(1) + Dim nextAvailable As DateTime = [to].AddSeconds(1) + + Dim exclusion As New ScheduleExclusion(from.ToString, [to].ToString) + + Assert.AreEqual(nextAvailable, exclusion.NextAvailable(from.AddMinutes(2))) + End Sub + + <Test(Description:="Returns first available DateTime after excluded String range")> _ + Public Sub ReturnsFirstAvailableDateTimeAfterStringTimeSpanRange() + Dim start As DateTime = DateTime.Parse("10/10/2010 1:30AM") + Dim nextAvailable As DateTime = DateTime.Parse("10/10/2010 2:30:01AM") + + Dim exclusion As New ScheduleExclusion("1:20", "2:30") + + Assert.AreEqual(nextAvailable, exclusion.NextAvailable(start)) + End Sub + +#End Region + End Class SiphonTests/Schedules/ExclusionTests.vb 5fd3887c9b11f7e32be7b586be6fd524945e5c59 Christopher H. Laco claco@chrislaco.com http://github.com/claco/siphon/commit/8a28dd5dec9fe31b7969f084ce7b1b27b503da9a 8a28dd5dec9fe31b7969f084ce7b1b27b503da9a 2009-10-13T11:31:02-07:00 2009-10-13T11:31:02-07:00 Make sure Element.CreateInstance loads exclusions into Schedule e038f164f0ce018613b5b2fdfc11ff898bf4a51e Christopher H. Laco claco@chrislaco.com