foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-11 01:58:05 -05:00
Code Issues Packages 1 Wiki Activity

datetime: correct hh:mm formats and add test cases (#121)

Browse source
This commit is contained in:
James Garbutt 2019-01-16 15:25:52 +00:00 committed by Ryan Dahl
parent 9a3eb207dc
commit cc40d3e984
2 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
datetime/mod.ts
View file

@ -57,13 +57,13 @@ export function parseDateTime(
const datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/; const datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/;
[, y, m, d, ho, mi] = datePattern.exec(datetimeStr); [, y, m, d, ho, mi] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm mm-dd-yyyy") { } else if (format === "hh:mm mm-dd-yyyy") {
const datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/; const datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
[, ho, mi, m, d, y] = datePattern.exec(datetimeStr); [, ho, mi, m, d, y] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm dd-mm-yyyy") { } else if (format === "hh:mm dd-mm-yyyy") {
const datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/; const datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
[, ho, mi, d, m, y] = datePattern.exec(datetimeStr); [, ho, mi, d, m, y] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm yyyy-mm-dd") { } else if (format === "hh:mm yyyy-mm-dd") {
const datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/; const datePattern = /^(\d{2}):(\d{2}) (\d{4})-(\d{2})-(\d{2})$/;
[, ho, mi, y, m, d] = datePattern.exec(datetimeStr); [, ho, mi, y, m, d] = datePattern.exec(datetimeStr);
} else { } else {
throw new Error("Invalid datetime format!"); throw new Error("Invalid datetime format!");

50
datetime/test.ts
View file

@ -1,4 +1,4 @@
import { test, assertEqual } from "../testing/mod.ts"; import { test, assertEqual, assert } from "../testing/mod.ts";
import * as datetime from "mod.ts"; import * as datetime from "mod.ts";
test(function parseDateTime() { test(function parseDateTime() {
@ -6,13 +6,61 @@ test(function parseDateTime() {
datetime.parseDateTime("01-03-2019 16:34", "mm-dd-yyyy hh:mm"), datetime.parseDateTime("01-03-2019 16:34", "mm-dd-yyyy hh:mm"),
new Date(2019, 1, 3, 16, 34) new Date(2019, 1, 3, 16, 34)
); );
assertEqual(
datetime.parseDateTime("03-01-2019 16:34", "dd-mm-yyyy hh:mm"),
new Date(2019, 1, 3, 16, 34)
);
assertEqual(
datetime.parseDateTime("2019-01-03 16:34", "yyyy-mm-dd hh:mm"),
new Date(2019, 1, 3, 16, 34)
);
assertEqual(
datetime.parseDateTime("16:34 01-03-2019", "hh:mm mm-dd-yyyy"),
new Date(2019, 1, 3, 16, 34)
);
assertEqual(
datetime.parseDateTime("16:34 03-01-2019", "hh:mm dd-mm-yyyy"),
new Date(2019, 1, 3, 16, 34)
);
assertEqual(
datetime.parseDateTime("16:34 2019-01-03", "hh:mm yyyy-mm-dd"),
new Date(2019, 1, 3, 16, 34)
);
}); });
test(function invalidParseDateTimeFormatThrows() {
try {
(datetime as any).parseDateTime("2019-01-01 00:00", "x-y-z");
assert(false, 'no exception was thrown');
} catch (e) {
assertEqual(e.message, "Invalid datetime format!");
}
});
test(function parseDate() { test(function parseDate() {
assertEqual( assertEqual(
datetime.parseDate("01-03-2019", "mm-dd-yyyy"), datetime.parseDate("01-03-2019", "mm-dd-yyyy"),
new Date(2019, 1, 3) new Date(2019, 1, 3)
); );
assertEqual(
datetime.parseDate("03-01-2019", "dd-mm-yyyy"),
new Date(2019, 1, 3)
);
assertEqual(
datetime.parseDate("2019-01-03", "yyyy-mm-dd"),
new Date(2019, 1, 3)
);
}); });
test(function invalidParseDateFormatThrows() {
try {
(datetime as any).parseDate("2019-01-01", "x-y-z");
assert(false, 'no exception was thrown');
} catch (e) {
assertEqual(e.message, "Invalid date format!");
}
});
test(function currentDayOfYear() { test(function currentDayOfYear() {
assertEqual( assertEqual(
datetime.currentDayOfYear(), datetime.currentDayOfYear(),