[python-hdf5storage] 68/152: Fixed and rearranged tests.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Feb 29 08:24:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to annotated tag 0.1
in repository python-hdf5storage.
commit d726cabf5f2b3b5a4dda6a0e224a39f01bbab32e
Author: Freja Nordsiek <fnordsie at gmail.com>
Date: Sat Feb 1 18:41:55 2014 -0500
Fixed and rearranged tests.
---
tests/test_write_readback.py | 89 +++++++++++++++++++++++---------------------
1 file changed, 46 insertions(+), 43 deletions(-)
diff --git a/tests/test_write_readback.py b/tests/test_write_readback.py
index 1efc897..f272d10 100644
--- a/tests/test_write_readback.py
+++ b/tests/test_write_readback.py
@@ -28,15 +28,14 @@ class TestPythonMatlabFormat(object):
'int8', 'int16', 'int32', 'int64', 'float16',
'float32', 'float64', 'complex64', 'complex128']
- # Now, there is a write_readback_X and assert_equal_X where X is
- # a type for every type. Unless one is overridden in a subclass,
- # they should all point to write_readback. Storing things in the
- # dict self.__dict__ will do this.
+ # Now, there is an assert_equal_X where X is a type for every
+ # type. Unless one is overridden in a subclass, they should all
+ # the base one. Storing things in the dict self.__dict__ will do
+ # this.
types = ['None', 'bool', 'int', 'float', 'complex', 'str',
'bytes', 'bytearray']
for tp in types:
- self.__dict__['write_readback_' + tp] = self.write_readback
self.__dict__['assert_equal_' + tp] = self.assert_equal
def random_str_ascii(self, length):
@@ -99,113 +98,117 @@ class TestPythonMatlabFormat(object):
and a.shape == b.shape and np.all((a == b) \
| (np.isnan(a) & np.isnan(b))))
+ def assert_equal_numpy_string(self, a, b):
+ assert (type(a) == type(b) and a.dtype == b.dtype \
+ and a.shape == b.shape and a == b)
+
def test_None(self):
data = None
- out = self.write_readback_None(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_None(out, data)
def test_bool_True(self):
data = True
- out = self.write_readback_bool(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bool(out, data)
def test_bool_False(self):
data = False
- out = self.write_readback_bool(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bool(out, data)
def test_int(self):
data = self.random_int()
- out = self.write_readback_int(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_int(out, data)
def test_float(self):
data = self.random_float()
- out = self.write_readback_float(data, self.random_name(),
- self.options)
- self.assert_equal_float(data, out)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
+ self.assert_equal_float(out, data)
def test_float_inf(self):
data = float(np.inf)
- out = self.write_readback_float(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_float(out, data)
def test_float_ninf(self):
data = float(-np.inf)
- out = self.write_readback_float(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_float(out, data)
def test_float_nan(self):
data = float(np.nan)
- out = self.write_readback_float(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
assert math.isnan(out)
def test_complex(self):
data = self.random_float() + 1j*self.random_float()
- out = self.write_readback_float(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_complex(out, data)
def test_str(self):
data = self.random_str_ascii(random.randint(1, 100))
- out = self.write_readback_str(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_str(out, data)
def test_str_empty(self):
data = ''
- out = self.write_readback_str(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_str(out, data)
def test_bytes(self):
data = self.random_bytes(random.randint(1, 100))
- out = self.write_readback_bytes(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bytes(out, data)
def test_bytes_empty(self):
data = b''
- out = self.write_readback_bytes(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bytes(out, data)
def test_bytearray(self):
data = bytearray(self.random_bytes(random.randint(1, 100)))
- out = self.write_readback_bytearray(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bytearray(out, data)
def test_bytearray_empty(self):
data = bytearray(b'')
- out = self.write_readback_bytearray(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_bytearray(out, data)
def check_numpy_scalar(self, dtype):
data = self.random_numpy_scalar(dtype)
- out = self.write_readback_bytearray(data, self.random_name(),
- self.options)
- self.assert_equal_numpy(data, out)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
+ self.assert_equal_numpy(out, data)
def check_numpy_array(self, dtype):
shape = (random.randint(1, 12), random.randint(1, 12))
data = self.random_numpy(shape, dtype)
- out = self.write_readback_bytearray(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_numpy(out, data)
def check_numpy_empty(self, dtype):
data = np.array([], dtype)
- out = self.write_readback_bytearray(data, self.random_name(),
- self.options)
+ out = self.write_readback(data, self.random_name(),
+ self.options)
self.assert_equal_numpy(out, data)
def test_numpy_scalar(self):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-hdf5storage.git
More information about the debian-science-commits
mailing list