Testing works (and library is passing)

Author: mkitzan

resources/tests/data/library-cross.db

@@ -4,19 +4,22 @@ def main():
 	os.system("python3 select.py")
 	num = 1
 	token = ""
+	db = "library.db"
 	with open("test-queries.txt", "r") as queries:
 		for query in queries:
 			query = query.strip()
 			if query[0] != "s":
 				token = query
+				if query == "CROSS":
+					db = "library-cross.db"
 				continue
 			q = open("query.txt", "w")
 			q.write(query + "\n")
 			q.close()
 			os.system("python3 compose.py")
 			os.system("g++ -std=c++2a " + "-D" + token + " -O3 -I../../include -o test test.cpp")
 			os.system("./test | sort > cpp-results.txt")
-			os.system("sqlite3 data/library.db \"" + query + ";\" | sort > sql-results.txt")
+			os.system("sqlite3 data/" + db + " \"" + query + ";\" | sort > sql-results.txt")
 			stream = os.popen("diff cpp-results.txt sql-results.txt")
 			res = "Passed"
 			for line in stream:

resources/tests/runner.py

@@ -11,13 +11,13 @@ def main():
 			if random.random() < h:
 				outfile.write(line)				
 	h = 500 / 700000
-	outfile.write("CROSS\n")
-	with open("cross-queries.txt", "r") as infile:
-		for line in infile:
-			if random.random() < h:
-				outfile.write(line)
 	outfile.write("NATURAL\n")
 	with open("natural-queries.txt", "r") as infile:
+		for line in infile:
+			if random.random() < h:
+				outfile.write(line)				
+	outfile.write("CROSS\n")
+	with open("cross-queries.txt", "r") as infile:
 		for line in infile:
 			if random.random() < h:
 				outfile.write(line)