chrono-node 2.8.5 → 2.9.1

package/test/en/en_weekday.test.ts

@@ -342,6 +342,111 @@ test("Test - Weekday range", () => {
     });
 });
 
+test("Test - Weekday 'of next/last/this week' connector", function () {
+    // Ref date is a Tuesday — the same weekday as most test targets below.
+    // Before the fix, 'Tuesday of next week' silently dropped the modifier and
+    // resolved to today (0 days forward) instead of +7 days.
+    const refDate = new Date("Tue Aug 2 2022");
+
+    // --- of next week ---
+
+    testSingleCase(chrono.casual, "Tuesday of next week", refDate, (result) => {
+        expect(result.text).toBe("Tuesday of next week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(9); // Aug 9 — NOT today (Aug 2)
+        expect(result.start.get("weekday")).toBe(2);
+        expect(result.start).toBeDate(new Date(2022, 7, 9, 12));
+    });
+
+    testSingleCase(chrono.casual, "Friday of next week", refDate, (result) => {
+        expect(result.text).toBe("Friday of next week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(12); // Aug 12
+        expect(result.start.get("weekday")).toBe(5);
+        expect(result.start).toBeDate(new Date(2022, 7, 12, 12));
+    });
+
+    testSingleCase(chrono.casual, "Monday of next week", refDate, (result) => {
+        expect(result.text).toBe("Monday of next week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(8); // Aug 8
+        expect(result.start.get("weekday")).toBe(1);
+        expect(result.start).toBeDate(new Date(2022, 7, 8, 12));
+    });
+
+    // --- of last week ---
+
+    testSingleCase(chrono.casual, "Tuesday of last week", refDate, (result) => {
+        expect(result.text).toBe("Tuesday of last week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(26); // Jul 26
+        expect(result.start.get("weekday")).toBe(2);
+        expect(result.start).toBeDate(new Date(2022, 6, 26, 12));
+    });
+
+    testSingleCase(chrono.casual, "Friday of last week", refDate, (result) => {
+        expect(result.text).toBe("Friday of last week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(29); // Jul 29
+        expect(result.start.get("weekday")).toBe(5);
+        expect(result.start).toBeDate(new Date(2022, 6, 29, 12));
+    });
+
+    // --- of this week ---
+
+    testSingleCase(chrono.casual, "Wednesday of this week", refDate, (result) => {
+        expect(result.text).toBe("Wednesday of this week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(3); // Aug 3
+        expect(result.start.get("weekday")).toBe(3);
+        expect(result.start).toBeDate(new Date(2022, 7, 3, 12));
+    });
+
+    testSingleCase(chrono.casual, "Tuesday of this week", refDate, (result) => {
+        expect(result.text).toBe("Tuesday of this week");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(2); // Aug 2 — same day as ref
+        expect(result.start.get("weekday")).toBe(2);
+        expect(result.start).toBeDate(new Date(2022, 7, 2, 12));
+    });
+
+    // --- with time: merges into a single result (the original bug produced two) ---
+
+    testSingleCase(chrono.casual, "Tuesday of next week after 2pm", refDate, (result) => {
+        expect(result.text).toBe("Tuesday of next week after 2pm");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(9); // Aug 9
+        expect(result.start.get("hour")).toBe(14);
+        expect(result.start).toBeDate(new Date(2022, 7, 9, 14));
+    });
+
+    testSingleCase(chrono.casual, "Friday of next week at 9am", refDate, (result) => {
+        expect(result.text).toBe("Friday of next week at 9am");
+        expect(result.start.get("year")).toBe(2022);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(12); // Aug 12
+        expect(result.start.get("hour")).toBe(9);
+        expect(result.start).toBeDate(new Date(2022, 7, 12, 9));
+    });
+
+    // --- in sentence context ---
+
+    testSingleCase(chrono.casual, "Let's sync on Tuesday of next week", refDate, (result) => {
+        expect(result.text).toBe("on Tuesday of next week");
+        expect(result.start.get("day")).toBe(9);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("year")).toBe(2022);
+    });
+});
+
 test("Test - forward dates only option", () => {
     testSingleCase(
         chrono.casual,
@@ -447,4 +552,22 @@ test("Test - forward dates only option", () => {
             expect(result.end.get("day")).toBe(21);
         }
     );
+
+    testSingleCase(
+        chrono.casual,
+        "timeoff monday 7 to 9am",
+        new Date("thursday 13 June 2019"),
+        { forwardDate: true },
+        (result) => {
+            expect(result.text).toBe("monday 7 to 9am");
+
+            expect(result.start.get("year")).toBe(2019);
+            expect(result.start.get("month")).toBe(6);
+            expect(result.start.get("day")).toBe(17);
+
+            expect(result.end.get("year")).toBe(2019);
+            expect(result.end.get("month")).toBe(6);
+            expect(result.end.get("day")).toBe(17);
+        }
+    );
 });

package/test/fi/fi_casual.test.ts

@@ -0,0 +1,85 @@
+import * as chrono from "../../src/locales/fi";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono, "tänään", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+    });
+
+    testSingleCase(chrono, "huomenna", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(11);
+    });
+
+    testSingleCase(chrono, "eilen", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(9);
+    });
+
+    testSingleCase(chrono, "ylihuomenna", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(12);
+    });
+
+    testSingleCase(chrono, "toissapäivänä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(8);
+    });
+});
+
+test("Test - Combined Expression", function () {
+    testSingleCase(chrono, "tänään aamulla", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(6);
+    });
+
+    testSingleCase(chrono, "tänään aamupäivällä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(9);
+    });
+
+    testSingleCase(chrono, "tänään päivällä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono, "tänään iltapäivällä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(15);
+    });
+
+    testSingleCase(chrono, "tänään illalla", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(18);
+    });
+
+    testSingleCase(chrono, "tänään yöllä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(22);
+    });
+
+    testSingleCase(chrono, "tänään keskiyöllä", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(0);
+    });
+});

package/test/fi/fi_casual_time.test.ts

@@ -0,0 +1,56 @@
+import * as chrono from "../../src/locales/fi";
+import { testSingleCase } from "../test_util";
+
+test("Test - Standalone casual time expressions", function () {
+    testSingleCase(chrono, "aamulla", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("aamulla");
+        expect(result.start.get("hour")).toBe(6);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "aamupäivällä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("aamupäivällä");
+        expect(result.start.get("hour")).toBe(9);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "päivällä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("päivällä");
+        expect(result.start.get("hour")).toBe(12);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "iltapäivällä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("iltapäivällä");
+        expect(result.start.get("hour")).toBe(15);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "illalla", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("illalla");
+        expect(result.start.get("hour")).toBe(18);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "yöllä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("yöllä");
+        expect(result.start.get("hour")).toBe(22);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "keskiyöllä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("keskiyöllä");
+        expect(result.start.get("hour")).toBe(0);
+        expect(result.start.get("minute")).toBe(0);
+    });
+});
+
+test("Test - 'viime yönä' (last night)", function () {
+    testSingleCase(chrono, "viime yönä", new Date(2012, 7, 10, 14, 0), (result) => {
+        expect(result.text).toBe("viime yönä");
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(9);
+        expect(result.start.get("hour")).toBe(0);
+    });
+});

package/test/fi/fi_month_name_little_endian.test.ts

@@ -0,0 +1,50 @@
+import * as chrono from "../../src/locales/fi";
+import { testSingleCase, testUnexpectedResult } from "../test_util";
+
+test("Test - Single expression", function () {
+    testSingleCase(chrono, "15. elokuuta", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+    });
+
+    testSingleCase(chrono, "15 elokuuta 2012", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+    });
+
+    testSingleCase(chrono, "15. elo 2012", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+    });
+
+    testSingleCase(chrono, "3 tammikuuta", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2013);
+        expect(result.start.get("month")).toBe(1);
+        expect(result.start.get("day")).toBe(3);
+    });
+
+    testSingleCase(chrono, "1 joulukuuta 2023", new Date(2023, 10, 1), (result) => {
+        expect(result.start.get("year")).toBe(2023);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(1);
+    });
+});
+
+test("Test - Range expression", function () {
+    testSingleCase(chrono, "15-16 elokuuta", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+
+        expect(result.end.get("year")).toBe(2012);
+        expect(result.end.get("month")).toBe(8);
+        expect(result.end.get("day")).toBe(16);
+    });
+});
+
+test("Test - Impossible Dates", function () {
+    testUnexpectedResult(chrono, "32 elokuuta", new Date(2012, 7, 10));
+});

package/test/fi/fi_time_exp.test.ts

@@ -0,0 +1,39 @@
+import * as chrono from "../../src/locales/fi";
+import { testSingleCase } from "../test_util";
+
+test("Test - Time expression", function () {
+    testSingleCase(chrono, "klo 15:00", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("hour")).toBe(15);
+        expect(result.start.get("minute")).toBe(0);
+    });
+
+    testSingleCase(chrono, "kello 8:30", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("hour")).toBe(8);
+        expect(result.start.get("minute")).toBe(30);
+    });
+
+    testSingleCase(chrono, "klo 13.00", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("hour")).toBe(13);
+        expect(result.start.get("minute")).toBe(0);
+    });
+});
+
+test("Test - Time range expression", function () {
+    testSingleCase(chrono, "klo 10:00-12:00", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("hour")).toBe(10);
+        expect(result.start.get("minute")).toBe(0);
+
+        expect(result.end.get("hour")).toBe(12);
+        expect(result.end.get("minute")).toBe(0);
+    });
+});
+
+test("Test - Date and time expression", function () {
+    testSingleCase(chrono, "15 elokuuta 2012 klo 14:00", new Date(2012, 7, 10), (result) => {
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+        expect(result.start.get("hour")).toBe(14);
+        expect(result.start.get("minute")).toBe(0);
+    });
+});

package/test/fi/fi_time_units_ago.test.ts

@@ -0,0 +1,93 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.fi, "5 päivää sitten tehtiin jotain", new Date(2012, 8 - 1, 10), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(5);
+
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 päivää sitten");
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 5));
+    });
+
+    testSingleCase(chrono.fi, "10 päivää sitten tehtiin jotain", new Date(2012, 7, 10, 13, 30), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(31);
+
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 päivää sitten");
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 31, 13, 30));
+    });
+
+    testSingleCase(chrono.fi, "15 minuuttia sitten", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("15 minuuttia sitten");
+        expect(result.start.get("hour")).toBe(11);
+        expect(result.start.get("minute")).toBe(59);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 11, 59));
+    });
+
+    testSingleCase(chrono.fi, "   12 tuntia sitten", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.index).toBe(3);
+        expect(result.text).toBe("12 tuntia sitten");
+        expect(result.start.get("hour")).toBe(0);
+        expect(result.start.get("minute")).toBe(14);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 0, 14));
+    });
+
+    testSingleCase(chrono.fi, "12 tuntia sitten tapahtui jotain", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("12 tuntia sitten");
+        expect(result.start.get("hour")).toBe(0);
+        expect(result.start.get("minute")).toBe(14);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 0, 14));
+    });
+});
+
+test("Test - Single Expression (Casual)", function () {
+    testSingleCase(chrono.fi, "5 kuukautta sitten tehtiin jotain", new Date(2012, 10 - 1, 10), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(5);
+        expect(result.start.get("day")).toBe(10);
+
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 kuukautta sitten");
+
+        expect(result.start).toBeDate(new Date(2012, 5 - 1, 10));
+    });
+
+    testSingleCase(chrono.fi, "5 vuotta sitten tehtiin jotain", new Date(2012, 8 - 1, 10, 22, 22), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2007);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 vuotta sitten");
+
+        expect(result.start).toBeDate(new Date(2007, 8 - 1, 10, 22, 22));
+    });
+
+    testSingleCase(chrono.fi, "yksi viikkoa sitten tehtiin jotain", new Date(2012, 8 - 1, 3, 8, 34), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(27);
+
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("yksi viikkoa sitten");
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 27, 8, 34));
+    });
+});

package/test/fi/fi_time_units_casual_relative.test.ts

@@ -0,0 +1,117 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Positive time units", () => {
+    testSingleCase(chrono.fi, "seuraavat 2 viikkoa", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(15);
+    });
+
+    testSingleCase(chrono.fi, "seuraavat 2 päivää", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(3);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "seuraavat kaksi vuotta", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2018);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(1);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "seuraavat 2 viikkoa 3 päivää", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(18);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "seuraava yksi vuotta", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2017);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(1);
+        expect(result.start.get("hour")).toBe(12);
+    });
+});
+
+test("Test - Negative time units", () => {
+    testSingleCase(chrono.fi, "edelliset 2 viikkoa", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(17);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "viimeiset 2 päivää", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(29);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "kuluneet kaksi viikkoa", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(9);
+        expect(result.start.get("day")).toBe(17);
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.fi, "+2 kuukautta 5 päivää", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(12);
+        expect(result.start.get("day")).toBe(6);
+        expect(result.start.get("hour")).toBe(12);
+    });
+});
+
+test("Test - Plus '+' sign", () => {
+    testSingleCase(chrono.fi.casual, "+15 minuuttia", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("hour")).toBe(12);
+        expect(result.start.get("minute")).toBe(29);
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 29));
+    });
+
+    testSingleCase(chrono.fi.casual, "+15min", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("hour")).toBe(12);
+        expect(result.start.get("minute")).toBe(29);
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 29));
+    });
+
+    testSingleCase(chrono.fi.casual, "+1 päivä 2 tuntia", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("day")).toBe(11);
+        expect(result.start.get("hour")).toBe(14);
+        expect(result.start.get("minute")).toBe(14);
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 11, 14, 14));
+    });
+});
+
+test("Test - Minus '-' sign", () => {
+    testSingleCase(chrono.fi.casual, "-3vuotta", new Date(2015, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.text).toBe(text);
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(7);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(12);
+        expect(result.start.get("minute")).toBe(14);
+
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 14));
+    });
+});

package/test/fi/fi_time_units_within.test.ts

@@ -0,0 +1,74 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - 'sisällä' (within) expression", () => {
+    testSingleCase(chrono.fi, "pitää tehdä jotain 5 päivää sisällä", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("5 päivää sisällä");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 15));
+    });
+
+    testSingleCase(chrono.fi, "5 minuuttia sisällä", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 minuuttia sisällä");
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 19));
+    });
+
+    testSingleCase(chrono.fi, "1 tuntia sisällä", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("1 tuntia sisällä");
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 13, 14));
+    });
+
+    testSingleCase(chrono.fi, "2 viikkoa sisällä", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.text).toBe("2 viikkoa sisällä");
+
+        expect(result.start).toBeDate(new Date(2012, 7, 24, 12, 14));
+    });
+});
+
+test("Test - 'kuluessa' (within/during) expression", () => {
+    testSingleCase(chrono.fi, "5 päivää kuluessa", new Date(2012, 7, 10), (result) => {
+        expect(result.text).toBe("5 päivää kuluessa");
+
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(15);
+    });
+
+    testSingleCase(chrono.fi, "yksi vuotta kuluessa", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.text).toBe("yksi vuotta kuluessa");
+
+        expect(result.start).toBeDate(new Date(2013, 7, 10, 12, 14));
+    });
+});
+
+test("Test - 'päästä' (from now) expression", () => {
+    testSingleCase(chrono.fi, "5 minuuttia päästä", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.text).toBe("5 minuuttia päästä");
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 12, 19));
+    });
+
+    testSingleCase(chrono.fi, "3 päivää päästä", new Date(2012, 7, 10, 12, 14), (result) => {
+        expect(result.text).toBe("3 päivää päästä");
+
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(13);
+    });
+
+    testSingleCase(chrono.fi, "2 viikkoa päästä", new Date(2016, 10 - 1, 1), (result) => {
+        expect(result.text).toBe("2 viikkoa päästä");
+        expect(result.start.get("year")).toBe(2016);
+        expect(result.start.get("month")).toBe(10);
+        expect(result.start.get("day")).toBe(15);
+    });
+});