Bugfix: more than 1 "and {time}" didn't work

mattiasnordqvist · Apr 1, 2016 · 73bacc3 · 73bacc3
1 parent dd053f0
commit 73bacc3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/GoldenFox.ANTLR/GoldenFoxLanguage.g4 b/GoldenFox.ANTLR/GoldenFoxLanguage.g4
@@ -28,7 +28,7 @@ between: 'between' time 'and' time;
 from: 'from' datetime;
 until: 'until' datetime;
 time: (INT':'INT(':'INT)?);
-times: time ('and' time)?;
+times: time ('and' times)?;
 weekday: ('monday' | 'tuesday' | 'wednesday' | 'thursday' | 'friday' | 'saturday' | 'sunday');
 numberedDay: INT('st'|'nd'|'rd'|'th');
 datetime: (date)(time)?; 

diff --git a/GoldenFox/Internal/Operators/First.cs b/GoldenFox/Internal/Operators/First.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace GoldenFox.Internal.Operators
 {

diff --git a/GoldenFox/Properties/AssemblyInfo.cs b/GoldenFox/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyCopyright("Copyright © Mattias Nordqvist")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0")]
+[assembly: AssemblyVersion("2.2.1")]
+[assembly: AssemblyFileVersion("2.2.1")]
 [assembly: AssemblyProduct("Golden Fox")]
 [assembly: AssemblyCompany("Mattias Nordqvist")]
 

diff --git a/Tests/Full/ScheduleTests.cs b/Tests/Full/ScheduleTests.cs
@@ -7,6 +7,16 @@ namespace Tests.Full
     [TestFixture]
     public class ScheduleTests
     {
+        [Test]
+        public void TestFromSomeLiveCode()
+        {
+            "every day @ 06:00 and 12:00 and 18:00".From("2016-04-01 05:49").Gives("2016-04-01 06:00");
+            "every day @ 06:00 and 12:00 and 18:00".From("2016-04-01 11:49").Gives("2016-04-01 12:00");
+            "every day @ 06:00 and 12:00 and 18:00".From("2016-04-01 15:49").Gives("2016-04-01 18:00");
+            "every day @ 06:00 and 12:00 and 18:00".From("2016-04-01 18:49").Gives("2016-04-02 06:00");
+
+        }
+
         [Test]
         public void EveryHour()
         {