Changeset: a9af5c968115 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9af5c968115
Modified Files:
monetdb5/mal/Tests/tst009.maltest
monetdb5/mal/Tests/tst011.maltest
monetdb5/mal/Tests/tst012.maltest
monetdb5/mal/Tests/tst014.maltest
monetdb5/mal/Tests/tst015.maltest
monetdb5/mal/Tests/tst018.maltest
monetdb5/mal/Tests/tst022.maltest
monetdb5/mal/Tests/tst303.maltest
Branch: mtest
Log Message:
Fixed a bunch of tests.
diffs (181 lines):
diff --git a/monetdb5/mal/Tests/tst009.maltest
b/monetdb5/mal/Tests/tst009.maltest
--- a/monetdb5/mal/Tests/tst009.maltest
+++ b/monetdb5/mal/Tests/tst009.maltest
@@ -1,20 +1,20 @@
-statement T rowsort
+query T nosort
language.call("io.print(1);");
----
1
-statement T rowsort
+query T nosort
language.call("io.print(\"hello\");");
----
-hello
+"hello"
-statement T rowsort
+query T nosort
language.call("s:=\"goodbye\";io.print(s);");
----
-"goodbye"
+"goodbye"
-statement T rowsort
+query T nosort
language.call("language.call(\"io.print(\\\\\"hello\\\\\");\");");
----
-hello
+"hello"
diff --git a/monetdb5/mal/Tests/tst011.maltest
b/monetdb5/mal/Tests/tst011.maltest
--- a/monetdb5/mal/Tests/tst011.maltest
+++ b/monetdb5/mal/Tests/tst011.maltest
@@ -1,9 +1,10 @@
-statement T nosort
+query T nosort
barrier k:=12;
io.print(k);
leave k;
io.print("not possible");
exit k:=11;
+ io.print(k);
----
12
11
diff --git a/monetdb5/mal/Tests/tst012.maltest
b/monetdb5/mal/Tests/tst012.maltest
--- a/monetdb5/mal/Tests/tst012.maltest
+++ b/monetdb5/mal/Tests/tst012.maltest
@@ -1,4 +1,4 @@
-statement T rowset
+query T nosort
i:=0;
barrier j:=i<3;
io.print(i);
@@ -10,12 +10,12 @@ 0
1
2
-query T rowsort
+query T nosort
io.print("first loop done");
----
"first loop done"
-statement T rowset
+query T nosort
i:=0;
barrier j:=i<3;
io.print(i);
@@ -27,7 +27,7 @@ 0
1
2
-query T rowsort
+query T nosort
io.print("second loop done");
----
"second loop done"
diff --git a/monetdb5/mal/Tests/tst014.maltest
b/monetdb5/mal/Tests/tst014.maltest
--- a/monetdb5/mal/Tests/tst014.maltest
+++ b/monetdb5/mal/Tests/tst014.maltest
@@ -1,4 +1,4 @@
-statement T rowset
+query T nosort
i:=1;
barrier b:= calc.==(i,1);
i:= i+1;
diff --git a/monetdb5/mal/Tests/tst015.maltest
b/monetdb5/mal/Tests/tst015.maltest
--- a/monetdb5/mal/Tests/tst015.maltest
+++ b/monetdb5/mal/Tests/tst015.maltest
@@ -1,4 +1,4 @@
-statement T nosort
+query T nosort
b:= true;
barrier b;
io.printf("1 Correctly entered barrier\n");
@@ -6,7 +6,7 @@ exit b;
----
1 Correctly entered barrier
-statement T nosort
+query T nosort
b:= false;
barrier b;
io.printf("1 Incorrectly entered barrier\n");
@@ -18,7 +18,7 @@ exit c;
----
2 Correctly entered barrier
-statement T nosort
+query T nosort
barrier c:= i==0;
io.printf("2 Incorrectly entered barrier\n");
exit c;
diff --git a/monetdb5/mal/Tests/tst018.maltest
b/monetdb5/mal/Tests/tst018.maltest
--- a/monetdb5/mal/Tests/tst018.maltest
+++ b/monetdb5/mal/Tests/tst018.maltest
@@ -1,4 +1,4 @@
-statement T nosort
+query T nosort
i:= 23;
i:= nil;
io.print(i);
@@ -9,8 +9,7 @@ s:= "hello";
s:= nil;
io.print(s);
----
-nil
-nil
-nil
+NULL
+NULL
+NULL
-
diff --git a/monetdb5/mal/Tests/tst022.maltest
b/monetdb5/mal/Tests/tst022.maltest
--- a/monetdb5/mal/Tests/tst022.maltest
+++ b/monetdb5/mal/Tests/tst022.maltest
@@ -1,4 +1,4 @@
-statement T nosort
+query T nosort
i:=1;
barrier b:= i>0;
io.printf("ok entered first\n");
@@ -10,7 +10,7 @@ exit b;
barrier b:= j>0;
io.printf("wrong entered third\n");
exit b;
-barrier b:= j<=0
+barrier b:= j<=0;
io.printf("wrong entered fourth\n");
exit b;
----
diff --git a/monetdb5/mal/Tests/tst303.maltest
b/monetdb5/mal/Tests/tst303.maltest
--- a/monetdb5/mal/Tests/tst303.maltest
+++ b/monetdb5/mal/Tests/tst303.maltest
@@ -1,18 +1,18 @@
statement ok
function foo():str;
raise IllegalAccess := "an exception";
- return foo := "should not come here\n";
+ return foo := "should not come here";
catch IllegalAccess;
- return foo := "caught an exception\n";
+ return foo := "caught an exception";
raise IllegalAccess:= "a second exception raised";
- return foo:= "should not come here either\n";
+ return foo:= "should not come here either";
exit IllegalAccess;
return foo:="should not be done";
end;
-statement T nosort
+query T nosort
msg := user.foo();
io.print(msg);
----
-caught an exception
+"caught an exception"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
