Fix tests

Author: MyNameIsTrez

Python/ini_converting/ini_parser_tests.py

@@ -15,6 +15,23 @@ def parser_tests():
 	# 		{ "type": "extra", "content": "\t\t" }, { "type": "property", "content": "Foo" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "Bar" }
 	# 	]
 	# ])
+	# test("comments", [
+	# 	[
+	# 		{ "type": "extra", "content": "\n" },
+	# 		{ "type": "extra", "content": "// foo"}, { "type": "extra", "content": "\n" },
+	# 		{ "type": "extra", "content": "/*a\nb\nc*/" }, { "type": "extra", "content": "\n" },
+	# 	],
+	# ])
+	# test("nested", [
+	# 	[
+	# 		{ "type": "property", "content": "Foo" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "Bar" }, { "type": "extra", "content": "\n" },
+	# 		{ "type": "lines_tokens", "content": [
+	# 			[
+	# 				{ "type": "extra", "content": "\t" }, { "type": "property", "content": "Baz" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "Bee" }, { "type": "extra", "content": "\n" }
+	# 			]
+	# 		]}
+	# 	]
+	# ])
 	# test("multiple", [
 	# 	[
 	# 		{ "type": "property", "content": "Foo" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "Bar" }, { "type": "extra", "content": "\n" },
@@ -57,7 +74,8 @@ def parser_tests():
 
 
 def test(filename, expected):
-	text = tests.read_test(filename)
-	tokens = ini_tokenizer.get_tokens(filename)
+	filepath = tests.get_test_path_from_filename(filename)
+	text = tests.read_test(filepath)
+	tokens = ini_tokenizer.get_tokens(str(filepath))
 	ini_cst = ini_parser.get_parsed_tokens(tokens)
 	tests.test(text, ini_cst, expected)

Python/ini_converting/ini_tokenizer_tests.py

@@ -35,5 +35,10 @@ def tokenizer_tests():
 
 
 def test(filename, expected):
-	text = tests.read_test(filename)
-	tests.test(text, ini_tokenizer.get_tokens(filename), expected)
+	filepath = tests.get_test_path_from_filename(filename)
+	text = tests.read_test(filepath)
+
+	tokens = ini_tokenizer.get_tokens(str(filepath))
+	tokens_without_metadata = [ { "type": token["type"], "content": token["content"] } for token in tokens]
+
+	tests.test(text, tokens_without_metadata, expected)

Python/tests.py

@@ -13,8 +13,12 @@ def run():
 	# ini_parser_tests.multi_line_tests()
 
 
-def read_test(filename):
-	return Path(utils.resource_path(f"Python/ini_converting/ini_test_files/{filename}.ini")).read_text()
+def get_test_path_from_filename(filename):
+	return Path(utils.resource_path(f"Python/ini_converting/ini_test_files/{filename}.ini"))
+
+
+def read_test(filepath):
+	return filepath.read_text()
 
 
 def test(input_str, result, expected):
@@ -28,5 +32,13 @@ def test(input_str, result, expected):
 	)
 
 	# print(result)
+
+	# TODO: Comment these out before releasing this!
+	# import json
+	# with open("result.json", "w") as f:
+	# 	f.write(json.dumps(result))
+	# with open("expected.json", "w") as f:
+	# 	f.write(json.dumps(expected))
+
 	# TODO: Make the error_message not show twice in the popup.
 	assert result == expected, error_message