Changeset: 83cdb0179b55 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83cdb0179b55
Modified Files:
monetdb5/modules/kernel/Tests/TriBool.maltest
monetdb5/modules/kernel/Tests/batstr.maltest
monetdb5/modules/kernel/Tests/math.maltest
monetdb5/modules/kernel/Tests/select.maltest
monetdb5/modules/kernel/Tests/time01.maltest
Branch: mtest
Log Message:
re-converted kernel tests
diffs (truncated from 3810 to 300 lines):
diff --git a/monetdb5/modules/kernel/Tests/TriBool.maltest
b/monetdb5/modules/kernel/Tests/TriBool.maltest
--- a/monetdb5/modules/kernel/Tests/TriBool.maltest
+++ b/monetdb5/modules/kernel/Tests/TriBool.maltest
@@ -97,17 +97,17 @@ NULL
query TT rowsort
io.print(b)
----
-@
+0
+True
+1
False
-@
+2
NULL
-@
-True
query TTT rowsort
io.print(bl,br)
----
-27 values hashing to 853880e6fa2fbf13f702f92cfe784d2f
+27 values hashing to 36b57b9dc23503517dd7177eb0f4a95d
statement error
o := calc.or(t,t); bo := bat.append(bo,o)
@@ -175,3 +175,4 @@ aa := batcalc.and(bl,br)
statement error
io.print(bl,br, ba, aa)
+
diff --git a/monetdb5/modules/kernel/Tests/batstr.maltest
b/monetdb5/modules/kernel/Tests/batstr.maltest
--- a/monetdb5/modules/kernel/Tests/batstr.maltest
+++ b/monetdb5/modules/kernel/Tests/batstr.maltest
@@ -22,30 +22,31 @@ x5 := batstr.string(t, -6)
query TT rowsort
io.print(x1)
----
-@
+0
0123456789
query TT rowsort
io.print(x2)
----
-@
+0
3456789
query TT rowsort
io.print(x3)
----
-@
+0
9
query TT rowsort
io.print(x4)
----
-@
+0
(empty)
query TT rowsort
io.print(x5)
----
-@
+0
456789
+
diff --git a/monetdb5/modules/kernel/Tests/math.maltest
b/monetdb5/modules/kernel/Tests/math.maltest
--- a/monetdb5/modules/kernel/Tests/math.maltest
+++ b/monetdb5/modules/kernel/Tests/math.maltest
@@ -16,11 +16,11 @@ z:= batmmath.sqrt(b)
query TT rowsort
io.print(z)
----
-@
+0
+5.196152422706632
+1
4.0
-@
-5.196152422706632
-@
+2
NULL
statement ok
@@ -29,11 +29,11 @@ zz:= batmmath.cbrt(b)
query TT rowsort
io.print(zz)
----
-@
+0
+3.0000000000000004
+1
2.519842099789747
-@
-3.0000000000000004
-@
+2
NULL
statement ok
@@ -54,11 +54,11 @@ zf:= batmmath.sqrt(f)
query TT rowsort
io.print(zf)
----
-@
+0
+5.196152
+1
4.0
-@
-5.196152
-@
+2
NULL
statement ok
@@ -67,10 +67,11 @@ zzf:= batmmath.cbrt(f)
query TT rowsort
io.print(zzf)
----
-@
+0
+3.0
+1
2.5198421
-@
-3.0
-@
+2
NULL
+
diff --git a/monetdb5/modules/kernel/Tests/select.maltest
b/monetdb5/modules/kernel/Tests/select.maltest
--- a/monetdb5/modules/kernel/Tests/select.maltest
+++ b/monetdb5/modules/kernel/Tests/select.maltest
@@ -58,9 +58,16 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # nil
+query TI rowsort
+io.print(z)
+----
+0
+NULL
+
+query T rowsort
io.print("nil")
+----
+"nil"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, true, false, false)
@@ -71,9 +78,15 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # 0,1,2,3,4,5,6,7,8,9
+query TI rowsort
+io.print(z)
+----
+20 values hashing to df64c71718164c8be268303ff6d71109
+
+query T rowsort
io.print("0,1,2,3,4,5,6,7,8,9")
+----
+"0,1,2,3,4,5,6,7,8,9"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, false, true, false)
@@ -84,9 +97,15 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # 0,1,2,3,4,5,6,7,8,9
+query TI rowsort
+io.print(z)
+----
+20 values hashing to df64c71718164c8be268303ff6d71109
+
+query T rowsort
io.print("0,1,2,3,4,5,6,7,8,9")
+----
+"0,1,2,3,4,5,6,7,8,9"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, false, false, false)
@@ -97,9 +116,15 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # 0,1,2,3,4,5,6,7,8,9
+query TI rowsort
+io.print(z)
+----
+20 values hashing to df64c71718164c8be268303ff6d71109
+
+query T rowsort
io.print("0,1,2,3,4,5,6,7,8,9")
+----
+"0,1,2,3,4,5,6,7,8,9"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, true, true, true)
@@ -110,9 +135,15 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # 0,1,2,3,4,5,6,7,8,9
+query TI rowsort
+io.print(z)
+----
+20 values hashing to df64c71718164c8be268303ff6d71109
+
+query T rowsort
io.print("0,1,2,3,4,5,6,7,8,9")
+----
+"0,1,2,3,4,5,6,7,8,9"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, true, false, true)
@@ -123,9 +154,14 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # nothing
+query TI rowsort
+io.print(z)
+----
+
+query T rowsort
io.print("nothing")
+----
+"nothing"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, false, true, true)
@@ -136,9 +172,14 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # nothing
+query TI rowsort
+io.print(z)
+----
+
+query T rowsort
io.print("nothing")
+----
+"nothing"
statement ok
x := algebra.select(b, nil:bat[:oid], nil:int, nil:int, false, false, true)
@@ -149,9 +190,14 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # nothing
+query TI rowsort
+io.print(z)
+----
+
+query T rowsort
io.print("nothing")
+----
+"nothing"
statement ok
x := algebra.select(b, nil:bat[:oid], 4, nil:int, true, true, false)
@@ -162,9 +208,15 @@ z := algebra.projection(x, b)
statement ok
z := algebra.sort(z, false, false, true)
-statement error
-io.print(z); # 4,5,6,7,8,9
+query TI rowsort
+io.print(z)
+----
+12 values hashing to 9933f327ba2f7c3dffde51351363baac
+
+query T rowsort
io.print("4,5,6,7,8,9")
+----
+"4,5,6,7,8,9"
statement ok
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
