Changeset: e6d92c411f37 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6d92c411f37
Added Files:
monetdb5/mal/Tests/tst1150.maltest
monetdb5/mal/Tests/tst120a.maltest
monetdb5/mal/Tests/tst120b.maltest
monetdb5/mal/Tests/tst130.maltest
monetdb5/mal/Tests/tst1500.maltest
monetdb5/mal/Tests/tst1503.maltest
monetdb5/mal/Tests/tst1504.maltest
monetdb5/mal/Tests/tst1505.maltest
monetdb5/mal/Tests/tst1506.maltest
monetdb5/mal/Tests/tst1604.maltest
monetdb5/mal/Tests/tst161.maltest
monetdb5/mal/Tests/tst163.maltest
monetdb5/mal/Tests/tst171.maltest
monetdb5/mal/Tests/tst180.maltest
monetdb5/mal/Tests/tst190.maltest
monetdb5/mal/Tests/tst191.maltest
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst1500.malC
monetdb5/mal/Tests/tst1503.malC
monetdb5/mal/Tests/tst1505.malC
monetdb5/mal/Tests/tst1506.malC
Branch: mtest
Log Message:
Another batch, almost 50% done here
diffs (truncated from 1362 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -83,26 +83,26 @@ tst114
tst117
tst115
tst116
-#tst1150
+tst1150
# #tst120 files are not located in module and paths are runtime dependent
# #tst1200
# #tst1204
-# tst120a
-# tst120b
-# tst130
-# tst1500
-# tst1502
-# tst1503
-# tst1504
-# tst1505
-# tst1506
-# tst161
-# tst163
-# tst1604
-# tst171
-# tst180
-# tst190
-# tst191
+tst120a
+tst120b
+tst130
+tst1500
+# tst1502 Mconvert chokes on print(xs)
+tst1503
+tst1504 # Incorrect last print statement
+tst1505
+tst1506
+tst161
+tst163
+tst1604
+tst171
+tst180
+tst190
+tst191
# tst192
# tst193
# tst194
diff --git a/monetdb5/mal/Tests/tst1150.maltest
b/monetdb5/mal/Tests/tst1150.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst1150.maltest
@@ -0,0 +1,50 @@
+statement ok
+ fp := streams.openWrite("tst1150garbage")
+
+statement ok
+ streams.writeStr(fp,"Dit is een test\n")
+
+statement ok
+ streams.flush(fp)
+
+statement ok
+ streams.close(fp)
+
+statement ok
+ fp := streams.openRead("tst1150garbage")
+
+statement ok
+ s := streams.readStr(fp)
+
+query T rowsort
+ io.print(s)
+----
+"Dit is een test\n"
+
+statement ok
+ streams.close(fp)
+
+statement ok
+ fp := streams.openWriteBytes("tst1150garbage")
+
+statement ok
+ streams.writeInt(fp,1234)
+
+statement ok
+ streams.close(fp)
+
+statement ok
+ fp := streams.openReadBytes("tst1150garbage")
+
+statement ok
+ i := streams.readInt(fp)
+
+query T rowsort
+ io.print(i)
+----
+1234
+
+statement ok
+ streams.close(fp)
+
+
diff --git a/monetdb5/mal/Tests/tst120a.maltest
b/monetdb5/mal/Tests/tst120a.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst120a.maltest
@@ -0,0 +1,18 @@
+statement ok
+module top
+
+statement ok
+function first(i:int):int; return first:= 0:int; end first
+
+statement ok
+i:=first(1)
+
+statement ok
+i:=top.first(1)
+
+query T rowsort
+io.print(i)
+----
+0
+
+
diff --git a/monetdb5/mal/Tests/tst120b.maltest
b/monetdb5/mal/Tests/tst120b.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst120b.maltest
@@ -0,0 +1,26 @@
+statement ok
+module bottom
+
+statement ok
+function first(i:str):int; c:=1; return c; end first
+
+statement ok
+function second(i:str):int; return second:=1; end second
+
+statement ok
+i:= bottom.first("")
+
+query T rowsort
+io.print(i)
+----
+1
+
+statement ok
+i:= bottom.second("")
+
+query T rowsort
+io.print(i)
+----
+1
+
+
diff --git a/monetdb5/mal/Tests/tst130.maltest
b/monetdb5/mal/Tests/tst130.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst130.maltest
@@ -0,0 +1,131 @@
+statement ok
+bi:= bat.new(:int)
+
+statement ok
+bat.append(bi,2)
+
+statement ok
+bat.append(bi,nil:int)
+
+statement ok
+zi:= batcalc.isnil(bi)
+
+query TT rowsort
+io.print(zi)
+----
+0
+False
+1
+True
+
+statement ok
+bb:= bat.new(:bit)
+
+statement ok
+bat.append(bb,true)
+
+statement ok
+bat.append(bb,nil:bit)
+
+statement ok
+bat.append(bb,false)
+
+statement ok
+zb:= batcalc.isnil(bb)
+
+query TT rowsort
+io.print(zb)
+----
+0
+False
+1
+True
+2
+False
+
+statement ok
+bf:= bat.new(:flt)
+
+statement ok
+bat.append(bf,2.0)
+
+statement ok
+bat.append(bf,nil:flt)
+
+statement ok
+fi:= batcalc.isnil(bf)
+
+query TT rowsort
+io.print(fi)
+----
+0
+False
+1
+True
+
+statement ok
+bs:= bat.new(:str)
+
+statement ok
+bat.append(bs,"hello")
+
+statement ok
+bat.append(bs,nil:str)
+
+statement ok
+bat.append(bs,"")
+
+statement ok
+zs:= batcalc.isnil(bs)
+
+query TT rowsort
+io.print(zs)
+----
+0
+False
+1
+True
+2
+False
+
+statement ok
+bo:= bat.new(:oid)
+
+statement ok
+bat.append(bo,0@0)
+
+statement ok
+bat.append(bo,nil:oid)
+
+statement ok
+fo:= batcalc.isnil(bo)
+
+query TT rowsort
+io.print(fo)
+----
+0
+False
+1
+True
+
+statement ok
+bc:= bat.new(:bte)
+
+statement ok
+bat.append(bc,2:bte)
+
+statement ok
+bat.append(bc,nil:bte)
+
+statement ok
+fc:= batcalc.isnil(bc)
+
+query TT rowsort
+io.print(fc)
+----
+0
+False
+1
+True
+
+
diff --git a/monetdb5/mal/Tests/tst1500.malC b/monetdb5/mal/Tests/tst1500.malC
--- a/monetdb5/mal/Tests/tst1500.malC
+++ b/monetdb5/mal/Tests/tst1500.malC
@@ -1,14 +1,18 @@
- x := bat.new(:bte);
- de_a := bat.append(x,1:bte);
- ee_a := bat.append(x,1:bte);
- fe_a := bat.append(x,2:bte);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
