Skip to content

Commit 85e6e8a

Browse files
committed
Fix failing tests for v12
- adapt function to changing JSON response on edges - adapt test to changing error message in compile process response - fix tests for search_string_in_code function
1 parent f09e8a5 commit 85e6e8a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

TM1py/Services/ElementService.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,11 +1090,16 @@ def get_edges_under_consolidation(
10901090

10911091
response = self._rest.GET(url, **kwargs)
10921092
consolidation_tree = response.json()
1093+
is_v12_or_higher = verify_version("12.0", self.version)
10931094

10941095
# recursive function to parse consolidation sub_tree
10951096
def get_edges(sub_trees):
10961097
for sub_tree in sub_trees:
1097-
edges[sub_tree["ParentName"], sub_tree["ComponentName"]] = sub_tree["Weight"]
1098+
if is_v12_or_higher:
1099+
component_name = sub_tree["Component"]["Name"]
1100+
else:
1101+
component_name = sub_tree["ComponentName"]
1102+
edges[sub_tree["ParentName"],component_name] = sub_tree["Weight"]
10981103

10991104
if "Edges" not in sub_tree["Component"]:
11001105
continue

Tests/ProcessService_test.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ class TestProcessService(unittest.TestCase):
7070
datasource_type="JSON",
7171
datasource_json_root_pointer="data",
7272
datasource_json_variable_mapping="{}",
73-
prolog_procedure="sTestProlog = 'test prolog procedure';",
74-
metadata_procedure="sTestMeta = 'test metadata procedure';",
75-
data_procedure="sTestData = 'test data procedure';",
76-
epilog_procedure="sTestEpilog = 'test epilog procedure';",
73+
prolog_procedure="sTestProlog = 'test JSON prolog procedure';",
74+
metadata_procedure="sTestMeta = 'test JSON metadata procedure';",
75+
data_procedure="sTestData = 'test JSON data procedure';",
76+
epilog_procedure="sTestEpilog = 'test JSON epilog procedure';",
7777
datasource_data_source_name_for_server=r"C:\Data\file.json",
7878
datasource_data_source_name_for_client=r"C:\Data\file.json",
7979
)
@@ -290,7 +290,7 @@ def test_compile_with_errors(self):
290290
self.tm1.processes.update_or_create(p_bad)
291291
errors = self.tm1.processes.compile(p_bad.name)
292292
self.assertTrue(len(errors) == 1)
293-
self.assertIn('"dimsize"', errors[0]["Message"])
293+
self.assertIn('dimsize', errors[0]["Message"])
294294
self.tm1.processes.delete(p_bad.name)
295295

296296
@skip_if_version_lower_than(version="11.4")
@@ -373,7 +373,7 @@ def test_compile_process_with_errors(self):
373373

374374
errors = self.tm1.processes.compile_process(p_bad)
375375
self.assertTrue(len(errors) == 1)
376-
self.assertIn('"dimsize"', errors[0]["Message"])
376+
self.assertIn('dimsize', errors[0]["Message"])
377377

378378
def test_get_process(self):
379379
p_ascii_orig = copy.deepcopy(self.p_ascii)

0 commit comments

Comments
 (0)