From 9e5742a46211fbf4cb33e32082febb5932b5ad3e Mon Sep 17 00:00:00 2001
From: Fredrik Meringdal <fmeringdal@hotmail.com>
Date: Fri, 16 Oct 2020 01:31:17 +0200
Subject: more tests and some bug fixes

---
 tests/rrule.rs | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/rrule.rs b/tests/rrule.rs
index 3691fbb..967e337 100644
--- a/tests/rrule.rs
+++ b/tests/rrule.rs
@@ -565,10 +565,10 @@ mod test {
             count: Some(3),
             bymonth: vec![],
             dtstart: ymd_hms(1997, 9, 2, 9, 0, 0),
-            byweekday: vec![20],
+            byweekday: vec![],
             byhour: vec![9],
             bysetpos: vec![],
-            byweekno: vec![],
+            byweekno: vec![20],
             byminute: vec![0],
             bysecond: vec![0],
             byyearday: vec![],
@@ -584,8 +584,72 @@ mod test {
             &mut options,
             &vec![
                 ymd_hms(1998, 5, 11, 9, 0, 0),
-                ymd_hms(1999, 5, 12, 9, 0, 0),
-                ymd_hms(1999, 5, 13, 9, 0, 0),
+                ymd_hms(1998, 5, 12, 9, 0, 0),
+                ymd_hms(1998, 5, 13, 9, 0, 0),
+            ],
+        );
+    }
+
+    #[test]
+    fn yearly_by_weekno_and_weekday() {
+        let mut options = ParsedOptions {
+            freq: Frequenzy::YEARLY,
+            count: Some(3),
+            bymonth: vec![],
+            dtstart: ymd_hms(1997, 9, 2, 9, 0, 0),
+            byweekday: vec![0],
+            byhour: vec![9],
+            bysetpos: vec![],
+            byweekno: vec![1],
+            byminute: vec![0],
+            bysecond: vec![0],
+            byyearday: vec![],
+            bymonthday: vec![],
+            bynweekday: vec![],
+            bynmonthday: vec![],
+            until: None,
+            wkst: 0,
+            tzid: None,
+            interval: 1,
+        };
+        test_recurring(
+            &mut options,
+            &vec![
+                ymd_hms(1997, 12, 29, 9, 0, 0),
+                ymd_hms(1999, 1, 4, 9, 0, 0),
+                ymd_hms(2000, 1, 3, 9, 0, 0),
+            ],
+        );
+    }
+
+    #[test]
+    fn yearly_by_weekno_and_weekday_large() {
+        let mut options = ParsedOptions {
+            freq: Frequenzy::YEARLY,
+            count: Some(3),
+            bymonth: vec![],
+            dtstart: ymd_hms(1997, 9, 2, 9, 0, 0),
+            byweekday: vec![6],
+            byhour: vec![9],
+            bysetpos: vec![],
+            byweekno: vec![52],
+            byminute: vec![0],
+            bysecond: vec![0],
+            byyearday: vec![],
+            bymonthday: vec![],
+            bynweekday: vec![],
+            bynmonthday: vec![],
+            until: None,
+            wkst: 0,
+            tzid: None,
+            interval: 1,
+        };
+        test_recurring(
+            &mut options,
+            &vec![
+                ymd_hms(1997, 12, 28, 9, 0, 0),
+                ymd_hms(1998, 12, 27, 9, 0, 0),
+                ymd_hms(2000, 1, 2, 9, 0, 0),
             ],
         );
     }
-- 
cgit v1.2.3