Merge pull request #28 from SergioRAgostinho/uts-full-path

Specify the full path for the test files. Removed pyglet dep on unit tests

Author: Kurt Yoder

test/test_material.py

@@ -1,15 +1,16 @@
 import unittest
-
-import pyglet
+import os
 
 import pywavefront.material
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestMaterial(unittest.TestCase):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
-        self.material = pywavefront.material.Material('material')
-        self.material.set_texture('4x4.png')
+        # Append current path to locate files
+        self.material = pywavefront.material.Material(prepend_dir('material'))
+        self.material.set_texture(prepend_dir('4x4.png'))
 
     def testSetTexture(self):
         "Running set_texture should set a texture."
@@ -55,9 +56,6 @@ def testSetEmissive(self):
         self.assertEqual(self.material.emissive, [0., 0., 0., 0.])
 
 class TestInvalidMaterial(unittest.TestCase):
-    def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
 
     def testSetInvalidTexture(self):
         "Running set_texture with a nonexistent file should raise an exception."

test/test_mesh.py

@@ -1,13 +1,8 @@
 import unittest
 
-import pyglet
-
 import pywavefront.mesh
 
 class TestMesh(unittest.TestCase):
-    def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
 
     def testMeshName(self):
         "Creating a mesh with a name should set the name."

test/test_parser.py

@@ -1,14 +1,15 @@
 import unittest
-
-import pyglet
+import os
 
 import pywavefront.parser
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestParsers(unittest.TestCase):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
-        meshes = pywavefront.Wavefront('simple.obj')
+        # Append current path to locate files
+        meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
         self.mesh1 = meshes.mesh_list[0]
         self.mesh2 = meshes.mesh_list[1]
 
@@ -37,9 +38,8 @@ def testObjMaterials(self):
 
 class TestMtlParser(unittest.TestCase):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
-        meshes = pywavefront.Wavefront('simple.obj')
+        # Append current path to locate files
+        meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
         self.material1 = meshes.mesh_list[0].materials[0]
         self.material2 = meshes.mesh_list[1].materials[0]
 
@@ -70,17 +70,15 @@ def testMtlSpecular(self):
     def testMtlTextureName(self):
         "Parsing an obj file with known material texture should set its name."
         # also tests d
-        self.assertEqual(self.material1.texture.image_name, '4x4.png')
+        self.assertEqual(self.material1.texture.image_name,
+                         prepend_dir('4x4.png'))
 
 class TestParserFailure(unittest.TestCase):
-    def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
 
     def testMissingParseFunction(self):
         "Attempting to parse with a missing parse function should raise an exception."
         # since no parse functions have been defined, this will always fail
-        self.assertRaises(Exception, pywavefront.parser.Parser, 'uv_sphere.obj')
+        self.assertRaises(Exception, pywavefront.parser.Parser, prepend_dir('uv_sphere.obj'))
 
     def testMissingParsedFile(self):
         "Referencing a missing parsed file should raise an exception."

test/test_texture.py

@@ -1,22 +1,21 @@
 import unittest
-
-import pyglet
+import os
 
 import pywavefront.texture
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestTexture(unittest.TestCase):
-    def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
 
     def testPathedImageName(self):
         "For Texture objects, the image name should be the last component of the path."
-        my_texture = pywavefront.texture.Texture('4x4.png')
-        self.assertEqual(my_texture.image_name, '4x4.png')
+        my_texture = pywavefront.texture.Texture(prepend_dir('4x4.png'))
+        self.assertEqual(my_texture.image_name, prepend_dir('4x4.png'))
 
     def testNonPowerOfTwoImage(self):
         "Texture images that have a non-power-of-two dimension should raise an exception."
-        self.assertRaises(Exception, pywavefront.texture.Texture, '3x4.png')
+        self.assertRaises(Exception, pywavefront.texture.Texture, prepend_dir('3x4.png'))
 
     def testMissingFile(self):
         "Referencing a missing texture file should raise an exception."

test/test_wavefront.py

@@ -1,16 +1,16 @@
 import unittest
-
-import pyglet
+import os
 
 import pywavefront
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestWavefront(unittest.TestCase):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
         self.mesh_names = ['Simple', 'SimpleB']
         self.material_names = ['Material.simple', 'Material2.simple']
-        self.meshes = pywavefront.Wavefront('simple.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
 
     def testMaterials(self):
         "Ensure parsed wavefront materials match known values."
@@ -41,38 +41,31 @@ def testMeshMaterialVertices(self):
         self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 24)
 
 class TestBrokenWavefront(unittest.TestCase):
-    def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
 
     def testUnknownUsemtl(self):
         "Referencing an unknown material with usemtl should raise an exception."
         self.assertRaises(pywavefront.PywavefrontException,
-                pywavefront.Wavefront, 'simple_unknown_usemtl.obj')
+                pywavefront.Wavefront, prepend_dir('simple_unknown_usemtl.obj'))
 
     def testMissingNormals(self):
         "If there are texture coordinates but no normals, should raise an exception."
         self.assertRaises(pywavefront.PywavefrontException,
-                pywavefront.Wavefront, 'simple_missing_normals.obj')
+                pywavefront.Wavefront, prepend_dir('simple_missing_normals.obj'))
 
 class TestNoMaterial(TestWavefront):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
         # reset the obj file to new file with no mtl line
         self.mesh_names = ['Simple', 'SimpleB']
         self.material_names = [None]
-        self.meshes = pywavefront.Wavefront('simple_no_mtl.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple_no_mtl.obj'))
 
     def testMeshMaterialVertices(self):
         "Mesh vertices should have known values."
         self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 48)
 
 class TestNoObjectNoMaterial(TestNoMaterial):
     def setUp(self):
-        pyglet.resource.path.append('@' + __name__)
-        pyglet.resource.reindex()
         # reset the obj file to new file with no mtl line
         self.mesh_names = [None]
         self.material_names = [None]
-        self.meshes = pywavefront.Wavefront('simple_no_object_no_mtl.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple_no_object_no_mtl.obj'))