wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-28 11:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems from rebase.

Browse Source
This commit is contained in:
Steven Silvester
2014-11-07 15:22:19 +02:00
committed by Stefan van der Walt
parent 945e163867
commit d853b68f96
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/io/tests/test_multi_image.py
+13 -29
View File
@@ -14,24 +14,6 @@ class TestMultiImage():
def setUp(self):
# This multipage TIF file was created with imagemagick:
# convert im1.tif im2.tif -adjoin multipage.tif
<<<<<<< HEAD
self.img = MultiImage(os.path.join(data_dir, 'multipage.tif'))
def test_len(self):
assert len(self.img) == 2
def test_getitem(self):
num = len(self.img)
for i in range(-num, num):
assert type(self.img[i]) is np.ndarray
assert_allclose(self.img[0], self.img[-num])
# assert_raises expects a callable, hence this thin wrapper function.
def return_img(n):
return self.img[n]
assert_raises(IndexError, return_img, num)
assert_raises(IndexError, return_img, -num - 1)
=======
paths = [os.path.join(data_dir, 'multipage.tif'),
os.path.join(data_dir, 'no_time_for_that.gif')]
self.imgs = [MultiImage(paths[0]),
@@ -56,25 +38,27 @@ class TestMultiImage():
return img[n]
assert_raises(IndexError, return_img, num)
assert_raises(IndexError, return_img, -num - 1)
>>>>>>> 0769053... Add animated gif, and a test for it, plus tests without conserve_memory
def test_files_property(self):
assert isinstance(self.img.filename, six.string_types)
for img in self.imgs:
assert isinstance(img.filename, six.string_types)
def set_filename(f):
self.img.filename = f
assert_raises(AttributeError, set_filename, 'newfile')
def set_filename(f):
img.filename = f
assert_raises(AttributeError, set_filename, 'newfile')
def test_conserve_memory_property(self):
assert isinstance(self.img.conserve_memory, bool)
for img in self.imgs:
assert isinstance(img.conserve_memory, bool)
def set_mem(val):
self.img.conserve_memory = val
assert_raises(AttributeError, set_mem, True)
def set_mem(val):
img.conserve_memory = val
assert_raises(AttributeError, set_mem, True)
def test_concatenate(self):
array = self.img.concatenate()
assert_equal(array.shape, (len(self.img),) + self.img[0].shape)
for img in self.imgs:
array = img.concatenate()
assert_equal(array.shape, (len(img),) + img[0].shape)
if __name__ == "__main__":