Skip to content

Commit 230055c

Browse files
committed
fix:generator expression tests
1 parent f2be2e6 commit 230055c

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

libs/astx-transpilers/tests/test_python.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,10 +1530,10 @@ def test_transpiler_do_while_expr() -> None:
15301530
def test_transpiler_generator_expr() -> None:
15311531
"""Test astx.GeneratorExpr."""
15321532
gen_expr = astx.GeneratorExpr(
1533-
element=astx.Variable("x"),
1534-
target=astx.BinaryOp(
1533+
element=astx.BinaryOp(
15351534
op_code="+", lhs=astx.Variable("x"), rhs=astx.Variable("x")
15361535
),
1536+
target=astx.Variable("x"),
15371537
iterable=astx.Identifier("range(10)"),
15381538
conditions=[
15391539
astx.BinaryOp(
@@ -1544,8 +1544,9 @@ def test_transpiler_generator_expr() -> None:
15441544
),
15451545
],
15461546
)
1547-
generated_code = transpiler.visit(gen_expr)
1548-
expected_code = "(x for (x + x) in range(10) if (x > 3) if (x < 7))"
1547+
print
1548+
generated_code = translate(gen_expr)
1549+
expected_code = "((x + x) for x in range(10) if (x > 3) if (x < 7))"
15491550
assert generated_code == expected_code, (
15501551
f"Expected '{expected_code}', but got '{generated_code}'"
15511552
)
@@ -1554,15 +1555,15 @@ def test_transpiler_generator_expr() -> None:
15541555
def test_transpiler_generator_expr_no_conditions() -> None:
15551556
"""Test astx.GeneratorExpr with no conditions."""
15561557
gen_expr = astx.GeneratorExpr(
1557-
element=astx.Variable("x"),
1558-
target=astx.BinaryOp(
1558+
target=astx.Variable("x"),
1559+
element=astx.BinaryOp(
15591560
op_code="+", lhs=astx.Variable("x"), rhs=astx.Variable("x")
15601561
),
15611562
iterable=astx.Identifier("range(10)"),
15621563
)
15631564

1564-
generated_code = transpiler.visit(gen_expr)
1565-
expected_code = "(x for (x + x) in range(10))"
1565+
generated_code = translate(gen_expr)
1566+
expected_code = "((x + x) for x in range(10))"
15661567
assert generated_code == expected_code, (
15671568
f"Expected '{expected_code}', but got '{generated_code}'"
15681569
)

libs/astx/tests/test_flows.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ def test_do_while_stmt() -> None:
391391
def test_generator_expr() -> None:
392392
"""Test `GeneratorExpr` class."""
393393
gen_expr = astx.GeneratorExpr(
394-
element=astx.Variable("x"),
395-
target=astx.BinaryOp(
394+
element=astx.BinaryOp(
396395
op_code="+", lhs=astx.Variable("x"), rhs=astx.Variable("x")
397396
),
397+
target=astx.Variable("x"),
398398
iterable=astx.Identifier("range(10)"),
399399
conditions=[
400400
astx.BinaryOp(
@@ -405,7 +405,12 @@ def test_generator_expr() -> None:
405405
),
406406
],
407407
)
408-
assert str(gen_expr)
408+
assert str(gen_expr) == (
409+
"GeneratorExpr[element=BinaryOp[+](Variable[x],Variable[x]),"
410+
" target=Variable[x],iterable=Identifier,"
411+
" conditions=['BinaryOp[>](Variable[x],LiteralInt32(3))',"
412+
" 'BinaryOp[<](Variable[x],LiteralInt32(7))']]"
413+
)
409414
assert gen_expr.get_struct()
410415
assert gen_expr.get_struct(simplified=True)
411416
visualize(gen_expr.get_struct())

0 commit comments

Comments
 (0)