From 4485f6d6c1186fd5bb7b927103d62c45383ce591 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 24 Oct 2014 15:50:56 -0500 Subject: [PATCH] Add tests for ImageCollection with multi_images --- skimage/io/tests/test_multi_image.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/skimage/io/tests/test_multi_image.py b/skimage/io/tests/test_multi_image.py index 8a4d0e3b..5b0ceb03 100644 --- a/skimage/io/tests/test_multi_image.py +++ b/skimage/io/tests/test_multi_image.py @@ -4,7 +4,7 @@ import numpy as np from numpy.testing import assert_raises, assert_equal, assert_allclose from skimage import data_dir -from skimage.io.collection import MultiImage +from skimage.io.collection import MultiImage, ImageCollection import six @@ -19,11 +19,17 @@ class TestMultiImage(): self.imgs = [MultiImage(paths[0]), MultiImage(paths[0], conserve_memory=False), MultiImage(paths[1]), - MultiImage(paths[1], conserve_memory=False)] + MultiImage(paths[1], conserve_memory=False), + ImageCollection(paths[0]), + ImageCollection(paths[1], conserve_memory=False), + ImageCollection('%s:%s' % (paths[0], paths[1]))] def test_len(self): assert len(self.imgs[0]) == len(self.imgs[1]) == 2 assert len(self.imgs[2]) == len(self.imgs[3]) == 24 + assert len(self.imgs[4]) == 2 + assert len(self.imgs[5]) == 24 + assert len(self.imgs[6]) == 26 def test_getitem(self): for img in self.imgs: @@ -41,6 +47,9 @@ class TestMultiImage(): def test_files_property(self): for img in self.imgs: + if isinstance(img, ImageCollection): + continue + assert isinstance(img.filename, six.string_types) def set_filename(f):