forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/master' into 7.0.x
This commit is contained in:
@@ -2046,7 +2046,9 @@ def validate_get_composed_info(constant_args, model_args, self):
|
||||
var_name_to_model_instances = {}
|
||||
for prop_name in model_args:
|
||||
if prop_name not in discarded_args:
|
||||
var_name_to_model_instances[prop_name] = [self] + composed_instances
|
||||
var_name_to_model_instances[prop_name] = [self] + list(
|
||||
filter(
|
||||
lambda x: prop_name in x.openapi_types, composed_instances))
|
||||
|
||||
return [
|
||||
composed_instances,
|
||||
|
||||
@@ -115,9 +115,9 @@ class TestChild(unittest.TestCase):
|
||||
self.assertEqual(
|
||||
child._var_name_to_model_instances,
|
||||
{
|
||||
'radio_waves': [child, child_allof_instance, parent_instance],
|
||||
'tele_vision': [child, child_allof_instance, parent_instance],
|
||||
'inter_net': [child, child_allof_instance, parent_instance]
|
||||
'radio_waves': [child, parent_instance],
|
||||
'tele_vision': [child, parent_instance],
|
||||
'inter_net': [child, child_allof_instance]
|
||||
}
|
||||
)
|
||||
# model._additional_properties_model_instances stores a list of
|
||||
|
||||
@@ -112,9 +112,9 @@ class TestDog(unittest.TestCase):
|
||||
self.assertEqual(
|
||||
dog._var_name_to_model_instances,
|
||||
{
|
||||
'breed': [dog, animal_instance, dog_allof_instance],
|
||||
'class_name': [dog, animal_instance, dog_allof_instance],
|
||||
'color': [dog, animal_instance, dog_allof_instance]
|
||||
'breed': [dog, dog_allof_instance],
|
||||
'class_name': [dog, animal_instance],
|
||||
'color': [dog, animal_instance]
|
||||
}
|
||||
)
|
||||
# model._additional_properties_model_instances stores a list of
|
||||
|
||||
Reference in New Issue
Block a user