1313

pending completion

Build # 1313

Build Type

Pull #342

travis-ci-com

Committed by

web-flow

Commit Message

Merge fbe1b7f5f into 6391b9c2f

Pull Request Pull Request #342: Yet another round of fixes

Run Details

6913 of 12991 branches covered (53.21%)

Branch coverage included in aggregate %.

124 of 144 new or added lines in 13 files covered. (86.11%)

11 existing lines in 3 files now uncovered.

15597 of 24837 relevant lines covered (62.8%)

1625607.36 hits per line

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

87.32

/languages/thingtalk/dialogue_acts/aggregation-results.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 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 C = require('../ast_manip');

const {
    makeAgentReply,
    makeSimpleState,
} = require('../state_manip');

function makeCountAggregationReplySuffix(ctx, table, mustFilter) {
    if (!ctx.resultInfo.isAggregation)
        return null;
    if (ctx.results.length !== 1 || !ctx.results[0].value.count)
        return null;
    const currentTable = ctx.current.stmt.table;
    if (currentTable.operator !== 'count' || currentTable.field !== '*')
        return null;
    if (!C.isSameFunction(table.schema, ctx.currentTableSchema))
        return null;
    if (mustFilter && !table.isFilter)
        return null;
    if (table.isFilter) {
        const filterTable = C.findFilterTable(currentTable);
        if (!filterTable)
            return null;
        if (!table.filter.equals(filterTable.filter))
            return null;
    }
    return ctx;
}

function makeCountAggregationReply(ctx, num) {
    const count = ctx.results[0].value.count;
    if (!count.equals(num))
        return null;
    return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));
}

function makeOtherAggregationReply(ctx, op, param, value) {
    if (!ctx.resultInfo.isAggregation)
        return null;
    if (ctx.results.length !== 1 || !ctx.results[0].value[param.name])
        return null;
    const currentTable = ctx.current.stmt.table;
    if (currentTable.operator !== op || currentTable.field !== param.name)
        return null;
    if (!value.equals(ctx.results[0].value[param.name]))
        return null;
    return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));
}

module.exports = {
    makeCountAggregationReplySuffix,
    makeCountAggregationReply,
    makeOtherAggregationReply
};

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 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 C = require('../ast_manip');	3✔
23
24	const {
25	makeAgentReply,
26	makeSimpleState,
27	} = require('../state_manip');	3✔
28
29	function makeCountAggregationReplySuffix(ctx, table, mustFilter) {
30	if (!ctx.resultInfo.isAggregation)	1,586,086✔
31	return null;	1,574,399✔
32	if (ctx.results.length !== 1 \|\| !ctx.results[0].value.count)	11,687✔
33	return null;	2,454✔
34	const currentTable = ctx.current.stmt.table;	9,233✔
35	if (currentTable.operator !== 'count' \|\| currentTable.field !== '*')	9,233!
NEW 36	return null;	×
37	if (!C.isSameFunction(table.schema, ctx.currentTableSchema))	9,233✔
38	return null;	7,593✔
39	if (mustFilter && !table.isFilter)	1,640!
NEW 40	return null;	×
41	if (table.isFilter) {	1,640✔
42	const filterTable = C.findFilterTable(currentTable);	1,636✔
43	if (!filterTable)	1,636!
44	return null;	1,636✔
NEW 45	if (!table.filter.equals(filterTable.filter))	×
NEW 46	return null;	×
47	}
48	return ctx;	4✔
49	}
50
51	function makeCountAggregationReply(ctx, num) {
52	const count = ctx.results[0].value.count;	56✔
53	if (!count.equals(num))	56✔
54	return null;	50✔
55	return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));	6✔
56	}
57
58	function makeOtherAggregationReply(ctx, op, param, value) {
59	if (!ctx.resultInfo.isAggregation)	38,277,760✔
60	return null;	38,174,355✔
61	if (ctx.results.length !== 1 \|\| !ctx.results[0].value[param.name])	103,405✔
62	return null;	103,063✔
63	const currentTable = ctx.current.stmt.table;	342✔
64	if (currentTable.operator !== op \|\| currentTable.field !== param.name)	342✔
65	return null;	266✔
66	if (!value.equals(ctx.results[0].value[param.name]))	76✔
67	return null;	72✔
68	return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));	4✔
69	}
70
71	module.exports = {	3✔
72	makeCountAggregationReplySuffix,
73	makeCountAggregationReply,
74	makeOtherAggregationReply
75	};

stanford-oval / genie-toolkit / 1313

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