Skip to content

Commit

Permalink
Rename dict key for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@OliverStolzBO
OliverStolzBO committed Apr 10, 2024
1 parent 02a070c commit 674b648
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion pfdl_scheduler/parser/pfdl_tree_visitor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def visitExpression(self, ctx: PFDLParser.ExpressionContext) -> Dict:
if length == 2:
un_op = self.get_content(ctx.children[0])
ele = self.get_content(ctx.children[1])
return dict(unop=un_op, value=ele)
return dict(unOp=un_op, value=ele)

if length == 3:
left = self.get_content(ctx.children[0])
Expand Down
8 changes: 4 additions & 4 deletions tests/unit_test/test_pfdl_tree_visitor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ def test_visitWhileLoop(self):
service = Service()
condition = Condition()

expression = {"unop": "!", "value": "True"}
expression = {"unOp": "!", "value": "True"}
with patch.object(self.visitor, "visitExpression", return_value=expression) as mock:
with patch.object(
self.visitor, "visitStatement", MagicMock(side_effect=[service, condition])
Expand Down Expand Up @@ -584,7 +584,7 @@ def test_visitCondition(self):

passed_statements = [service, while_loop]

expression = {"unop": "!", "value": "True"}
expression = {"unOp": "!", "value": "True"}

# without failed
with patch.object(self.visitor, "visitExpression", return_value=expression) as mock:
Expand Down Expand Up @@ -834,9 +834,9 @@ def test_visitExpression(self):
):
expression = self.visitor.visitExpression(expression_context)
self.assertEqual(len(expression), 2)
self.assertTrue("unop" in expression)
self.assertTrue("unOp" in expression)
self.assertTrue("value" in expression)
self.assertEqual(expression, {"unop": "!", "value": "value"})
self.assertEqual(expression, {"unOp": "!", "value": "value"})

# case length = 3
expression_context.children = [
Expand Down
44 changes: 22 additions & 22 deletions tests/unit_test/test_semantic_error_checker.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1714,10 +1714,10 @@ def test_check_expression(self):
self.assertFalse(self.checker.check_expression(variable_list_2, None, task))

self.assertTrue(
self.checker.check_expression({"unop": "!", "value": variable_list}, None, task)
self.checker.check_expression({"unOp": "!", "value": variable_list}, None, task)
)
self.assertTrue(
self.checker.check_expression({"unop": "!", "value": variable_list_3}, None, task)
self.checker.check_expression({"unOp": "!", "value": variable_list_3}, None, task)
)

expression = {
Expand All @@ -1726,15 +1726,15 @@ def test_check_expression(self):
"right": {"left": 5, "binOp": "<", "right": variable_list},
}
self.assertTrue(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
"binOp": "!=",
"right": {"left": "(", "binOp": "true", "right": ")"},
}
self.assertTrue(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
Expand All @@ -1746,14 +1746,14 @@ def test_check_expression(self):
},
}
self.assertTrue(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)

self.assertFalse(
self.checker.check_expression({"unop": "!", "value": variable_list_2}, None, task)
self.checker.check_expression({"unOp": "!", "value": variable_list_2}, None, task)
)
self.check_if_print_error_is_called(
self.checker.check_expression, {"unop": "!", "value": variable_list_2}, None, task
self.checker.check_expression, {"unOp": "!", "value": variable_list_2}, None, task
)

expression = {
Expand All @@ -1762,10 +1762,10 @@ def test_check_expression(self):
"right": {"left": 5, "binOp": "<", "right": variable_list},
}
self.assertFalse(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)
self.check_if_print_error_is_called(
self.checker.check_expression, {"unop": "!", "value": expression}, None, task
self.checker.check_expression, {"unOp": "!", "value": expression}, None, task
)

expression = {
Expand All @@ -1774,10 +1774,10 @@ def test_check_expression(self):
"right": {"left": "True", "binOp": "<", "right": variable_list},
}
self.assertFalse(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)
self.check_if_print_error_is_called(
self.checker.check_expression, {"unop": "!", "value": expression}, None, task
self.checker.check_expression, {"unOp": "!", "value": expression}, None, task
)

expression = {
Expand All @@ -1790,10 +1790,10 @@ def test_check_expression(self):
},
}
self.assertFalse(
self.checker.check_expression({"unop": "!", "value": expression}, None, task)
self.checker.check_expression({"unOp": "!", "value": expression}, None, task)
)
self.check_if_print_error_is_called(
self.checker.check_expression, {"unop": "!", "value": expression}, None, task
self.checker.check_expression, {"unOp": "!", "value": expression}, None, task
)

self.assertTrue(
Expand Down Expand Up @@ -1990,10 +1990,10 @@ def test_check_unary_operation(self):
variable_list_3 = ["variable", "attribute_3"]

self.assertTrue(
self.checker.check_unary_operation({"unop": "!", "value": variable_list}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": variable_list}, None, task)
)
self.assertTrue(
self.checker.check_unary_operation({"unop": "!", "value": variable_list_3}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": variable_list_3}, None, task)
)

expression = {
Expand All @@ -2002,15 +2002,15 @@ def test_check_unary_operation(self):
"right": {"left": 5, "binOp": "<", "right": variable_list},
}
self.assertTrue(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
"binOp": "!=",
"right": {"left": "(", "binOp": "true", "right": ")"},
}
self.assertTrue(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
Expand All @@ -2022,27 +2022,27 @@ def test_check_unary_operation(self):
},
}
self.assertTrue(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)

self.assertFalse(
self.checker.check_unary_operation({"unop": "!", "value": variable_list_2}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": variable_list_2}, None, task)
)
expression = {
"left": variable_list_2,
"binOp": "Or",
"right": {"left": 5, "binOp": "<", "right": variable_list},
}
self.assertFalse(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
"binOp": "Or",
"right": {"left": "True", "binOp": "<", "right": variable_list},
}
self.assertFalse(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)
expression = {
"left": variable_list_3,
Expand All @@ -2054,7 +2054,7 @@ def test_check_unary_operation(self):
},
}
self.assertFalse(
self.checker.check_unary_operation({"unop": "!", "value": expression}, None, task)
self.checker.check_unary_operation({"unOp": "!", "value": expression}, None, task)
)

def test_check_binary_operation(self):
Expand Down

0 comments on commit 674b648

Please sign in to comment.