Skip to content

Commit 26f5808

Browse files
alessiostallaalessiostalla
committed
Adapt tests for Python 3.12
1 parent 50d3797 commit 26f5808

9 files changed

Lines changed: 59 additions & 59 deletions

‎pylasu/testing/testing.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ def assert_single_properties_are_equal(case, expected_property, expected_prop_va
5656
def assert_multi_properties_are_equal(case, expected_property, expected_prop_value, actual_prop_value, context,
5757
consider_position):
5858
# TODO IgnoreChildren
59-
case.assertEquals(actual_prop_value is None, expected_prop_value is None,
60-
f"{context}.{expected_property.name} nullness")
59+
case.assertEqual(actual_prop_value is None, expected_prop_value is None,
60+
f"{context}.{expected_property.name} nullness")
6161
if actual_prop_value is not None and expected_prop_value is not None:
62-
case.assertEquals(len(actual_prop_value), len(expected_prop_value),
63-
f"{context}.{expected_property.name} length")
62+
case.assertEqual(len(actual_prop_value), len(expected_prop_value),
63+
f"{context}.{expected_property.name} length")
6464
for expected_it, actual_it, i in \
6565
zip(expected_prop_value, actual_prop_value, range(len(expected_prop_value))):
6666
assert_asts_are_equal(case, expected_it, actual_it, f"{context}[{i}]",

‎tests/mapping/test_parse_tree_to_ast_transformers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_simple_entities_transformer(self):
5959
entity BAR { }
6060
}
6161
"""))
62-
self.assertEquals(expected_ast, actual_ast)
62+
self.assertEqual(expected_ast, actual_ast)
6363

6464
def test_entities_with_features_transformer(self):
6565
transformer = ParseTreeToASTTransformer(allow_generic_node=False)
@@ -99,7 +99,7 @@ def test_entities_with_features_transformer(self):
9999
C: FOO;
100100
}
101101
}"""))
102-
self.assertEquals(expected_ast, actual_ast)
102+
self.assertEqual(expected_ast, actual_ast)
103103

104104
def parse_entities(self, code: str) -> AntlrEntityParser.ModuleContext:
105105
lexer = AntlrEntityLexer(InputStream(code))

‎tests/test_metamodel_builder.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def open_out_stream(self, other=None):
4343
resource.append(eClass)
4444
with BytesIO() as out:
4545
resource.save(out)
46-
self.assertEquals(
46+
self.assertEqual(
4747
json.loads('''{
4848
"eClass": "http://www.eclipse.org/emf/2002/Ecore#//EPackage",
4949
"nsPrefix": "test",
@@ -101,24 +101,24 @@ def test_build_metamodel_single_package(self):
101101
mb = MetamodelBuilder("tests.fixtures", "https://strumenta.com/pylasu/test/fixtures")
102102
box = mb.provide_class(Box)
103103
self.assertIsInstance(box(), EObject)
104-
self.assertEquals(box.eClass.ePackage, mb.package)
104+
self.assertEqual(box.eClass.ePackage, mb.package)
105105
self.assertTrue(box.eClass in mb.package.eContents)
106106
self.assertIsNotNone(
107107
next((a for a in box.eClass.eAllAttributes() if a.name == "name"), None))
108-
self.assertEquals(1, len(box.eClass.eAllAttributes()))
108+
self.assertEqual(1, len(box.eClass.eAllAttributes()))
109109

110110
def test_build_metamodel_single_package_inheritance(self):
111111
mb = MetamodelBuilder("tests.fixtures", "https://strumenta.com/pylasu/test/fixtures")
112112
box = mb.provide_class(ReinforcedBox)
113113
self.assertIsInstance(box(), EObject)
114-
self.assertEquals(box.eClass.ePackage, mb.package)
115-
self.assertEquals(2, len(mb.package.eContents))
114+
self.assertEqual(box.eClass.ePackage, mb.package)
115+
self.assertEqual(2, len(mb.package.eContents))
116116
self.assertTrue(box.eClass in mb.package.eContents)
117117
self.assertIsNotNone(
118118
next((a for a in box.eClass.eAllAttributes() if a.name == "name"), None))
119119
self.assertIsNotNone(
120120
next((a for a in box.eClass.eAllAttributes() if a.name == "strength"), None))
121-
self.assertEquals(2, len(box.eClass.eAllAttributes()))
121+
self.assertEqual(2, len(box.eClass.eAllAttributes()))
122122

123123

124124
STARLASU_MODEL_JSON = '''{

‎tests/test_model.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class ModelTest(unittest.TestCase):
3333

3434
def test_reference_by_name_unsolved_str(self):
3535
ref_unsolved = ReferenceByName[SomeNode]("foo")
36-
self.assertEquals("Ref(foo)[Unsolved]", str(ref_unsolved))
36+
self.assertEqual("Ref(foo)[Unsolved]", str(ref_unsolved))
3737

3838
def test_reference_by_name_solved_str(self):
3939
ref_solved = ReferenceByName[SomeNode]("foo", SomeNode(name="foo"))
40-
self.assertEquals("Ref(foo)[Solved]", str(ref_solved))
40+
self.assertEqual("Ref(foo)[Solved]", str(ref_solved))
4141

4242
def test_try_to_resolve_positive_case_same_case(self):
4343
ref = ReferenceByName[SomeNode]("foo")
@@ -61,9 +61,9 @@ def test_empty_node(self):
6161

6262
def test_node_with_position(self):
6363
node = Node().with_position(Position(Point(1, 0), Point(2, 1)))
64-
self.assertEquals(Position(Point(1, 0), Point(2, 1)), node.position)
64+
self.assertEqual(Position(Point(1, 0), Point(2, 1)), node.position)
6565
node = SomeNode("").with_position(Position(Point(1, 0), Point(2, 1)))
66-
self.assertEquals(Position(Point(1, 0), Point(2, 1)), node.position)
66+
self.assertEqual(Position(Point(1, 0), Point(2, 1)), node.position)
6767

6868
def test_node_properties(self):
6969
node = SomeNode("n").with_position(Position(Point(1, 0), Point(2, 1)))
@@ -84,15 +84,15 @@ def test_scope_lookup_0(self):
8484
local_symbol = SomeSymbol(name='a', index=0)
8585
scope = Scope(symbols={'a': [local_symbol]}, parent=Scope(symbols={'a': [SomeSymbol(name='a', index=1)]}))
8686
result = scope.lookup(symbol_name='a')
87-
self.assertEquals(result, local_symbol)
87+
self.assertEqual(result, local_symbol)
8888
self.assertIsInstance(result, Symbol)
8989

9090
def test_scope_lookup_1(self):
9191
"""Symbol found in upper scope with name and default type"""
9292
upper_symbol = SomeSymbol(name='a', index=0)
9393
scope = Scope(symbols={'b': [SomeSymbol(name='b', index=0)]}, parent=Scope(symbols={'a': [upper_symbol]}))
9494
result = scope.lookup(symbol_name='a')
95-
self.assertEquals(result, upper_symbol)
95+
self.assertEqual(result, upper_symbol)
9696
self.assertIsInstance(result, Symbol)
9797

9898
def test_scope_lookup_2(self):
@@ -111,15 +111,15 @@ def test_scope_lookup_4(self):
111111
upper_symbol = SomeSymbol(name='a', index=0)
112112
scope = Scope(symbols={'b': [SomeSymbol(name='b', index=0)]}, parent=Scope(symbols={'a': [upper_symbol]}))
113113
result = scope.lookup(symbol_name='a', symbol_type=SomeSymbol)
114-
self.assertEquals(result, upper_symbol)
114+
self.assertEqual(result, upper_symbol)
115115
self.assertIsInstance(result, SomeSymbol)
116116

117117
def test_scope_lookup_5(self):
118118
"""Symbol found in upper scope with name and type (local with different type)"""
119119
upper_symbol = SomeSymbol(name='a', index=0)
120120
scope = Scope(symbols={'a': [AnotherSymbol(name='a', index=0)]}, parent=Scope(symbols={'a': [upper_symbol]}))
121121
result = scope.lookup(symbol_name='a', symbol_type=SomeSymbol)
122-
self.assertEquals(result, upper_symbol)
122+
self.assertEqual(result, upper_symbol)
123123
self.assertIsInstance(result, SomeSymbol)
124124

125125
def test_scope_lookup_6(self):
@@ -138,15 +138,15 @@ def test_scope_lookup_7(self):
138138

139139
def test_node_properties_meta(self):
140140
pds = [pd for pd in sorted(SomeNode.node_properties, key=lambda x: x.name)]
141-
self.assertEquals(5, len(pds))
142-
self.assertEquals("bar", pds[0].name)
141+
self.assertEqual(5, len(pds))
142+
self.assertEqual("bar", pds[0].name)
143143
self.assertFalse(pds[0].provides_nodes)
144-
self.assertEquals("foo", pds[1].name)
144+
self.assertEqual("foo", pds[1].name)
145145
self.assertFalse(pds[1].provides_nodes)
146-
self.assertEquals("multiple", pds[2].name)
146+
self.assertEqual("multiple", pds[2].name)
147147
self.assertTrue(pds[2].provides_nodes)
148-
self.assertEquals(Multiplicity.MANY, pds[2].multiplicity)
149-
self.assertEquals("name", pds[3].name)
148+
self.assertEqual(Multiplicity.MANY, pds[2].multiplicity)
149+
self.assertEqual("name", pds[3].name)
150150
self.assertFalse(pds[3].provides_nodes)
151-
self.assertEquals("ref", pds[4].name)
151+
self.assertEqual("ref", pds[4].name)
152152
self.assertTrue(pds[4].provides_nodes)

‎tests/test_parse_tree.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def test_parse_tree_origin(self):
1616
origin = ParseTreeOrigin(parse_tree)
1717
position = origin.position
1818
self.assertIsNotNone(position)
19-
self.assertEquals(position.start, Point(1, 0))
20-
self.assertEquals(position.end, Point(2, 2))
19+
self.assertEqual(position.start, Point(1, 0))
20+
self.assertEqual(position.end, Point(2, 2))
2121

2222
def test_ast_gen(self):
2323
generate_nodes_classes_for_parser(SimpleLangParser, globals())

‎tests/test_processing.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class CW(Node):
2525

2626
class ProcessingTest(unittest.TestCase):
2727
def test_search_by_type(self):
28-
self.assertEquals(["1", "2", "3", "4", "5", "6"], [i.name for i in box.search_by_type(Item)])
29-
self.assertEquals(
28+
self.assertEqual(["1", "2", "3", "4", "5", "6"], [i.name for i in box.search_by_type(Item)])
29+
self.assertEqual(
3030
["root", "first", "1", "2", "big", "small", "3", "4", "5", "6"],
3131
[n.name for n in box.search_by_type(Node)]
3232
)
@@ -39,8 +39,8 @@ def test_replace_in_list(self):
3939
b = BW(a1, [a2, a3])
4040
b.assign_parents()
4141
a2.replace_with(a4)
42-
self.assertEquals("4", b.many_as[0].s)
43-
self.assertEquals(BW(a1, [a4, a3]), b)
42+
self.assertEqual("4", b.many_as[0].s)
43+
self.assertEqual(BW(a1, [a4, a3]), b)
4444

4545
def test_replace_in_set(self):
4646
a1 = AW("1")
@@ -57,4 +57,4 @@ def test_replace_single(self):
5757
b = BW(a1, [])
5858
b.assign_parents()
5959
a1.replace_with(a2)
60-
self.assertEquals("2", b.a.s)
60+
self.assertEqual("2", b.a.s)

‎tests/test_transpilation_trace.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ def test_serialize_transpilation_issue(self):
3838
message="some issue",
3939
severity=starlasu.IssueSeverity.getEEnumLiteral("WARNING"))]
4040
)
41-
self.assertEquals("a:1", tt.originalCode)
42-
self.assertEquals("b:2", tt.generatedCode)
43-
self.assertEquals("some issue", tt.issues[0].message)
44-
self.assertEquals("a", tt.sourceResult.root.name)
45-
self.assertEquals(1, tt.sourceResult.root.value)
46-
self.assertEquals("b", tt.targetResult.root.name)
47-
self.assertEquals(2, tt.targetResult.root.value)
41+
self.assertEqual("a:1", tt.originalCode)
42+
self.assertEqual("b:2", tt.generatedCode)
43+
self.assertEqual("some issue", tt.issues[0].message)
44+
self.assertEqual("a", tt.sourceResult.root.name)
45+
self.assertEqual(1, tt.sourceResult.root.value)
46+
self.assertEqual("b", tt.targetResult.root.name)
47+
self.assertEqual(2, tt.targetResult.root.value)
4848

4949
expected = """{
5050
"eClass" : "https://strumenta.com/kolasu/transpilation/v1#//TranspilationTrace",
@@ -69,7 +69,7 @@ def test_serialize_transpilation_issue(self):
6969
"severity" : "WARNING"
7070
} ]
7171
}"""
72-
self.assertEquals(json.loads(expected), json.loads(tt.save_as_json("foo.json")))
72+
self.assertEqual(json.loads(expected), json.loads(tt.save_as_json("foo.json")))
7373

7474
def test_serialize_transpilation_from_nodes(self):
7575
mmb = MetamodelBuilder("tests.fixtures", "https://strumenta.com/pylasu/test/fixtures")
@@ -112,4 +112,4 @@ def test_serialize_transpilation_from_nodes(self):
112112
}
113113
}"""
114114
as_json = tt.save_as_json("foo.json", mmb.generate())
115-
self.assertEquals(json.loads(expected), json.loads(as_json))
115+
self.assertEqual(json.loads(expected), json.loads(as_json))

‎tests/test_traversing.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66

77
class TraversingTest(unittest.TestCase):
88
def test_walk_within_with_outside_position(self):
9-
self.assertEquals([], [n.name for n in box.walk_within(pos(15, 1, 15, 1))])
9+
self.assertEqual([], [n.name for n in box.walk_within(pos(15, 1, 15, 1))])
1010

1111
def test_walk_within_with_root_position(self):
12-
self.assertEquals(
12+
self.assertEqual(
1313
["root", "first", "1", "2", "big", "small", "3", "4", "5", "6"],
1414
[n.name for n in box.walk_within(box.position)]
1515
)
1616

1717
def test_walk_within_with_leaf_position(self):
18-
self.assertEquals(["6"], [n.name for n in box.walk_within(pos(13, 3, 13, 9))])
18+
self.assertEqual(["6"], [n.name for n in box.walk_within(pos(13, 3, 13, 9))])
1919

2020
def test_walk_within_with_subtree_position(self):
21-
self.assertEquals(["small", "3", "4", "5"], [n.name for n in box.walk_within(pos(7, 5, 11, 5))])
21+
self.assertEqual(["small", "3", "4", "5"], [n.name for n in box.walk_within(pos(7, 5, 11, 5))])
2222

2323
def test_walk_depth_first(self):
24-
self.assertEquals(
24+
self.assertEqual(
2525
["root", "first", "1", "2", "big", "small", "3", "4", "5", "6"],
2626
[n.name for n in box.walk()]
2727
)
2828

2929
def test_walk_leaves_first(self):
30-
self.assertEquals(
30+
self.assertEqual(
3131
["1", "first", "2", "3", "4", "5", "small", "big", "6", "root"],
3232
[n.name for n in box.walk_leaves_first()]
3333
)
3434

3535
def test_walk_descendants(self):
36-
self.assertEquals(
36+
self.assertEqual(
3737
["first", "1", "2", "big", "small", "3", "4", "5", "6"],
3838
[n.name for n in box.walk_descendants()]
3939
)
4040

4141
def test_walk_ancestors(self):
4242
box.assign_parents()
4343
item4 = box.contents[2].contents[0].contents[1]
44-
self.assertEquals(["small", "big", "root"], [n.name for n in item4.walk_ancestors()])
44+
self.assertEqual(["small", "big", "root"], [n.name for n in item4.walk_ancestors()])

‎tests/transformation/test_ast_transformers.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def test_identitiy_transformer(self):
7070
SetStatement(variable="foo", value=123),
7171
DisplayIntStatement(value=456)])
7272
transformed_cu = transformer.transform(cu)
73-
self.assertEquals(cu, transformed_cu)
74-
self.assertEquals(transformed_cu.origin, cu)
73+
self.assertEqual(cu, transformed_cu)
74+
self.assertEqual(transformed_cu.origin, cu)
7575

7676
def test_translate_binary_expression(self):
7777
"""Example of transformation to perform a refactoring within the same language."""
@@ -87,7 +87,7 @@ def generic_binary_expression_to_ast(source: GenericBinaryExpression):
8787
my_transformer.register_identity_transformation(IntLiteral)
8888
source = GenericBinaryExpression(Operator.MULT, IntLiteral(7), IntLiteral(8))
8989
t1 = my_transformer.transform(source)
90-
self.assertEquals(t1, source.to_ast())
90+
self.assertEqual(t1, source.to_ast())
9191

9292
def test_translate_across_languages(self):
9393
transformer = ASTTransformer(allow_generic_node=False)
@@ -98,7 +98,7 @@ def test_translate_across_languages(self):
9898
transformer.register_node_factory(
9999
ALangMult,
100100
lambda source: BLangMult(transformer.transform(source.left), transformer.transform(source.right)))
101-
self.assertEquals(
101+
self.assertEqual(
102102
BLangMult(
103103
BLangSum(
104104
BLangIntLiteral(1),
@@ -123,8 +123,8 @@ def test_dropping_nodes(self):
123123
cu = CU(statements=[DisplayIntStatement(value=456), SetStatement(variable="foo", value=123)])
124124
transformed_cu = transformer.transform(cu)
125125
# TODO not yet supported self.assertTrue(transformed_cu.hasValidParents())
126-
self.assertEquals(transformed_cu.origin, cu)
127-
self.assertEquals(1, len(transformed_cu.statements))
126+
self.assertEqual(transformed_cu.origin, cu)
127+
self.assertEqual(1, len(transformed_cu.statements))
128128
assert_asts_are_equal(self, cu.statements[1], transformed_cu.statements[0])
129129

130130
def test_nested_origin(self):
@@ -135,7 +135,7 @@ def test_nested_origin(self):
135135
cu = CU(statements=[DisplayIntStatement(value=456)])
136136
transformed_cu = transformer.transform(cu)
137137
# TODO not yet supported self.assertTrue(transformed_cu.hasValidParents())
138-
self.assertEquals(transformed_cu.origin, cu)
138+
self.assertEqual(transformed_cu.origin, cu)
139139
self.assertIsInstance(transformed_cu.statements[0].origin, GenericNode)
140140

141141
def test_transforming_one_node_to_many(self):
@@ -146,7 +146,7 @@ def test_transforming_one_node_to_many(self):
146146
original = BarRoot([BarStmt("a"), BarStmt("b")])
147147
transformed = transformer.transform(original)
148148
# TODO not yet supported assertTrue { transformed.hasValidParents() }
149-
self.assertEquals(transformed.origin, original)
149+
self.assertEqual(transformed.origin, original)
150150
assert_asts_are_equal(
151151
self,
152152
BazRoot([BazStmt("a-1"), BazStmt("a-2"), BazStmt("b-1"), BazStmt("b-2")]),

0 commit comments

Comments
 (0)