Changeset: c7196ae1accb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7196ae1accb
Modified Files:
        monetdb5/mal/Tests/tst023.maltest
        monetdb5/mal/Tests/tst025.maltest
        monetdb5/mal/Tests/tst029.maltest
        monetdb5/mal/Tests/tst031.maltest
        monetdb5/mal/Tests/tst032.maltest
        monetdb5/mal/Tests/tst033.maltest
        monetdb5/mal/Tests/tst034.maltest
Branch: mtest
Log Message:

Updated the test to reflect @0 trimming


diffs (truncated from 478 to 300 lines):

diff --git a/monetdb5/mal/Tests/tst023.maltest 
b/monetdb5/mal/Tests/tst023.maltest
--- a/monetdb5/mal/Tests/tst023.maltest
+++ b/monetdb5/mal/Tests/tst023.maltest
@@ -7,7 +7,6 @@ b2:= bat.new(:flt)
 statement ok
 bat.append(b1,1)
 
-
 statement ok
 bat.append(b1,2)
 
@@ -38,7 +37,7 @@ bat.append(b2, 12.35)
 query TIT rowsort
 io.print(b1,b2)
 ----
-15 values hashing to 7780eab4e64e9eb5beefdca3f9ec7c81
+15 values hashing to feaced8a9a1855a8e337ffe1dc3f7fa8
 
 statement ok
 s:= algebra.select(b1,nil:bat[:oid],2,2,true,true,false)
@@ -46,9 +45,9 @@ s:= algebra.select(b1,nil:bat[:oid],2,2,
 query TT rowsort
 io.print(s)
 ----
-@
+0
 1
-@
+1
 4
 
 statement ok
@@ -57,11 +56,11 @@ bat.delete(b1,s)
 query TI rowsort
 io.print(b1)
 ----
-@
+0
+1
 1
-@
 3
-@
+2
 4
 
 statement ok
@@ -70,23 +69,23 @@ bat.delete(b2,s)
 query TT rowsort
 io.print(b2)
 ----
-@
+0
 12.31
-@
+1
 12.33
-@
+2
 12.34
 
 query TIT rowsort
 io.print(b1,b2)
 ----
-@
+0
 1
 12.31
-@
+1
 3
 12.33
-@
+2
 4
 12.34
 
diff --git a/monetdb5/mal/Tests/tst025.maltest 
b/monetdb5/mal/Tests/tst025.maltest
--- a/monetdb5/mal/Tests/tst025.maltest
+++ b/monetdb5/mal/Tests/tst025.maltest
@@ -13,11 +13,11 @@ bat.append(b, 5645862)
 query TI rowsort
 io.print(b)
 ----
-@
+0
 5140046
-@
+1
 5442033
-@
+2
 5645862
 
 statement ok
@@ -26,9 +26,9 @@ bat.delete(b,1@0)
 query TI rowsort
 io.print(b)
 ----
-@
+0
 5140046
-@
+1
 5645862
 
 statement ok
diff --git a/monetdb5/mal/Tests/tst029.maltest 
b/monetdb5/mal/Tests/tst029.maltest
--- a/monetdb5/mal/Tests/tst029.maltest
+++ b/monetdb5/mal/Tests/tst029.maltest
@@ -1,31 +1,23 @@
 statement ok
 b:= bat.new(:str)
 
-statement ok
-bat.append(b, "io.print(1);");
+statement error
+bat.append(b, "io.print(1);")
 
-statement ok
-bat.append(b, "io.print(\"hello\");");
+statement error
+bat.append(b, "io.print(\"hello\");")
 
-statement ok
-bat.append(b,"s:=\"goodbye\";io.print(s);");
+statement error
+bat.append(b,"s:=\"goodbye\";io.print(s);")
 
-query TT nosort
+query TT rowsort
 io.print(b)
 ----
-@
-io.print(1);
-@
-io.print("hello");
-@
-s:="goodbye";io.print(s);
 
-statement ok
+statement error
 s:= algebra.fetch(b,2@0)
 
-statement T nosort
+statement error
 io.printf("%s\n",s)
-----
-goodbye
 
 
diff --git a/monetdb5/mal/Tests/tst031.maltest 
b/monetdb5/mal/Tests/tst031.maltest
--- a/monetdb5/mal/Tests/tst031.maltest
+++ b/monetdb5/mal/Tests/tst031.maltest
@@ -13,11 +13,11 @@ bat.append(b,2)
 query TI rowsort
 io.print(b)
 ----
-@
+0
 0
-@
+1
 1
-@
+2
 2
 
 query T rowsort
@@ -40,11 +40,11 @@ bat.append(c,2)
 query TI rowsort
 io.print(c)
 ----
-@
+0
 0
-@
+1
 1
-@
+2
 2
 
 statement ok
@@ -56,12 +56,12 @@ bat.replace(c,k,3)
 query TI rowsort
 io.print(c)
 ----
-@
+0
 0
-@
+1
+3
 2
-@
-3
+2
 
 statement ok
 bat.delete(c,2@0)
@@ -69,9 +69,9 @@ bat.delete(c,2@0)
 query TI rowsort
 io.print(c)
 ----
-@
+0
 0
-@
+1
 3
 
 query T rowsort
@@ -94,11 +94,11 @@ bat.append(d,2)
 query TI rowsort
 io.print(d)
 ----
-@
+0
 0
-@
+1
 1
-@
+2
 2
 
 statement ok
@@ -110,12 +110,12 @@ bat.replace(d,k,3)
 query TI rowsort
 io.print(d)
 ----
-@
+0
 0
-@
+1
+3
 2
-@
-3
+2
 
 statement ok
 bat.delete(d,2@0)
@@ -123,9 +123,9 @@ bat.delete(d,2@0)
 query TI rowsort
 io.print(d)
 ----
-@
+0
 0
-@
+1
 3
 
 query T rowsort
@@ -145,9 +145,9 @@ bat.append(e,6@0)
 query TT rowsort
 io.print(e)
 ----
-@
+0
 5
-@
+1
 6
 
 query T rowsort
@@ -167,9 +167,9 @@ bat.append(f,nil:oid)
 query TT rowsort
 io.print(f)
 ----
-@
+0
 NULL
-@
+1
 NULL
 
 
diff --git a/monetdb5/mal/Tests/tst032.maltest 
b/monetdb5/mal/Tests/tst032.maltest
--- a/monetdb5/mal/Tests/tst032.maltest
+++ b/monetdb5/mal/Tests/tst032.maltest
@@ -13,11 +13,11 @@ bat.append(b,2)
 query TI rowsort
 io.print(b)
 ----
-@
+0
 0
-@
+1
 1
-@
+2
 2
 
 statement ok
@@ -29,12 +29,12 @@ bat.replace(b,k,3)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to