From bacf6a914705a56caf612ea2746995f8d7e1e946 Mon Sep 17 00:00:00 2001
From: Lorenzo Zolfanelli <lorenzo.zolfanelli@espci.psl.eu>
Date: Thu, 18 Jan 2024 16:38:36 +0100
Subject: [PATCH] test: fix wrong assertEquals calls
---
tests/test_common.py | 4 ++--
tests/test_legacy.py | 8 ++++----
tests/test_raw_metadata.py | 2 +-
tests/test_reader.py | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/test_common.py b/tests/test_common.py
index b594cb1..e2d7221 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 6d16e26..73bf269 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 0eddbf6..6bc3523 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 7a0d5c8..c0207c8 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:
--
GitLab