Move tests to call fields.get_value

noirbizarre · Mar 12, 2020 · 1b145ec · 1b145ec
1 parent b1285df
commit 1b145ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/flask_restplus/fields.py b/flask_restplus/fields.py
@@ -43,7 +43,7 @@ def is_indexable_but_not_string(obj):
 
 
 def is_integer_indexable(obj):
- return isinstance(obj, list) or isinstance(obj, set)
+ return isinstance(obj, list) or isinstance(obj, tuple)
 
 
 def get_value(key, obj, default=None):

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -148,14 +148,6 @@ def test_with_attribute(self):
  field = fields.Raw(attribute='bar')
  assert field.output('foo', {'bar': 42}) == 42
 
- def test_with_attribute_list(self):
- field = fields.Raw(attribute='bar.0')
- assert field.output('foo', {'bar': [42]}) == 42
-
- def test_with_attribute_dict_list(self):
- field = fields.Raw(attribute='bar.0.val')
- assert field.output('foo', {'bar': [{'val': 42}]}) == 42
-
  def test_with_lambda_attribute(self, mocker):
  obj = mocker.Mock()
  obj.value = 42
@@ -1387,3 +1379,15 @@ def __getitem__(self, n):
 
  obj = Test('hi')
  assert fields.get_value('value', obj) == 'hi'
+
+ def test_get_value_int_indexable_list(self):
+ assert fields.get_value('bar.0', {'bar': [42]}) == 42
+
+ def test_get_value_int_indexable_nested_list(self):
+ assert fields.get_value('bar.0.val', {'bar': [{'val': 42}]}) == 42
+
+ def test_get_value_int_indexable_tuple(self):
+ assert fields.get_value('bar.0', {'bar': (42, 43)}) == 42
+
+ def test_get_value_int_indexable_nested_tuple(self):
+ assert fields.get_value('bar.0.val', {'bar': [{'val': 42}]}) == 42