diff --git a/tests/test_common.py b/tests/test_common.py index b594cb16272d95f704e51b0d239f2faa920468b6..e2d72210aa46936ef1bac8f32e2f9a20add16760 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -134,7 +134,7 @@ class TestCommon(unittest.TestCase): # The chunk metadata is always 16 bytes long chunk_metadata = real_data.read(16) header, relative_offset, data_length = struct.unpack("IIQ", chunk_metadata) - self.assertEquals(header, 0xabeceda) + self.assertEqual(header, 0xabeceda) # We start at the location of the chunk metadata, skip over the metadata, and then proceed to the # start of the actual data field, which is at some arbitrary place after the metadata. @@ -152,4 +152,4 @@ class TestCommon(unittest.TestCase): with self.assertRaises(ValueError) as context: read_chunk(fh, chunk_location + 1) - self.assertEquals(str(context.exception), "The ND2 file seems to be corrupted.") + self.assertEqual(str(context.exception), "The ND2 file seems to be corrupted.") diff --git a/tests/test_legacy.py b/tests/test_legacy.py index 6d16e26946fc4c11e0f0a5fe4d2eb7ad9308f54d..73bf269c15031df5fc4a4f9c664d2ab6f2854418 100644 --- a/tests/test_legacy.py +++ b/tests/test_legacy.py @@ -15,7 +15,7 @@ class TestLegacy(unittest.TestCase): with Nd2('test_data/legacy.nd2') as reader: self.assertIsInstance(reader.reader, ND2Reader) self.assertTrue(issubclass(w[0].category, DeprecationWarning)) - self.assertEquals(str(w[0].message), "The 'Nd2' class is deprecated, please consider using the new" + + self.assertEqual(str(w[0].message), "The 'Nd2' class is deprecated, please consider using the new" + " ND2Reader interface which uses pims.") def test_misc(self): @@ -30,9 +30,9 @@ class TestLegacy(unittest.TestCase): "Fields of View: %s" % len(reader.fields_of_view), "Z-Levels: %s" % len(reader.z_levels) ]) - self.assertEquals(representation, str(reader)) + self.assertEqual(representation, str(reader)) # not implemented yet - self.assertEquals(reader.pixel_microns, None) + self.assertEqual(reader.pixel_microns, None) - self.assertEquals(len(reader), 1) + self.assertEqual(len(reader), 1) diff --git a/tests/test_raw_metadata.py b/tests/test_raw_metadata.py index 0eddbf6cb51a384410e9d56989f05a0921802d96..6bc352375a869b8cfc5026d5b9ea658d6ddb50ea 100644 --- a/tests/test_raw_metadata.py +++ b/tests/test_raw_metadata.py @@ -77,4 +77,4 @@ class TestRawMetadata(unittest.TestCase): def test_color_channels(self): parsed_channels = self.metadata.get_parsed_metadata()['channels'] - self.assertEquals(parsed_channels, ['TRITC']) + self.assertEqual(parsed_channels, ['TRITC']) diff --git a/tests/test_reader.py b/tests/test_reader.py index 7a0d5c8c7c68932c0cc86f53b429df5a94a1c920..c0207c8819a9a8771f966a7b57871a9eb75abd6d 100644 --- a/tests/test_reader.py +++ b/tests/test_reader.py @@ -54,7 +54,7 @@ class TestReader(unittest.TestCase): with ArtificialND2('test_data/test_nd2_reader.nd2') as _: with ND2Reader('test_data/test_nd2_reader.nd2') as reader: timesteps = reader.timesteps - self.assertEquals(len(timesteps), 0) + self.assertEqual(len(timesteps), 0) def test_get_frame_zero(self): # Best test we can do for now: