MonetDB: mtest - fixed problem with single value printed results

Niels Nes Wed, 14 Oct 2020 01:30:01 -0700

Changeset: bf9051527faa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf9051527faa
Modified Files:
        monetdb5/modules/mal/Tests/bigsum.maltest
        monetdb5/modules/mal/Tests/call00.maltest
        monetdb5/modules/mal/Tests/callfunction.maltest
        monetdb5/modules/mal/Tests/callstring.maltest
        monetdb5/modules/mal/Tests/clients-getpasswd.maltest
        monetdb5/modules/mal/Tests/clients-hashes.maltest
        monetdb5/modules/mal/Tests/clients01.maltest
        monetdb5/modules/mal/Tests/flags.maltest
        monetdb5/modules/mal/Tests/inspect10.maltest
        monetdb5/modules/mal/Tests/iterator01.maltest
        monetdb5/modules/mal/Tests/iterator02.maltest
        monetdb5/modules/mal/Tests/iterator03.malC
        monetdb5/modules/mal/Tests/iterator03.maltest
        monetdb5/modules/mal/Tests/mapi01.maltest
        monetdb5/modules/mal/Tests/mapi02.maltest
        monetdb5/modules/mal/Tests/mapi04.maltest
        monetdb5/modules/mal/Tests/mapi05.maltest
        monetdb5/modules/mal/Tests/mapi06.maltest
        monetdb5/modules/mal/Tests/mserver00.maltest
        monetdb5/modules/mal/Tests/pqueue2.maltest
        monetdb5/modules/mal/Tests/pqueue3.maltest
        monetdb5/modules/mal/Tests/remote89.maltest
        monetdb5/modules/mal/Tests/remoteInit.maltest
        monetdb5/modules/mal/Tests/tokenizer00.maltest
Branch: mtest
Log Message:


fixed problem with single value printed results


diffs (truncated from 585 to 300 lines):

diff --git a/monetdb5/modules/mal/Tests/bigsum.maltest 
b/monetdb5/modules/mal/Tests/bigsum.maltest
--- a/monetdb5/modules/mal/Tests/bigsum.maltest
+++ b/monetdb5/modules/mal/Tests/bigsum.maltest
@@ -40,6 +40,8 @@ mdb.setDebug(dbgmsk_restore)
 statement ok
 s:dbl := aggr.sum(b)
 
-statement error
+query T rowsort
 io.print(s)
+----
+1.000000001e+16
 
diff --git a/monetdb5/modules/mal/Tests/call00.maltest 
b/monetdb5/modules/mal/Tests/call00.maltest
--- a/monetdb5/modules/mal/Tests/call00.maltest
+++ b/monetdb5/modules/mal/Tests/call00.maltest
@@ -28,14 +28,18 @@ io.print(d)
 @
 (i:int, s:str):bit;
 
-statement error
+query T rowsort
 user.tst(1,"world")
+----
+hello world
 
 statement ok
 m:=inspect.getSource("user","tst")
 
-statement error
+query T rowsort
 io.print(m)
+----
+"function user.tst(i:int, s:str):bit;\n    j := calc.+(i, 1:int);\n    
io.print(j);\n    format := \"hello %s\\n\";\n    io.printf(format, s);\n    
return tst := true;\nend user.tst;\n"
 
 statement ok
 language.call(m)
diff --git a/monetdb5/modules/mal/Tests/callfunction.maltest 
b/monetdb5/modules/mal/Tests/callfunction.maltest
--- a/monetdb5/modules/mal/Tests/callfunction.maltest
+++ b/monetdb5/modules/mal/Tests/callfunction.maltest
@@ -28,6 +28,9 @@ statement ok
 statement ok
 end q
 
-statement error
+query T rowsort
 q()
+----
+"hello"
+"world"
 
diff --git a/monetdb5/modules/mal/Tests/callstring.maltest 
b/monetdb5/modules/mal/Tests/callstring.maltest
--- a/monetdb5/modules/mal/Tests/callstring.maltest
+++ b/monetdb5/modules/mal/Tests/callstring.maltest
@@ -28,6 +28,9 @@ statement ok
 statement ok
 end q
 
-statement error
+query T rowsort
 q()
+----
+"hello"
+"world"
 
diff --git a/monetdb5/modules/mal/Tests/clients-getpasswd.maltest 
b/monetdb5/modules/mal/Tests/clients-getpasswd.maltest
--- a/monetdb5/modules/mal/Tests/clients-getpasswd.maltest
+++ b/monetdb5/modules/mal/Tests/clients-getpasswd.maltest
@@ -1,6 +1,8 @@
 statement ok
 p := clients.getPasswordHash("monetdb")
 
-statement error
+query T rowsort
 io.print(p)
+----
+"a73f1d86383446438ac64f56e15ada38b41fbb18f029d2181723aeb2acac6a831f60e5fdbd64ac2c8c70e035dd44cbbe3b45565ef2d58feb2821a2078c7fad35"
 
diff --git a/monetdb5/modules/mal/Tests/clients-hashes.maltest 
b/monetdb5/modules/mal/Tests/clients-hashes.maltest
--- a/monetdb5/modules/mal/Tests/clients-hashes.maltest
+++ b/monetdb5/modules/mal/Tests/clients-hashes.maltest
@@ -1,8 +1,10 @@
 statement ok
 p := clients.md5sum("monetdb")
 
-statement error
+query T rowsort
 io.print(p)
+----
+"4fe67471e97aae17f10bf200ccadc4e4"
 
 statement ok
 catch MALException:str
@@ -16,8 +18,10 @@ exit MALException
 statement ok
 p := clients.sha1sum("monetdb")
 
-statement error
+query T rowsort
 io.print(p)
+----
+"4751fc28d9a64a043865922548ee7d623743bcad"
 
 statement ok
 catch MALException:str
@@ -31,8 +35,10 @@ exit MALException
 statement ok
 p := clients.ripemd160sum("monetdb")
 
-statement error
+query T rowsort
 io.print(p)
+----
+"930f000ce6242c20ed0211cc5d3612edebf33820"
 
 statement ok
 catch MALException:str
@@ -46,8 +52,10 @@ exit MALException
 statement ok
 p := clients.sha2sum("monetdb", 224)
 
-statement error
+query T rowsort
 io.print(p)
+----
+"ba11e4ad9ac60f775cf1f133a81faf32241d9c136e4d3b193bdbbf1e"
 
 statement ok
 catch MALException:str
@@ -61,8 +69,10 @@ exit MALException
 statement ok
 p := clients.sha2sum("monetdb", 256)
 
-statement error
+query T rowsort
 io.print(p)
+----
+"38e38a32871128f6c9b84c72c4b6c473e53ab084bffb37c094310045716a8247"
 
 statement ok
 catch MALException:str
@@ -76,8 +86,10 @@ exit MALException
 statement ok
 p := clients.sha2sum("monetdb", 384)
 
-statement error
+query T rowsort
 io.print(p)
+----
+"d494cbc91a0d3315210af1c2d14e3758ba7d6716393a234cf9f29d8de077110c9009dd840f9c93a5d350b739253f6bd9"
 
 statement ok
 catch MALException:str
@@ -91,8 +103,10 @@ exit MALException
 statement ok
 p := clients.sha2sum("monetdb", 512)
 
-statement error
+query T rowsort
 io.print(p)
+----
+"a73f1d86383446438ac64f56e15ada38b41fbb18f029d2181723aeb2acac6a831f60e5fdbd64ac2c8c70e035dd44cbbe3b45565ef2d58feb2821a2078c7fad35"
 
 statement ok
 catch MALException:str
diff --git a/monetdb5/modules/mal/Tests/clients01.maltest 
b/monetdb5/modules/mal/Tests/clients01.maltest
--- a/monetdb5/modules/mal/Tests/clients01.maltest
+++ b/monetdb5/modules/mal/Tests/clients01.maltest
@@ -1,8 +1,10 @@
 statement ok
 d:= clients.getId()
 
-statement error
+query T rowsort
 io.print(d)
+----
+0
 
 statement ok
 (a,b):= clients.getInfo()
diff --git a/monetdb5/modules/mal/Tests/flags.maltest 
b/monetdb5/modules/mal/Tests/flags.maltest
--- a/monetdb5/modules/mal/Tests/flags.maltest
+++ b/monetdb5/modules/mal/Tests/flags.maltest
@@ -1,8 +1,10 @@
 statement ok
 d := mdb.getDebug()
 
-statement error
+query T rowsort
 io.print(d)
+----
+553648138
 
 statement ok
 (f,v) := mdb.getDebugFlags()
diff --git a/monetdb5/modules/mal/Tests/inspect10.maltest 
b/monetdb5/modules/mal/Tests/inspect10.maltest
--- a/monetdb5/modules/mal/Tests/inspect10.maltest
+++ b/monetdb5/modules/mal/Tests/inspect10.maltest
@@ -16,8 +16,10 @@ statement ok
 statement ok
 end dummy
 
-statement error
+query T rowsort
 user.dummy(1)
+----
+end user.dummy;
 
 query T rowsort
 io.printf("get function properties\n")
diff --git a/monetdb5/modules/mal/Tests/iterator01.maltest 
b/monetdb5/modules/mal/Tests/iterator01.maltest
--- a/monetdb5/modules/mal/Tests/iterator01.maltest
+++ b/monetdb5/modules/mal/Tests/iterator01.maltest
@@ -43,16 +43,20 @@ statement ok
 statement ok
        pb_a := bat.append(t,ob_a)
 
-statement error
+query T rowsort
        qb_a := io.print("build a table finished")
+----
+"build a table finished"
 
 query TT rowsort
        io.print(t)
 ----
 14 values hashing to cc78f07158a9b8cf11962a8981a68464
 
-statement error
+query T rowsort
        io.print("start loop")
+----
+"start loop"
 
 statement ok
 barrier (h:oid,B2:url) := iterator.new(t)
@@ -63,6 +67,14 @@ statement ok
 statement ok
        redo (h:oid,B2:url) := iterator.next(t)
 
-statement error
+query T rowsort
 exit h
+----
+"http://robotics.stanford.edu/icons/ "
+"http://www.cwi.nl";
+"http://www.cwi.nl/~mk/Acoi/doc/features.html";
+"http://www.cwi.nl/~monet";
+"http://www.edgeonline.com/";
+"http://www.educ.uva.nl/schoolweb/rocloka.htm";
+"http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium";
 
diff --git a/monetdb5/modules/mal/Tests/iterator02.maltest 
b/monetdb5/modules/mal/Tests/iterator02.maltest
--- a/monetdb5/modules/mal/Tests/iterator02.maltest
+++ b/monetdb5/modules/mal/Tests/iterator02.maltest
@@ -37,8 +37,10 @@ statement ok
 statement ok
        nb_a := bat.append(t,mb_a)
 
-statement error
+query T rowsort
        qb_a := io.print("build a table finished")
+----
+"build a table finished"
 
 query TT rowsort
        io.print(t)
@@ -48,8 +50,10 @@ 12 values hashing to eeffda7e4a5f3c5ba4a
 statement ok
        rb:= bat.new(:url)
 
-statement error
+query T rowsort
        io.print("start loop")
+----
+"start loop"
 
 statement ok
 barrier (h:oid,B2:url) := iterator.new(t)
@@ -63,8 +67,15 @@ statement ok
 statement ok
        redo (h:oid,B2:url) := iterator.next(t)
 
-statement error
+query T rowsort
 exit h
+----
+"http://www.cwi.nl";
+"http://www.cwi.nl/~mk/Acoi/doc/features.html";
+"http://www.cwi.nl/~monet";
+"http://www.edgeonline.com/";
+"http://www.educ.uva.nl/schoolweb/rocloka.htm";
+"http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium";
 
 query TT rowsort
        io.print(rb)
diff --git a/monetdb5/modules/mal/Tests/iterator03.malC 
b/monetdb5/modules/mal/Tests/iterator03.malC
--- a/monetdb5/modules/mal/Tests/iterator03.malC
+++ b/monetdb5/modules/mal/Tests/iterator03.malC
@@ -19,7 +19,7 @@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: mtest - fixed problem with single value printed results

Reply via email to