Skip to content

Commit 6abaa11

Browse files
use LSA readwrite type over CMO (#1234)
* use LSA readwrite type over CMO * flattened folder wrong for readwrite * revert CMO readwrite change Co-authored-by: [email protected] <[email protected]>
1 parent 3a9239b commit 6abaa11

File tree

1 file changed

+3
-2
lines changed
  • integration-tests/alias-test/verify/src/test/python/aliastest/verify

1 file changed

+3
-2
lines changed

integration-tests/alias-test/verify/src/test/python/aliastest/verify/verifier.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def _verify_aliases_at_location(self, generated_dictionary, location, folder_map
258258
location.get_folder_path(), class_name=CLASS_NAME, method_name=_method_name)
259259
self._check_attribute_list_for_flattened(location, attributes)
260260
# Swallow the intermediate layer that is not relevant in a flattened location
261-
this_dictionary = this_dictionary[this_dictionary.keys()[0]]
261+
this_dictionary = this_dictionary[this_dictionary.keys()[2]]
262262
attributes = _get_generated_attribute_list(this_dictionary)
263263
flattened_folder = True
264264
self._check_single_folder(this_dictionary, location, flattened_folder)
@@ -579,7 +579,6 @@ def _is_generated_attribute_readonly(self, location, generated_attribute, genera
579579
self._add_error(location, ERROR_FAILURE_ATTRIBUTE_UNEXPECTED,
580580
message='Generated attribute has no read type', attribute=generated_attribute)
581581
return None
582-
583582
if alias_get_required_attribute_list is not None and \
584583
generated_attribute in alias_get_required_attribute_list and CMO_READ_TYPE in generated_attribute_info:
585584
read_type = generated_attribute_info[CMO_READ_TYPE]
@@ -1113,6 +1112,8 @@ def _check_complex_type(self, location, generated_attribute, generated_attr_info
11131112
if _is_of_type_with_get_required(generated_attribute, alias_type, generated_attr_info,
11141113
get_required_attribute_list):
11151114
valid = True
1115+
_logger.finer('alias type JARRAY has get_required for attribute {0}', generated_attribute,
1116+
class_name=CLASS_NAME, method_name=_method_name)
11161117
elif _is_of_type_with_lsa(generated_attribute, alias_type, generated_attr_info,
11171118
get_required_attribute_list):
11181119
valid = True

0 commit comments

Comments
 (0)