update test to support multiple write queries

Author: dmitrii-ubskii

test/code/README.md

@@ -19,7 +19,7 @@ Text.
 
 [,typeql]
 ----
-#!test[<TYPE>[, reset] [, rollback] [, fail_at=<FAILURE>] [, count=<NUM>] [, jump=<LABEL>] [, name=<LABEL>]]
+#!test[<TYPE>[, reset] [, rollback] [, fail_at=<FAILURE>] [, documents] [, count=<NUM>] [, jump=<LABEL>] [, name=<LABEL>]]
 #{{
 <HIDDEN-QUERY>
 #}}
@@ -46,6 +46,7 @@ where
 * `reset` resets the database before running the test
 * `rollback` rolls backs the transaction instead of committing it
 * `fail_at=<FAILURE>` can be `runtime, commit`
+* `documents` specifies that the query is a fetch query, and the results are documents
 * `count=<NUM>` is an integer representing expected answer count
 * `name=<LABEL>` names the test
 * `jump=<LABEL>` is a label for the test (used for entrypoints and jumping around)

test/code/parser/parser.py

@@ -1,7 +1,7 @@
 import os
 import re
 from dataclasses import dataclass
-from typing import List, Dict
+from typing import List, Dict, Tuple
 import logging
 logger = logging.getLogger('main')
 # To see debug log, set logging level to debug in main.py
@@ -114,9 +114,17 @@ def retrieve_antora_include(self, include_str: str):
         if tags_match.startswith('tags='):
             tags = tags_match.split('=')[1].split(';')
 
+        line_nrs: Tuple[str, str] = (None, None)
+        if tags_match.startswith('lines='):
+            line_nrs = tags_match.split('=')[1].split('..')
+
         # Read tagged lines from Antora include
         with open(file_path, 'r', encoding='utf-8') as f:
             lines = f.readlines()
+            if line_nrs[1]:
+                lines = lines[:int(line_nrs[1])]
+            if line_nrs[0]:
+                lines = lines[int(line_nrs[0]) - 1:]
 
         tagged_lines: Dict[str, List[str]] = {}
         current_tag = None
@@ -148,10 +156,13 @@ def retrieve_antora_include(self, include_str: str):
         logging.debug(f"... finished scanning included file, resolved tags: {tagged_lines}")
 
         output_lines = []
-        for tag in tags:
-            if tagged_lines.get(tag) is None:
-                self.error(f"Include is missing tag {tag}")
-            output_lines += tagged_lines[tag]
+        if tags:
+            for tag in tags:
+                if tagged_lines.get(tag) is None:
+                    self.error(f"Include is missing tag {tag}")
+                output_lines += tagged_lines[tag]
+        else:
+            output_lines = lines
 
         return output_lines
 

test/code/runners/typeql_runner.py

@@ -93,6 +93,7 @@ def run_failing_queries(self, queries: List[str], type: TransactionType) -> str:
         return FailureMode.NoFailure
 
     def run_transaction(self, queries: List[str], type: TransactionType, rollback=False) -> Union[int, None]:
+        queries = [q for qs in queries for q in qs.split('end;') if q.strip()]
         with self.driver.transaction(self.db, type) as tx:
             try:
                 for q in queries:
@@ -236,4 +237,4 @@ def try_tests(self, parsed_tests: List[ParsedTest], adoc_path: str, file_config:
 
                 current_test_index += 1
 
-        return None
+        return None