Test name/path changes

Author: einarf

tests/test_parser.py

@@ -242,11 +242,17 @@ def testMtlNi(self):
 
     def testTextures(self):
         self.assertEqual(self.material1.texture.path, fixture('kd.png'))
+        self.assertEqual(self.material1.texture.name, 'kd.png')
         self.assertEqual(self.material1.texture_ambient.path, fixture('ka.png'))
+        self.assertEqual(self.material1.texture_ambient.name, 'ka.png')
         self.assertEqual(self.material1.texture_specular_color.path, fixture('ks.png'))
+        self.assertEqual(self.material1.texture_specular_color.name, 'ks.png')
         self.assertEqual(self.material1.texture_specular_highlight.path, fixture('ns.png'))
+        self.assertEqual(self.material1.texture_specular_highlight.name, 'ns.png')
         self.assertEqual(self.material1.texture_alpha.path, fixture('d.png'))
+        self.assertEqual(self.material1.texture_alpha.name, 'd.png')
         self.assertEqual(self.material1.texture_bump.path, fixture('bump.png'))
+        self.assertEqual(self.material1.texture_bump.name, 'bump.png')
 
 
 class TestParserFailure(unittest.TestCase):

tests/test_texture.py

@@ -16,3 +16,20 @@ def testMissingFile(self):
         """Referencing a missing texture file should raise an exception."""
         texture = pywavefront.texture.Texture('missing.file.do.not.create')
         self.assertFalse(texture.exists())
+
+    def testPathVsName(self):
+        texture = pywavefront.texture.Texture('somefile', 'path/to/somefile')
+        self.assertEqual(texture.name, 'somefile')
+        self.assertEqual(texture.path, 'path/to/somefile')
+        self.assertEqual(texture.image_name, 'somefile')
+
+        texture.name = "test1"
+        self.assertEqual(texture.name, 'test1')
+        self.assertEqual(texture.image_name, 'test1')
+
+        texture.image_name = "test2"
+        self.assertEqual(texture.name, 'test2')
+        self.assertEqual(texture.image_name, 'test2')
+
+        texture.path = "some/path"
+        self.assertEqual(texture.path, 'some/path')