Add sqlserver tests, remove unnecessary log checks

jefflester · Dec 2, 2023 · 2c3cbb7 · 2c3cbb7
1 parent 7544d36
commit 2c3cbb7
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 81 deletions.
diff --git a/src/test/src/lib/json/biac.json b/src/test/src/lib/json/biac.json
@@ -48,15 +48,6 @@
         "sysadmin",
         "public"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/data-products.json b/src/test/src/lib/json/data-products.json
@@ -39,15 +39,6 @@
           ]
         }
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/delta-lake.json b/src/test/src/lib/json/delta-lake.json
@@ -60,15 +60,6 @@
         "name",
         "address"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/file-access-control.json b/src/test/src/lib/json/file-access-control.json
@@ -72,15 +72,6 @@
         "--user foo"
       ],
       "rowCount": 0
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/file-group-provider.json b/src/test/src/lib/json/file-group-provider.json
@@ -46,15 +46,6 @@
       "contains": [
         "[]"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/hive.json b/src/test/src/lib/json/hive.json
@@ -60,15 +60,6 @@
         "name",
         "address"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/iceberg.json b/src/test/src/lib/json/iceberg.json
@@ -59,15 +59,6 @@
         "name",
         "address"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/mysql.json b/src/test/src/lib/json/mysql.json
@@ -50,15 +50,6 @@
         "name",
         "address"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/postgres.json b/src/test/src/lib/json/postgres.json
@@ -51,15 +51,6 @@
         "name",
         "address"
       ]
-    },
-    {
-      "type": "logs",
-      "name": "Ensure trino is running",
-      "container": "trino",
-      "contains": [
-        "=== SERVER STARTED ==="
-      ],
-      "timeout": 60
     }
   ]
 }
diff --git a/src/test/src/lib/json/sqlserver.json b/src/test/src/lib/json/sqlserver.json
@@ -0,0 +1,54 @@
+{
+  "tests": [
+    {
+      "type": "query",
+      "name": "Test create schema",
+      "sql": "CREATE SCHEMA sqlserver.test_schema",
+      "trinoCliArgs": [
+        "--server 'http://trino:8080'",
+        "--user admin"
+      ],
+      "contains": [
+        "CREATE SCHEMA"
+      ]
+    },
+    {
+      "type": "query",
+      "name": "Test schema list",
+      "sql": "SHOW SCHEMAS IN sqlserver",
+      "trinoCliArgs": [
+        "--server 'http://trino:8080'",
+        "--user admin"
+      ],
+      "contains": [
+        "test_schema"
+      ]
+    },
+    {
+      "type": "query",
+      "name": "Test CTAS",
+      "sql": "CREATE TABLE sqlserver.test_schema.test_table AS SELECT * FROM tpch.tiny.customer LIMIT 10",
+      "trinoCliArgs": [
+        "--server 'http://trino:8080'",
+        "--user admin"
+      ],
+      "contains": [
+        "CREATE TABLE: 10 rows"
+      ]
+    },
+    {
+      "type": "query",
+      "name": "Test table select",
+      "sql": "SELECT * FROM sqlserver.test_schema.test_table LIMIT 10",
+      "trinoCliArgs": [
+        "--server 'http://trino:8080'",
+        "--user admin"
+      ],
+      "contains": [
+        "custkey",
+        "name",
+        "address"
+      ]
+    }
+  ]
+}