Skip to content

Commit

Permalink
Adding test and minor fix for creating data lists from iterators
Browse files Browse the repository at this point in the history
  • Loading branch information
duncanwp committed Jan 18, 2017
1 parent d13f149 commit dc0237a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
6 changes: 0 additions & 6 deletions cis/data_io/common_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,6 @@ class CommonDataList(list):
"""
filenames = []

def __new__(cls, iterable=()):
cube_list = list.__new__(cls, iterable)
# Use extend to check all the types are the same - this gets overridden by each list sub-type
cube_list.extend(iterable)
return cube_list

def __init__(self, iterable=()):
super(CommonDataList, self).__init__()
self.extend(iterable)
Expand Down
10 changes: 10 additions & 0 deletions cis/test/unit/test_io/test_ungridded_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,16 @@ def test_GIVEN_data_containing_multiple_matching_coordinates_WHEN_coords_THEN_on
coord_names = [coord.standard_name for coord in unique_coords]
assert_that(coord_names, contains_inanyorder('latitude', 'longitude'))

def test_can_create_list_from_generators_and_other_iterators(self):
from cis.test.util.mock import make_regular_2d_ungridded_data
import itertools
another_list = UngriddedDataList((make_regular_2d_ungridded_data(), make_regular_2d_ungridded_data()))
assert_that(len(another_list) == 2)

dict = {1: [make_regular_2d_ungridded_data()], 2: [make_regular_2d_ungridded_data()]}
another_list = UngriddedDataList(itertools.chain.from_iterable(d for d in dict.values()))
assert_that(len(another_list) == 2)

@skip_pandas
def test_GIVEN_multiple_ungridded_data_WHEN_call_as_data_frame_THEN_returns_valid_data_frame(self):

Expand Down

0 comments on commit dc0237a

Please sign in to comment.