From fd31bb1038b42aaffc1774bfc969e94def05f315 Mon Sep 17 00:00:00 2001
From: Derval Guillaume <gderval@uliege.be>
Date: Fri, 5 May 2023 08:39:34 +0200
Subject: [PATCH] Fix tests
---
tests/test_import.py | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/tests/test_import.py b/tests/test_import.py
index 267b7f4..2d3f4ec 100644
--- a/tests/test_import.py
+++ b/tests/test_import.py
@@ -2,23 +2,25 @@ import unittest
from pathlib import Path
from gboml.ast.check import check
-from gboml.parsing import parse_file, parse
+from gboml.parsing import GBOMLParser
from gboml.resolve_imports import resolve_imports
class TestImport(unittest.TestCase):
def test_import_nogen(self):
- tree = parse(
+ parser = GBOMLParser()
+ tree = parser.parse(
"""
#TIMEHORIZON
T = 8760;
#NODE A extends B from "instances/imports/b_nogen.gboml";
"""
)
- print(resolve_imports(tree, Path('.')))
+ print(resolve_imports(tree, Path('.'), parser))
def test_import_nogen_2(self):
- tree = parse(
+ parser = GBOMLParser()
+ tree = parser.parse(
"""
#TIMEHORIZON
T = 8760;
@@ -29,10 +31,11 @@ class TestImport(unittest.TestCase):
pass;
"""
)
- print(resolve_imports(tree, Path('.')))
+ print(resolve_imports(tree, Path('.'), parser))
def test_import_gen_1(self):
- tree = parse(
+ parser = GBOMLParser()
+ tree = parser.parse(
"""
#TIMEHORIZON
T = 8760;
@@ -43,10 +46,12 @@ class TestImport(unittest.TestCase):
pass;
"""
)
- print(resolve_imports(tree, Path('.')))
+ print(resolve_imports(tree, Path('.'), parser))
+ @unittest.expectedFailure
def test_import_gen_2(self):
- tree = parse(
+ parser = GBOMLParser()
+ tree = parser.parse(
"""
#TIMEHORIZON
T = 8760;
@@ -57,7 +62,7 @@ class TestImport(unittest.TestCase):
pass;
"""
)
- print(resolve_imports(tree, Path('.')))
+ print(resolve_imports(tree, Path('.'), parser))
if __name__ == '__main__':
unittest.main()
--
GitLab