Remaining issues in Texture + tests

Author: einarf

pywavefront/texture.py

@@ -67,17 +67,19 @@ def find(self, path=None):
 
         Args:
             path: Override the search path
+        Raises:
+            FileNotFoundError if not found
         """
         if self.exists():
             return self.path
 
         search_path = path or self._search_path
-        locations = search_path.glob('**/{}'.format(self.file_name))
+        locations = Path(search_path).glob('**/{}'.format(self.file_name))
         # Attempt to look up the first entry of the generator
         try:
             first = next(locations)
         except StopIteration:
-            raise ValueError("Cannot locate texture `{}` in search path: {}".format(
+            raise FileNotFoundError("Cannot locate texture `{}` in search path: {}".format(
                 self._name, search_path))
 
         return str(first)
@@ -101,7 +103,7 @@ def path(self):
 
     @path.setter
     def path(self, value):
-        self._path = value
+        self._path = Path(value)
 
     @property
     def image_name(self):
@@ -116,5 +118,5 @@ def image_name(self, value):
         self._name = value
 
     def exists(self):
-        """bool: Does the texture exist?"""
+        """bool: Does the texture exist"""
         return self._path.exists()

tests/test_texture.py

@@ -11,14 +11,20 @@ class TestTexture(unittest.TestCase):
 
     def testPathedImageName(self):
         """For Texture objects, the image name should be the last component of the path."""
-        my_texture = pywavefront.texture.Texture('4x4.png', search_path=utils.FIXTURE_PATH)
-        self.assertEqual(my_texture.path, str(utils.fixture('4x4.png')))
-        self.assertEqual(my_texture.name, '4x4.png')
+        texture = pywavefront.texture.Texture('4x4.png', search_path=utils.FIXTURE_PATH)
+        self.assertEqual(texture.path, str(utils.fixture('4x4.png')))
+        self.assertEqual(texture.name, '4x4.png')
+        self.assertTrue(texture)
+        self.assertEqual(texture.image_name, '4x4.png')
+        self.assertEqual(texture.file_name, '4x4.png')
+        self.assertTrue(os.path.exists(texture.find()))
 
     def testMissingFile(self):
         """Referencing a missing texture file should raise an exception."""
         texture = pywavefront.texture.Texture('missing.file.do.not.create', search_path='')
         self.assertFalse(texture.exists())
+        with self.assertRaises(FileNotFoundError):
+            texture.find()
 
     def testPathVsName(self):
         texture = pywavefront.texture.Texture('somefile', search_path=Path('path/to'))