Skip to content

Commit 8ee7d38

Browse files
jonathanrocherjonathanrocher
committed
Update unit tests.
1 parent d88651e commit 8ee7d38

4 files changed

Lines changed: 28 additions & 38 deletions

File tree

‎stage6_branded_application/pycasa/model/tests/test_image_file.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,28 @@ class TestImageFile(TestCase):
1818
def test_no_image_file(self):
1919
img = ImageFile()
2020
self.assertEqual(img.metadata, {})
21-
data = img.to_array()
22-
self.assertIsInstance(data, np.ndarray)
23-
self.assertEqual(data.shape, (0,))
21+
self.assertIsInstance(img.data, np.ndarray)
22+
self.assertEqual(img.data.shape, (0,))
2423

2524
def test_bad_type_image_file(self):
2625
img = ImageFile(filepath=__file__)
2726
self.assertEqual(img.metadata, {})
28-
data = img.to_array()
29-
self.assertIsInstance(data, np.ndarray)
30-
self.assertEqual(data.shape, (0,))
27+
self.assertIsInstance(img.data, np.ndarray)
28+
self.assertEqual(img.data.shape, (0,))
3129

3230
def test_image_metadata(self):
3331
img = ImageFile(filepath=SAMPLE_IMG1)
3432
self.assertNotEqual(img.metadata, {})
3533
for key in ['ExifVersion', 'ExifImageWidth', 'ExifImageHeight']:
3634
self.assertIn(key, img.metadata.keys())
37-
data = img.to_array()
3835
expected_shape = (img.metadata['ExifImageHeight'],
3936
img.metadata['ExifImageWidth'], 3)
40-
self.assertEqual(data.shape, expected_shape)
37+
self.assertEqual(img.data.shape, expected_shape)
4138

4239
def test_image_data(self):
4340
img = ImageFile(filepath=SAMPLE_IMG1)
4441
self.assertNotIn(0, img.data.shape)
45-
np.testing.assert_almost_equal(img.data, img.to_array())
42+
np.testing.assert_almost_equal(img.data, img.data)
4643
self.assertIsInstance(img.data, np.ndarray)
4744
self.assertNotEqual(img.data.mean(), 0)
4845

‎stage6_branded_application/pycasa/model/tests/test_image_folder.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,19 @@
1717
class TestImageFolder(TestCase):
1818
def test_no_folder(self):
1919
with self.assertRaises(ValueError):
20-
ImageFolder()
20+
ImageFolder(directory="path/to/nonexistent/dir")
2121

2222
def test_with_file(self):
2323
with self.assertRaises(ValueError):
24-
ImageFolder(path=__file__)
24+
ImageFolder(directory=__file__)
2525

2626
def test_empty_folder(self):
27-
img = ImageFolder(path=HERE)
28-
data = img.to_dataframe()
29-
self.assertIsInstance(data, pd.DataFrame)
30-
self.assertEqual(len(data), 0)
27+
img_folder = ImageFolder(directory=HERE)
28+
self.assertIsInstance(img_folder.data, pd.DataFrame)
29+
self.assertEqual(len(img_folder.data), 0)
3130

3231
def test_real_folder(self):
33-
img = ImageFolder(path=SAMPLE_IMG_DIR)
34-
data = img.to_dataframe()
35-
self.assertEqual(len(data), 2)
32+
img_folder = ImageFolder(directory=SAMPLE_IMG_DIR)
33+
self.assertEqual(len(img_folder.data), 2)
3634
for key in ['ExifVersion', 'ExifImageWidth', 'ExifImageHeight']:
37-
self.assertIn(key, data.columns)
35+
self.assertIn(key, img_folder.data.columns)

‎stage8.1_packaging_setuptools/pycasa/model/tests/test_image_file.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,28 @@ class TestImageFile(TestCase):
1818
def test_no_image_file(self):
1919
img = ImageFile()
2020
self.assertEqual(img.metadata, {})
21-
data = img.to_array()
22-
self.assertIsInstance(data, np.ndarray)
23-
self.assertEqual(data.shape, (0,))
21+
self.assertIsInstance(img.data, np.ndarray)
22+
self.assertEqual(img.data.shape, (0,))
2423

2524
def test_bad_type_image_file(self):
2625
img = ImageFile(filepath=__file__)
2726
self.assertEqual(img.metadata, {})
28-
data = img.to_array()
29-
self.assertIsInstance(data, np.ndarray)
30-
self.assertEqual(data.shape, (0,))
27+
self.assertIsInstance(img.data, np.ndarray)
28+
self.assertEqual(img.data.shape, (0,))
3129

3230
def test_image_metadata(self):
3331
img = ImageFile(filepath=SAMPLE_IMG1)
3432
self.assertNotEqual(img.metadata, {})
3533
for key in ['ExifVersion', 'ExifImageWidth', 'ExifImageHeight']:
3634
self.assertIn(key, img.metadata.keys())
37-
data = img.to_array()
3835
expected_shape = (img.metadata['ExifImageHeight'],
3936
img.metadata['ExifImageWidth'], 3)
40-
self.assertEqual(data.shape, expected_shape)
37+
self.assertEqual(img.data.shape, expected_shape)
4138

4239
def test_image_data(self):
4340
img = ImageFile(filepath=SAMPLE_IMG1)
4441
self.assertNotIn(0, img.data.shape)
45-
np.testing.assert_almost_equal(img.data, img.to_array())
42+
np.testing.assert_almost_equal(img.data, img.data)
4643
self.assertIsInstance(img.data, np.ndarray)
4744
self.assertNotEqual(img.data.mean(), 0)
4845

‎stage8.1_packaging_setuptools/pycasa/model/tests/test_image_folder.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,19 @@
1717
class TestImageFolder(TestCase):
1818
def test_no_folder(self):
1919
with self.assertRaises(ValueError):
20-
ImageFolder()
20+
ImageFolder(directory="path/to/nonexistent/dir")
2121

2222
def test_with_file(self):
2323
with self.assertRaises(ValueError):
24-
ImageFolder(path=__file__)
24+
ImageFolder(directory=__file__)
2525

2626
def test_empty_folder(self):
27-
img = ImageFolder(path=HERE)
28-
data = img.to_dataframe()
29-
self.assertIsInstance(data, pd.DataFrame)
30-
self.assertEqual(len(data), 0)
27+
img_folder = ImageFolder(directory=HERE)
28+
self.assertIsInstance(img_folder.data, pd.DataFrame)
29+
self.assertEqual(len(img_folder.data), 0)
3130

3231
def test_real_folder(self):
33-
img = ImageFolder(path=SAMPLE_IMG_DIR)
34-
data = img.to_dataframe()
35-
self.assertEqual(len(data), 2)
32+
img_folder = ImageFolder(directory=SAMPLE_IMG_DIR)
33+
self.assertEqual(len(img_folder.data), 2)
3634
for key in ['ExifVersion', 'ExifImageWidth', 'ExifImageHeight']:
37-
self.assertIn(key, data.columns)
35+
self.assertIn(key, img_folder.data.columns)

0 commit comments

Comments
 (0)