1020

pending completion

Build # 1020

Build Type

Pull #241

travis-ci-com

Committed by

web-flow

Commit Message

Merge 549dec7ed into e58ed8af6

Pull Request Pull Request #241: Recurrent time specification & weekdays

Run Details

4444 of 5900 branches covered (75.32%)

Branch coverage included in aggregate %.

26 of 38 new or added lines in 6 files covered. (68.42%)

47 existing lines in 1 file now uncovered.

8650 of 10348 relevant lines covered (83.59%)

1555.27 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.6

/lib/date_utils.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of ThingTalk
//
// Copyright 2018-2020 The Board of Trustees of the Leland Stanford Junior University
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
"use strict";

const assert = require('assert');

const TIME_UNITS = ['ms', 's', 'min', 'h', 'day', 'week', 'mon', 'year'];
const SET_ZERO = [(d) => {},
    (d) => {
        d.setMilliseconds(0); // start of current second
    },
    (d) => {
        d.setSeconds(0, 0); // start of current minute
    },
    (d) => {
        d.setMinutes(0, 0, 0); // start of current hour
    },
    (d) => {
        d.setHours(0, 0, 0, 0); // start of current day
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setDate(d.getDate()-d.getDay()); // start of current week (week starts Sunday)
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setDate(1); // start of current month
    },
    (d) => {
        d.setHours(0, 0, 0, 0);
        d.setMonth(0, 1); // start of current year
    }
];
const ADD_ONE = [
    (d) => {
        d.setMilliseconds(d.getMilliseconds()+1);
    },
    (d) => {
        d.setSeconds(d.getSeconds()+1);
    },
    (d) => {
        d.setMinutes(d.getMinutes()+1);
    },
    (d) => {
        d.setHours(d.getHours()+1);
    },
    (d) => {
        d.setDate(d.getDate()+1);
    },
    (d) => {
        d.setDate(d.getDate()+7);
    },
    (d) => {
        d.setMonth(d.getMonth()+1);
    },
    (d) => {
        d.setFullYear(d.getFullYear()+1);
    }
];
assert(SET_ZERO.length === TIME_UNITS.length);
assert(ADD_ONE.length === TIME_UNITS.length);


function createEdgeDate(edge, unit) {
    const index = TIME_UNITS.indexOf(unit);

    const date = new Date;
    SET_ZERO[index](date);
    if (edge === 'end_of')
        ADD_ONE[index](date);
    return date;
}

function createDatePiece(year, month, day, time) {
    // All non-supplied values to the left of the largest supplied
    // value are set to the present. All non-supplied values to the
    // right of the largest supplied value are set to the minimum.
    const date = new Date;
    if (year > 0) {
        date.setYear(year);
        date.setMonth(0, 1); // 1st of Jan
        date.setHours(0, 0, 0, 0);
    }
    if (month > 0) {
        date.setMonth(month - 1, 1);
        date.setHours(0, 0, 0, 0);
    }
    if (day > 0) {
        date.setDate(day);
        date.setHours(0, 0, 0, 0);
    }
    if (time !== null)
        date.setHours(time.hour, time.minute, time.second);
    return date;
}

function createWeekDayDate(weekday, time) {
    const date = new Date;

    // FIXME: implement this
    return date;
}

module.exports = {
    normalizeDate(value) {
        if (value === null)
            return new Date;
        else if (value instanceof Date)
            return value;
        else if (value.weekday)
            return createWeekDayDate(value.weekday, value.time);
        else if (typeof value.edge === 'undefined')
            return createDatePiece(value.year, value.month, value.day, value.time);
        else
            return createEdgeDate(value.edge, value.unit);
    },

    parseDate(form) {
        if (form instanceof Date)
            return form;

        let now = new Date;
        now.setMilliseconds(0);

        let year = form.year;
        if (year < 0 || year === undefined)
            year = now.getFullYear();
        let month = form.month;
        if (month < 0 || month === undefined)
            month = now.getMonth() + 1;
        let day = form.day;
        if (day < 0 || day === undefined)
            day = now.getDate();
        let hour = form.hour;
        if (hour < 0 || hour === undefined)
            hour = 0;
        let minute = form.minute;
        if (minute < 0 || minute === undefined)
            minute = 0;
        let second = form.second;
        if (second < 0 || second === undefined)
            second = 0;
        let millisecond = (second - Math.floor(second))*1000;
        second = Math.floor(second);

        return new Date(year, month-1, day, hour, minute, second, millisecond);
    },
};

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of ThingTalk
4	//
5	// Copyright 2018-2020 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Licensed under the Apache License, Version 2.0 (the "License");
8	// you may not use this file except in compliance with the License.
9	// You may obtain a copy of the License at
10	//
11	// http://www.apache.org/licenses/LICENSE-2.0
12	//
13	// Unless required by applicable law or agreed to in writing, software
14	// distributed under the License is distributed on an "AS IS" BASIS,
15	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	// See the License for the specific language governing permissions and
17	// limitations under the License.
18	//
19	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
20	"use strict";
21
22	const assert = require('assert');	2✔
23
24	const TIME_UNITS = ['ms', 's', 'min', 'h', 'day', 'week', 'mon', 'year'];	2✔
25	const SET_ZERO = [(d) => {},	2✔
26	(d) => {
27	d.setMilliseconds(0); // start of current second	×
28	},
29	(d) => {
30	d.setSeconds(0, 0); // start of current minute	×
31	},
32	(d) => {
33	d.setMinutes(0, 0, 0); // start of current hour	×
34	},
35	(d) => {
36	d.setHours(0, 0, 0, 0); // start of current day	4✔
37	},
38	(d) => {
39	d.setHours(0, 0, 0, 0);	×
40	d.setDate(d.getDate()-d.getDay()); // start of current week (week starts Sunday)	×
41	},
42	(d) => {
43	d.setHours(0, 0, 0, 0);	4✔
44	d.setDate(1); // start of current month	4✔
45	},
46	(d) => {
47	d.setHours(0, 0, 0, 0);	×
48	d.setMonth(0, 1); // start of current year	×
49	}
50	];
51	const ADD_ONE = [	2✔
52	(d) => {
53	d.setMilliseconds(d.getMilliseconds()+1);	×
54	},
55	(d) => {
56	d.setSeconds(d.getSeconds()+1);	×
57	},
58	(d) => {
59	d.setMinutes(d.getMinutes()+1);	×
60	},
61	(d) => {
62	d.setHours(d.getHours()+1);	×
63	},
64	(d) => {
65	d.setDate(d.getDate()+1);	2✔
66	},
67	(d) => {
68	d.setDate(d.getDate()+7);	×
69	},
70	(d) => {
71	d.setMonth(d.getMonth()+1);	2✔
72	},
73	(d) => {
74	d.setFullYear(d.getFullYear()+1);	×
75	}
76	];
77	assert(SET_ZERO.length === TIME_UNITS.length);	2✔
78	assert(ADD_ONE.length === TIME_UNITS.length);	2✔
79
80
81	function createEdgeDate(edge, unit) {
82	const index = TIME_UNITS.indexOf(unit);	8✔
83
84	const date = new Date;	8✔
85	SET_ZERO[index](date);	8✔
86	if (edge === 'end_of')	8✔
87	ADD_ONE[index](date);	4✔
88	return date;	8✔
89	}
90
91	function createDatePiece(year, month, day, time) {
92	// All non-supplied values to the left of the largest supplied
93	// value are set to the present. All non-supplied values to the
94	// right of the largest supplied value are set to the minimum.
95	const date = new Date;	10✔
96	if (year > 0) {	10✔
97	date.setYear(year);	4✔
98	date.setMonth(0, 1); // 1st of Jan	4✔
99	date.setHours(0, 0, 0, 0);	4✔
100	}
101	if (month > 0) {	10✔
102	date.setMonth(month - 1, 1);	2✔
103	date.setHours(0, 0, 0, 0);	2✔
104	}
105	if (day > 0) {	10✔
106	date.setDate(day);	4✔
107	date.setHours(0, 0, 0, 0);	4✔
108	}
109	if (time !== null)	10✔
110	date.setHours(time.hour, time.minute, time.second);	2✔
111	return date;	10✔
112	}
113
114	function createWeekDayDate(weekday, time) {
NEW 115	const date = new Date;	×
116
117	// FIXME: implement this
NEW 118	return date;	×
119	}
120
121	module.exports = {	2✔
122	normalizeDate(value) {
123	if (value === null)	66✔
124	return new Date;	32✔
125	else if (value instanceof Date)	34✔
126	return value;	16✔
127	else if (value.weekday)	18!
NEW 128	return createWeekDayDate(value.weekday, value.time);	×
129	else if (typeof value.edge === 'undefined')	18✔
130	return createDatePiece(value.year, value.month, value.day, value.time);	10✔
131	else
132	return createEdgeDate(value.edge, value.unit);	8✔
133	},
134
135	parseDate(form) {
136	if (form instanceof Date)	58✔
137	return form;	28✔
138
139	let now = new Date;	30✔
140	now.setMilliseconds(0);	30✔
141
142	let year = form.year;	30✔
143	if (year < 0 \|\| year === undefined)	30!
144	year = now.getFullYear();	×
145	let month = form.month;	30✔
146	if (month < 0 \|\| month === undefined)	30!
147	month = now.getMonth() + 1;	×
148	let day = form.day;	30✔
149	if (day < 0 \|\| day === undefined)	30!
150	day = now.getDate();	×
151	let hour = form.hour;	30✔
152	if (hour < 0 \|\| hour === undefined)	30✔
153	hour = 0;	8✔
154	let minute = form.minute;	30✔
155	if (minute < 0 \|\| minute === undefined)	30✔
156	minute = 0;	10✔
157	let second = form.second;	30✔
158	if (second < 0 \|\| second === undefined)	30✔
159	second = 0;	18✔
160	let millisecond = (second - Math.floor(second))*1000;	30✔
161	second = Math.floor(second);	30✔
162
163	return new Date(year, month-1, day, hour, minute, second, millisecond);	30✔
164	},
165	};

stanford-oval / thingtalk / 1020

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous