3
0

Fix failing reporting tests

This commit is contained in:
Tomaž Jerman 2021-09-02 17:32:16 +02:00
parent 8ab9b0e851
commit 19b4184698
6 changed files with 27 additions and 42 deletions

View File

@ -14,12 +14,10 @@ func Test0006_prefilter_join(t *testing.T) {
h.a.Len(ff, 2)
f := ff[0]
h.a.Equal(3, f.Size())
h.a.Equal(1, f.Size())
h.a.Equal("id<Record>, join_key<String>, first_name<String>, last_name<String>", f.Columns.String())
checkRows(h, f,
", Maria_Königsmann, Maria, Königsmann",
", Maria_Spannagel, Maria, Spannagel",
", Maria_Krüger, Maria, Krüger")
", Maria_Königsmann, Maria, Königsmann")
f = ff[1]

View File

@ -22,15 +22,15 @@ func Test2005_grouping_complex_ast(t *testing.T) {
h.a.Equal("by_year<Number>, by_name<String>, count<Number>, total<Number>", r.Columns.String())
checkRows(h, ff[0],
"2020, Engel, 1, 9.7",
"2021, Engel, 2, 8.2",
"2021, Manu, 1, 6.1",
"2020, Engel, 1, 97",
"2021, Engel, 2, 82",
"2021, Manu, 1, 61",
"2020, Maria, 2, 16",
"2021, Maria, 1, 2.3",
"2020, Sascha, 1, 3.8",
"2021, Sigi, 1, 6.7",
"2020, Ulli, 1, 1.4",
"2021, Ulli, 2, 10.8")
"2021, Maria, 1, 23",
"2020, Sascha, 1, 38",
"2021, Sigi, 1, 67",
"2020, Ulli, 1, 14",
"2021, Ulli, 2, 108")
}
func Test2006_grouping_complex_expr(t *testing.T) {
@ -49,15 +49,15 @@ func Test2006_grouping_complex_expr(t *testing.T) {
h.a.Equal("by_year<Number>, by_name<String>, count<Number>, total<Number>", r.Columns.String())
checkRows(h, ff[0],
"2020, Engel, 1, 9.7",
"2021, Engel, 2, 8.2",
"2021, Manu, 1, 6.1",
"2020, Engel, 1, 97",
"2021, Engel, 2, 82",
"2021, Manu, 1, 61",
"2020, Maria, 2, 16",
"2021, Maria, 1, 2.3",
"2020, Sascha, 1, 3.8",
"2021, Sigi, 1, 6.7",
"2020, Ulli, 1, 1.4",
"2021, Ulli, 2, 10.8")
"2021, Maria, 1, 23",
"2020, Sascha, 1, 38",
"2021, Sigi, 1, 67",
"2020, Ulli, 1, 14",
"2021, Ulli, 2, 108")
}
func Test2007_grouping_complex_expr_2(t *testing.T) {
@ -76,8 +76,8 @@ func Test2007_grouping_complex_expr_2(t *testing.T) {
h.a.Equal("by_year<Number>, is_maria<Boolean>, count<Number>, total<Number>", r.Columns.String())
checkRows(h, ff[0],
"202, 0, 9, 46.7",
"202, 1, 3, 18.3")
"202, 0, 9, 467",
"202, 1, 3, 183")
}
func Test2008_grouping_complex_ast_expr(t *testing.T) {
@ -96,6 +96,6 @@ func Test2008_grouping_complex_ast_expr(t *testing.T) {
h.a.Equal("by_year<Number>, is_maria<Boolean>, count<Number>, total<Number>", r.Columns.String())
checkRows(h, ff[0],
"202, 0, 9, 46.7",
"202, 1, 3, 18.3")
"202, 0, 9, 467",
"202, 1, 3, 183")
}

View File

@ -37,17 +37,9 @@
{
"name": "total",
"def": {
"ref": "div",
"ref": "sum",
"args": [{
"ref": "sum",
"args": [{
"symbol": "number_of_numbers"
}]
}, {
"value": {
"@value": 10,
"@type": "Float"
}
"symbol": "number_of_numbers"
}]
}
}

View File

@ -27,7 +27,7 @@
},
{
"name": "total",
"def": "sum(number_of_numbers)/float(10)"
"def": "sum(number_of_numbers)"
}
]
}}}

View File

@ -35,12 +35,7 @@
{
"name": "total",
"def": {
"ref": "div",
"args": [{
"raw": "sum(number_of_numbers)"
}, {
"raw": "float(10)"
}]
"raw": "sum(number_of_numbers)"
}
}]
}}}

View File

@ -27,7 +27,7 @@
},
{
"name": "total",
"def": "sum(number_of_numbers)/float(10)"
"def": "sum(number_of_numbers)"
}
]
}}}