Changeset: 203bbea945e4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=203bbea945e4
Added Files:
sql/test/VOC/Tests/VOCinsert.stable.out
sql/test/VOC/Tests/VOCmanual_examples.stable.out
sql/test/VOC/Tests/VOCquery.stable.out
Modified Files:
sql/test/VOC/Tests/VOC.SQL.py
Branch: default
Log Message:
Test for correctness of the output, not just if succeeded
diffs (truncated from 10911 to 300 lines):
diff --git a/sql/test/VOC/Tests/VOC.SQL.py b/sql/test/VOC/Tests/VOC.SQL.py
--- a/sql/test/VOC/Tests/VOC.SQL.py
+++ b/sql/test/VOC/Tests/VOC.SQL.py
@@ -1,4 +1,4 @@
-import os, sys
+import os
from MonetDBtesting.sqltest import SQLTestCase
d = os.environ['RELSRCDIR']
@@ -11,39 +11,13 @@ with SQLTestCase() as tc:
with open(os.path.join(d, os.pardir, 'VOCschema.sql')) as f:
tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
with open(os.path.join(d, os.pardir, 'VOCinsert.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
+ tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCinsert.stable.out'))
with open(os.path.join(d, os.pardir, 'VOCquery.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
+ tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCquery.stable.out'))
with open(os.path.join(d, os.pardir, 'VOCmanual_examples.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
+ tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCmanual_examples.stable.out'))
with open(os.path.join(d, os.pardir, 'VOCdrop.sql')) as f:
tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
tc.connect(username='monetdb', password='monetdb')
with open(os.path.join(d, os.pardir, 'VOCdrop_user.sql')) as f:
tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
-
-
-#import os, sys
-#try:
-# from MonetDBtesting import process
-#except ImportError:
-# import process
-#
-#d = os.environ['RELSRCDIR']
-#
-#def client(file, user, passwd, echo=None):
-# sys.stdout.flush()
-# sys.stderr.flush()
-# with process.client(lang='sql',
-# user=user, passwd=passwd,
-# args=[os.path.join(d, os.pardir, file)],
-# echo=echo) as c:
-# c.communicate()
-#
-#client('VOCcreate_user.sql', 'monetdb', 'monetdb')
-#client('VOCschema.sql', 'voc', 'voc')
-#client('VOCinsert.sql', 'voc', 'voc', echo=False)
-#client('VOCquery.sql', 'voc', 'voc')
-#client('VOCmanual_examples.sql', 'voc', 'voc')
-#client('VOCdrop.sql', 'voc', 'voc')
-#client('VOCdrop_user.sql', 'monetdb', 'monetdb')
diff --git a/sql/test/VOC/Tests/VOCinsert.stable.out
b/sql/test/VOC/Tests/VOCinsert.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCinsert.stable.out
@@ -0,0 +1,8 @@
+[ 8115 ]
+[ 2349 ]
+[ 938 ]
+[ 3782 ]
+[ 2813 ]
+[ 4468 ]
+[ 4177 ]
+[ 2454 ]
diff --git a/sql/test/VOC/Tests/VOCmanual_examples.stable.out
b/sql/test/VOC/Tests/VOCmanual_examples.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCmanual_examples.stable.out
@@ -0,0 +1,58 @@
+#CREATE VIEW onboard_people AS
+#SELECT * FROM (
+# SELECT 'craftsmen' AS type, craftsmen.* FROM craftsmen
+# UNION ALL
+# SELECT 'impotenten' AS type, impotenten.* FROM impotenten
+# UNION ALL
+# SELECT 'passengers' AS type, passengers.* FROM passengers
+# UNION ALL
+# SELECT 'seafarers' AS type, seafarers.* FROM seafarers
+# UNION ALL
+# SELECT 'soldiers' AS type, soldiers.* FROM soldiers
+# UNION ALL
+# SELECT 'total' AS type, total.* FROM total
+#) AS onboard_people_table;
+#SELECT type, COUNT(*) AS total FROM onboard_people GROUP BY type ORDER BY
type;
+% .onboard_people, . # table_name
+% type, total # name
+% char, bigint # type
+% 10, 4 # length
+[ "craftsmen", 2349 ]
+[ "impotenten", 938 ]
+[ "passengers", 2813 ]
+[ "seafarers", 4468 ]
+[ "soldiers", 4177 ]
+[ "total", 2454 ]
+#select count(*) from impotenten;
+% .%1 # table_name
+% %1 # name
+% bigint # type
+% 3 # length
+[ 938 ]
+#SELECT COUNT(*) FROM voyages WHERE particulars LIKE '%_recked%';
+% voc.%1 # table_name
+% %1 # name
+% bigint # type
+% 3 # length
+[ 358 ]
+#SELECT chamber, CAST(AVG(invoice) AS integer) AS average
+#FROM invoices
+#WHERE invoice IS NOT NULL
+#GROUP BY chamber
+#ORDER BY average DESC;
+% voc.invoices, voc. # table_name
+% chamber, average # name
+% char, int # type
+% 1, 6 # length
+[ "A", 282997 ]
+[ "Z", 259301 ]
+[ "H", 150182 ]
+[ "R", 149628 ]
+[ "D", 149523 ]
+[ "E", 149518 ]
+[ NULL, 83309 ]
+#CREATE VIEW extended_onboard AS
+#SELECT number, number_sup, trip, trip_sup, onboard_at_departure,
death_at_cape,
+# left_at_cape, onboard_at_cape, death_during_voyage, onboard_at_arrival,
+# death_during_voyage - left_at_cape AS death_at_arrival
+#FROM onboard_people;
diff --git a/sql/test/VOC/Tests/VOCquery.stable.out
b/sql/test/VOC/Tests/VOCquery.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCquery.stable.out
@@ -0,0 +1,10778 @@
+#START TRANSACTION;
+#select boatname from "voyages";
+% voc.voyages # table_name
+% boatname # name
+% varchar # type
+% 34 # length
+[ "AMSTERDAM" ]
+[ "DUIFJE" ]
+[ "HOLLANDIA" ]
+[ "MAURITIUS" ]
+[ "LANGEBARK" ]
+[ "MAAN" ]
+[ "ZON" ]
+[ "LEEUW" ]
+[ "LEEUWIN" ]
+[ "HOOP" ]
+[ "MAURITIUS" ]
+[ "WASSENDE MAAN" ]
+[ "MORGENSTER" ]
+[ "ZON" ]
+[ "FRIESLAND" ]
+[ "HOLLANDIA" ]
+[ "OVERIJSSEL" ]
+[ "MAURITIUS" ]
+[ "HOF VAN HOLLAND" ]
+[ "VERENIGDE LANDEN" ]
+[ "NASSAU" ]
+[ "NEDERLAND" ]
+[ "ZWARTE AREND" ]
+[ "WITTE AREND" ]
+[ "AMSTERDAM" ]
+[ "DELFT" ]
+[ "DORDRECHT" ]
+[ "GOUDA" ]
+[ "HAARLEM" ]
+[ "LEIDEN" ]
+[ "LANGEBARK" ]
+[ "MIDDELBURG" ]
+[ "ZEELANDIA" ]
+[ "ZON" ]
+[ "GELDERLAND" ]
+[ "DUIFJE" ]
+[ "UTRECHT" ]
+[ "WACHTER" ]
+[ "ZEELANDIA" ]
+[ "ALKMAAR" ]
+[ "AMSTERDAM" ]
+[ "ENKHUIZEN" ]
+[ "HOORN" ]
+[ "GROENE LEEUW" ]
+[ "RODE LEEUW" ]
+[ "WITTE LEEUW" ]
+[ "ZWARTE LEEUW" ]
+[ "LAM" ]
+[ "RAM" ]
+[ "SCHAAP" ]
+[ "TER GOES" ]
+[ "VLISSINGEN" ]
+[ "ZIERIKZEE" ]
+[ "MAAGD VAN ENKHUIZEN" ]
+[ "HOLLANDIA" ]
+[ "MAAN" ]
+[ "MAURITIUS" ]
+[ "NASSAU" ]
+[ "PAPEGAAITJE" ]
+[ "STER" ]
+[ "HOLLANDSE TUIN" ]
+[ "ZON" ]
+[ "EENDRACHT" ]
+[ "ERASMUS" ]
+[ "ROTTERDAM" ]
+[ "AMSTERDAM" ]
+[ "DELFT" ]
+[ "DORDRECHT" ]
+[ "DUIFJE" ]
+[ "ENKHUIZEN" ]
+[ "GELDERLAND" ]
+[ "HOF VAN HOLLAND" ]
+[ "HOORN" ]
+[ "MEDEMBLIK" ]
+[ "GEUNIEERDE PROVINCIEN" ]
+[ "WESTFRIESLAND" ]
+[ "ZEELANDIA" ]
+[ "GOUDA" ]
+[ "EENDRACHT" ]
+[ "WITTE LEEUW" ]
+[ "ZWARTE LEEUW" ]
+[ "MAURITIUS" ]
+[ "MIDDELBURG" ]
+[ "NASSAU" ]
+[ "ORANJE" ]
+[ "GROTE ZON" ]
+[ "AMSTERDAM" ]
+[ "KLEINE ZON" ]
+[ "ERASMUS" ]
+[ "GEUNIEERDE PROVINCIEN" ]
+[ "BANDA" ]
+[ "BANTAM" ]
+[ "CEYLON" ]
+[ "CHINA" ]
+[ "PATANIA" ]
+[ "TER VEERE" ]
+[ "WALCHEREN" ]
+[ "ZIERIKZEE" ]
+[ "GELDERLAND" ]
+[ "GOUDA" ]
+[ "GELDERLAND" ]
+[ "MIDDELBURG" ]
+[ "VALK" ]
+[ "ZEELANDIA" ]
+[ "AMSTERDAM" ]
+[ "AREND" ]
+[ "DELFT" ]
+[ "GRIFFIOEN" ]
+[ "HOLLANDIA" ]
+[ "HOORN" ]
+[ "RODE LEEUW MET PIJLEN" ]
+[ "PAUW" ]
+[ "GEUNIEERDE PROVINCIEN" ]
+[ "ROTTERDAM" ]
+[ "MEDEMBLIK" ]
+[ "HOOP" ]
+[ "HALVE MAAN" ]
+[ "HAZEWIND" ]
+[ "WAPEN VAN AMSTERDAM" ]
+[ "BRAK" ]
+[ "CEYLON" ]
+[ "TER GOES" ]
+[ "WITTE LEEUW" ]
+[ "ZWARTE LEEUW" ]
+[ "ORANJE" ]
+[ "VLISSINGEN" ]
+[ "GOUDA" ]
+[ "RODE LEEUW MET PULEN" ]
+[ "TER VEERE" ]
+[ "BANDA" ]
+[ "BANTAM" ]
+[ "HALVE MAAN" ]
+[ "GROTE AEOLUS" ]
+[ "CEYLON" ]
+[ "DUIFJE" ]
+[ "GELDERLAND" ]
+[ "GROENE LEEUW" ]
+[ "RODE ZEEUW" ]
+[ "GROTE MAAN" ]
+[ "PATANIA" ]
+[ "STER" ]
+[ "ZON" ]
+[ "ORANJE" ]
+[ "ROTTERDAM" ]
+[ "ZEELANDIA" ]
+[ "HOOP" ]
+[ "GEUNIEERDE PROVINCIEN" ]
+[ "AREND" ]
+[ "HOORN" ]
+[ "WITTE VALK" ]
+[ "NEPTUNUS" ]
+[ "KLEINE AEOLUS" ]
+[ "MIDDELBURG" ]
+[ "ZEELANDIA" ]
+[ "DELFT" ]
+[ "WAPEN VAN AMSTERDAM" ]
+[ "HOLLANDIA" ]
+[ "MAURITIUS" ]
+[ "NASSAU" ]
+[ "HERT" ]
+[ "VLISSINGEN" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
