jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some refactoring. Reviewed comments and usage of "catch_warnings"

Browse source
This commit is contained in:
jevans 2013-08-07 13:48:33 -04:00
commit 775cd6f80c
5 changed files with 39 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

19
glymur/test/fixtures.py
View file

@ -1,5 +1,6 @@
import re
import sys
import warnings
import numpy as np
@ -20,6 +21,24 @@ if glymur.lib.openjp2.OPENJP2 is not None:
OPENJP2_IS_V2_OFFICIAL = True
msg = "Matplotlib with the PIL backend must be available in order to run the "
msg += "tests in this suite."
no_read_backend_msg = msg
try:
from PIL import Image
from matplotlib.pyplot import imread
no_read_backend = False
except:
no_read_backend = True
def read_image(infile):
# PIL issues warnings which we do not care about, so suppress them.
with warnings.catch_warnings():
warnings.simplefilter("ignore")
data = imread(infile)
return data
def mse(amat, bmat):
"""Mean Square Error"""
diff = amat.astype(np.double) - bmat.astype(np.double)

43
glymur/test/test_opj_suite.py
View file

@ -66,11 +66,10 @@ class TestSuite(unittest.TestCase):
def test_ETS_C0P0_p0_02_j2k(self):
jfile = os.path.join(data_root, 'input/conformance/p0_02.j2k')
jp2k = Jp2k(jfile)
with warnings.catch_warnings():
# There's a 0xff30 marker segment. Not illegal, but we don't
# really know what to do with it. Just ignore.
# Invalid marker ID.
warnings.simplefilter("ignore")
jp2k = Jp2k(jfile)
jpdata = jp2k.read(rlevel=0)
pgxfile = os.path.join(data_root, 'baseline/conformance/c0p0_02.pgx')
@ -385,11 +384,7 @@ class TestSuite(unittest.TestCase):
def test_ETS_C1P0_p0_02_j2k(self):
jfile = os.path.join(data_root, 'input/conformance/p0_02.j2k')
with warnings.catch_warnings():
# There's a 0xff30 marker segment. Not illegal, but we don't
# really know what to do with it. Just ignore.
warnings.simplefilter("ignore")
jp2k = Jp2k(jfile)
jp2k = Jp2k(jfile)
jpdata = jp2k.read(rlevel=0)
pgxfile = os.path.join(data_root, 'baseline/conformance/c1p0_02_0.pgx')
@ -830,7 +825,7 @@ class TestSuite(unittest.TestCase):
jfile = os.path.join(data_root, 'input/nonregression/broken2.jp2')
with self.assertRaises(IOError):
with warnings.catch_warnings():
# Library warning, invalid number of subbands.
# Invalid marker ID.
warnings.simplefilter("ignore")
data = Jp2k(jfile).read()
self.assertTrue(True)
@ -852,7 +847,7 @@ class TestSuite(unittest.TestCase):
'input/nonregression/broken4.jp2')
with self.assertRaises(IOError):
with warnings.catch_warnings():
# Library warning, invalid number of subbands.
# invalid number of subbands, bad marker ID
warnings.simplefilter("ignore")
data = Jp2k(jfile).read()
self.assertTrue(True)
@ -1053,6 +1048,7 @@ class TestSuite(unittest.TestCase):
f = 'input/nonregression/gdal_fuzzer_unchecked_numresolutions.jp2'
jfile = os.path.join(data_root, f)
with warnings.catch_warnings():
# Invalid number of resolutions.
warnings.simplefilter("ignore")
j = Jp2k(jfile)
with self.assertRaises(IOError):
@ -1066,6 +1062,7 @@ class TestSuite(unittest.TestCase):
'gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2')
jfile = os.path.join(data_root, '/'.join(lst))
with warnings.catch_warnings():
# Invalid component number.
warnings.simplefilter("ignore")
j = Jp2k(jfile)
with self.assertRaises(IOError):
@ -1077,6 +1074,7 @@ class TestSuite(unittest.TestCase):
relpath = 'input/nonregression/gdal_fuzzer_check_number_of_tiles.jp2'
jfile = os.path.join(data_root, relpath)
with warnings.catch_warnings():
# Invalid number of tiles.
warnings.simplefilter("ignore")
j = Jp2k(jfile)
with self.assertRaises(IOError):
@ -1088,6 +1086,7 @@ class TestSuite(unittest.TestCase):
relpath = 'input/nonregression/gdal_fuzzer_check_comp_dx_dy.jp2'
jfile = os.path.join(data_root, relpath)
with warnings.catch_warnings():
# Invalid subsampling value
warnings.simplefilter("ignore")
with self.assertRaises(IOError):
j = Jp2k(jfile).read()
@ -1220,36 +1219,28 @@ class TestSuite(unittest.TestCase):
def test_NR_DEC_p1_04_j2k_57_decode(self):
jfile = os.path.join(data_root, 'input/conformance/p1_04.j2k')
jp2k = Jp2k(jfile)
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tdata = jp2k.read(tile=63) # last tile
tdata = jp2k.read(tile=63) # last tile
odata = jp2k.read()
np.testing.assert_array_equal(tdata, odata[896:1024, 896:1024])
def test_NR_DEC_p1_04_j2k_58_decode(self):
jfile = os.path.join(data_root, 'input/conformance/p1_04.j2k')
jp2k = Jp2k(jfile)
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tdata = jp2k.read(tile=63, rlevel=2) # last tile
tdata = jp2k.read(tile=63, rlevel=2) # last tile
odata = jp2k.read(rlevel=2)
np.testing.assert_array_equal(tdata, odata[224:256, 224:256])
def test_NR_DEC_p1_04_j2k_59_decode(self):
jfile = os.path.join(data_root, 'input/conformance/p1_04.j2k')
jp2k = Jp2k(jfile)
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tdata = jp2k.read(tile=12) # 2nd row, 5th column
tdata = jp2k.read(tile=12) # 2nd row, 5th column
odata = jp2k.read()
np.testing.assert_array_equal(tdata, odata[128:256, 512:640])
def test_NR_DEC_p1_04_j2k_60_decode(self):
jfile = os.path.join(data_root, 'input/conformance/p1_04.j2k')
jp2k = Jp2k(jfile)
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tdata = jp2k.read(tile=12, rlevel=1) # 2nd row, 5th column
tdata = jp2k.read(tile=12, rlevel=1) # 2nd row, 5th column
odata = jp2k.read(rlevel=1)
np.testing.assert_array_equal(tdata, odata[64:128, 256:320])
@ -1366,9 +1357,7 @@ class TestSuite(unittest.TestCase):
jfile = os.path.join(data_root, 'input/conformance/p1_06.j2k')
jp2k = Jp2k(jfile)
fulldata = jp2k.read()
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tiledata = jp2k.read(tile=0)
tiledata = jp2k.read(tile=0)
np.testing.assert_array_equal(tiledata, fulldata[0:3, 0:3])
@unittest.skip("fprintf stderr output in r2343.")
@ -1376,9 +1365,7 @@ class TestSuite(unittest.TestCase):
jfile = os.path.join(data_root, 'input/conformance/p1_06.j2k')
jp2k = Jp2k(jfile)
fulldata = jp2k.read()
with warnings.catch_warnings():
warnings.simplefilter("ignore")
tiledata = jp2k.read(tile=5)
tiledata = jp2k.read(tile=5)
np.testing.assert_array_equal(tiledata, fulldata[3:6, 3:6])
@unittest.skip("fprintf stderr output in r2343.")

12
glymur/test/test_opj_suite_neg.py
View file

@ -12,13 +12,13 @@ if sys.hexversion < 0x02070000:
else:
import unittest
import warnings
import numpy as np
import pkg_resources
from glymur.lib import openjp2 as opj2
from .fixtures import read_image
msg = "Matplotlib with the PIL backend must be available in order to run the "
msg += "tests in this suite."
no_read_backend_msg = msg
@ -40,14 +40,6 @@ except:
raise
def read_image(infile):
# PIL issues warnings which we do not care about, so suppress them.
with warnings.catch_warnings():
warnings.simplefilter("ignore")
data = imread(infile)
return data
@unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None,
"Missing openjp2 library.")
@unittest.skipIf(no_read_backend, no_read_backend_msg)

20
glymur/test/test_opj_suite_write.py
View file

@ -13,21 +13,11 @@ if sys.hexversion < 0x02070000:
else:
import unittest
import warnings
import numpy as np
from glymur.lib import openjp2 as opj2
msg = "Matplotlib with the PIL backend must be available in order to run the "
msg += "tests in this suite."
no_read_backend_msg = msg
try:
from PIL import Image
from matplotlib.pyplot import imread
no_read_backend = False
except:
no_read_backend = True
from .fixtures import read_image, no_read_backend, no_read_backend_msg
from glymur import Jp2k
import glymur
@ -40,14 +30,6 @@ except:
raise
def read_image(infile):
# PIL issues warnings which we do not care about, so suppress them.
with warnings.catch_warnings():
warnings.simplefilter("ignore")
data = imread(infile)
return data
@unittest.skipIf(os.name == "nt", "no write support on windows, period")
@unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None,
"Missing openjp2 library.")

2
glymur/test/test_printing.py
View file

@ -1,6 +1,7 @@
#pylint: disable-all
import os
import pkg_resources
import re
import struct
import sys
import tempfile
@ -1026,5 +1027,6 @@ class TestPrinting(unittest.TestCase):
self.assertEqual(actual, expected)
if __name__ == "__main__":
unittest.main()