Skip to content

Commit 4c068ea

Browse files
Vdeub-cloudinaryVdeub-cloudinary
committed
fix tests due to wrong definition
1 parent f25738a commit 4c068ea

1 file changed

Lines changed: 44 additions & 60 deletions

File tree

‎test/test_modules/test_cli_clone.py‎

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_list_metadata_items(self, mock_metadata_fields):
5252

5353
result = clone_module.list_metadata_items("metadata_fields")
5454

55-
mock_metadata_fields.assert_called_once("list_metadata_fields")
55+
mock_metadata_fields.assert_called_once()
5656
self.assertEqual(result, mock_metadata_fields.return_value['metadata_fields'])
5757

5858
@patch('cloudinary.api.list_metadata_rules')
@@ -76,93 +76,77 @@ def test_list_metadata_rules(self, mock_metadata_rules):
7676

7777
result = clone_module.list_metadata_items("metadata_rules")
7878

79-
mock_metadata_rules.assert_called_once("list_metadata_rules")
79+
mock_metadata_rules.assert_called_once()
8080
self.assertEqual(result, mock_metadata_rules.return_value['metadata_rules'])
8181

8282
@patch('cloudinary.api.add_metadata_field')
8383
def test_create_metadata_item_field(self, mock_add_metadata_field):
8484
"""Test creating a single metadata field"""
85-
mock_metadata_fields = {
86-
'metadata_fields': [
87-
{
88-
'external_id': 'test_field',
89-
'type': 'string',
90-
'label': 'Test Field',
91-
'mandatory': False
92-
}
93-
]
85+
mock_metadata_field = {
86+
'external_id': 'test_field',
87+
'type': 'string',
88+
'label': 'Test Field',
89+
'mandatory': False
9490
}
9591

96-
clone_module.create_metadata_item('add_metadata_field', mock_metadata_fields, self.mock_target_config)
92+
clone_module.create_metadata_item('add_metadata_field', mock_metadata_field, self.mock_target_config)
9793

98-
mock_add_metadata_field.assert_called_once_with('add_metadata_field', mock_metadata_fields)
94+
mock_add_metadata_field.assert_called_once_with('add_metadata_field', mock_metadata_field)
9995

10096
@patch('cloudinary.api.add_metadata_rule')
10197
def test_create_metadata_item_rule(self, mock_add_metadata_rule):
10298
"""Test creating a single metadata rule"""
103-
mock_metadata_rules = {
104-
'metadata_rules': [
105-
{
106-
'external_id': 'test_rule',
107-
'condition': 'if',
108-
'metadata_field': {
109-
'external_id': 'test_field'
110-
},
111-
'results': [{
112-
'value': 'test_value',
113-
'apply_to': ['metadata_field_external_id']
114-
}]
115-
}
116-
]
99+
mock_metadata_rule = {
100+
'external_id': 'test_rule',
101+
'condition': 'if',
102+
'metadata_field': {
103+
'external_id': 'test_field'
104+
},
105+
'results': [{
106+
'value': 'test_value',
107+
'apply_to': ['metadata_field_external_id']
108+
}]
117109
}
118110

119-
clone_module.create_metadata_item('add_metadata_rule', mock_metadata_rules, self.mock_target_config)
111+
clone_module.create_metadata_item('add_metadata_rule', mock_metadata_rule, self.mock_target_config)
120112

121-
mock_add_metadata_rule.assert_called_once_with('add_metadata_rule', mock_metadata_rules)
113+
mock_add_metadata_rule.assert_called_once_with('add_metadata_rule', mock_metadata_rule)
122114

123115
@patch('cloudinary.api.add_metadata_field')
124116
def test_create_metadata_item_field_with_error(self, mock_add_metadata_field):
125117
"""Test creating metadata field with API error"""
126-
mock_metadata_fields = {
127-
'metadata_fields': [
128-
{
129-
'external_id': 'test_field',
130-
'type': 'string',
131-
'label': 'Test Field',
132-
'mandatory': False
133-
}
134-
]
118+
mock_metadata_field = {
119+
'external_id': 'test_field',
120+
'type': 'string',
121+
'label': 'Test Field',
122+
'mandatory': False
135123
}
136124

137125
mock_add_metadata_field.side_effect = Exception("API Error")
138126

139127
with self.assertLogs(logger, level='ERROR') as log:
140-
clone_module.create_metadata_item('add_metadata_field', mock_metadata_fields, self.mock_target_config)
128+
clone_module.create_metadata_item('add_metadata_field', mock_metadata_field, self.mock_target_config)
141129
self.assertIn('Error creating metadata field', log.output[0])
142130

143131
@patch('cloudinary.api.add_metadata_rule')
144132
def test_create_metadata_item_rule_with_error(self, mock_add_metadata_rule):
145133
"""Test creating metadata rule with API error"""
146-
mock_metadata_rules = {
147-
'metadata_rules': [
148-
{
149-
'external_id': 'test_rule',
150-
'condition': 'if',
151-
'metadata_field': {
152-
'external_id': 'test_field'
153-
},
154-
'results': [{
155-
'value': 'test_value',
156-
'apply_to': ['metadata_field_external_id']
157-
}]
158-
}
159-
]
134+
mock_metadata_rule = {
135+
'external_id': 'test_rule',
136+
'condition': 'if',
137+
'metadata_field': {
138+
'external_id': 'test_field'
139+
},
140+
'results': [{
141+
'value': 'test_value',
142+
'apply_to': ['metadata_field_external_id']
143+
}]
160144
}
161145

162146
mock_add_metadata_rule.side_effect = Exception("API Error")
163147

164148
with self.assertLogs(logger, level='ERROR') as log:
165-
clone_module.create_metadata_item('add_metadata_rule', mock_metadata_rules, self.mock_target_config)
149+
clone_module.create_metadata_item('add_metadata_rule', mock_metadata_rule, self.mock_target_config)
166150
self.assertIn('Error creating metadata field', log.output[0])
167151

168152
@patch.object(clone_module, 'create_metadata_item')
@@ -192,8 +176,8 @@ def test_compare_create_metadata_items_new_fields(self, mock_list, mock_create):
192176

193177
# Both fields should be created
194178
self.assertEqual(mock_create.call_count, 2)
195-
mock_create.assert_any_call(mock_source_fields[0])
196-
mock_create.assert_any_call(mock_source_fields[1])
179+
mock_create.assert_any_call(mock_source_fields['metadata_fields'][0])
180+
mock_create.assert_any_call(mock_source_fields['metadata_fields'][1])
197181

198182
@patch.object(clone_module, 'create_metadata_item')
199183
@patch.object(clone_module, 'list_metadata_items')
@@ -230,8 +214,8 @@ def test_compare_create_metadata_items_new_rules(self, mock_list, mock_create):
230214

231215
# Both rules should be created
232216
self.assertEqual(mock_create.call_count, 2)
233-
mock_create.assert_any_call('add_metadata_rule', mock_source_metadata_rules[0])
234-
mock_create.assert_any_call('add_metadata_rule', mock_source_metadata_rules[1])
217+
mock_create.assert_any_call('add_metadata_rule', mock_source_metadata_rules['metadata_rules'][0])
218+
mock_create.assert_any_call('add_metadata_rule', mock_source_metadata_rules['metadata_rules'][1])
235219

236220
@patch.object(clone_module, 'create_metadata_item')
237221
@patch.object(clone_module, 'list_metadata_items')
@@ -335,7 +319,7 @@ def test_compare_create_metadata_items_mixed_scenario(self, mock_list, mock_crea
335319
clone_module.compare_create_metadata_items(mock_source_fields, mock_destination_fields, self.mock_target_config, key="metadata_fields")
336320

337321
# Only new_field should be created
338-
mock_create.assert_called_once_with(mock_source_fields[1])
322+
mock_create.assert_called_once_with(mock_source_fields['metadata_fields'][1])
339323

340324
@patch.object(clone_module, 'create_metadata_item')
341325
@patch.object(clone_module, 'list_metadata_items')
@@ -382,7 +366,7 @@ def test_compare_create_metadata_items_mixed_rules_scenario(self, mock_list, moc
382366
clone_module.compare_create_metadata_items(mock_source_metadata_rules, mock_destination_metadata_rules, self.mock_target_config, key="metadata_rules")
383367

384368
# Only new_rule should be created
385-
mock_create.assert_called_once_with('add_metadata_rule', mock_source_metadata_rules[1])
369+
mock_create.assert_called_once_with('add_metadata_rule', mock_source_metadata_rules['metadata_rules'][1])
386370

387371
if __name__ == '__main__':
388372
unittest.main()

0 commit comments

Comments
 (0)