/[thuban]/branches/WIP-pyshapelib-bramz/test/test_proj.py

Diff of /branches/WIP-pyshapelib-bramz/test/test_proj.py

Parent Directory | Revision Log | View Patch Patch

-revision 1827 by bh,
Tue Oct 14 16:04:35 2003 UTC
+revision 1831 by bh,
Thu Oct 16 16:36:11 2003 UTC
 Line 133 
 class TestProjFileSimple:
  class TestProjFile(unittest.TestCase, support.SubscriberMixin):
-     """Test cases for reading and writing projection files.
+     """Test cases for ProjFile objects"""
-     """
      def setUp(self):
          self.clear_messages()
-Line 208 
 class ProjFileTest(unittest.TestCase, su
+Line 207 
 class ProjFileTest(unittest.TestCase, su
  class ProjFileReadTests(ProjFileTest):
-     """Test read ProjFile objects from files"""
+     """Test read ProjFile objects from files
+     The files only cover error handling and the system projection file.
+     """
      def test_read_non_existing_file(self):
          """Test read_proj_file with non-existing file"""
-Line 247 
 class ProjFileReadTests(ProjFileTest):
+Line 249 
 class ProjFileReadTests(ProjFileTest):
          self.assertEquals(warnings, [])
          self.assert_(len(projfile.GetProjections()) > 0)
+         # see whether it got cached and we get the same projfile object
+         # when we read the file again
+         projfile2, warnings = resource.get_system_proj_file()
+         self.assert_(projfile is projfile2)
  class WriteProjFileTests(ProjFileTest):
-Line 315 
 class WriteProjFileTests(ProjFileTest):
+Line 322 
 class WriteProjFileTests(ProjFileTest):
          self.doTestWrite(pf, file_contents)
- class TestLoadingProjFile(support.FileLoadTestCase):
+ class ProjFileLoadTestCase(support.FileLoadTestCase):
+     """Base class for the test cases that read specific test files"""
      file_extension = ".proj"
+     def tearDown(self):
+         """Clear the cache explicitly"""
+         resource.clear_proj_file_cache()
+ class TestLoadingProjFile(ProjFileLoadTestCase):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE projectionlist SYSTEM "projfile.dtd">
-Line 369 
 class TestLoadingProjFile(support.FileLo
+Line 386 
 class TestLoadingProjFile(support.FileLo
                                 "proj=tmerc", "units=m",
                                 "x_0=400000.000", "y_0=0.000"])
+     def test_caching(self):
+         # test whether the projfile cache works
+         projfile, warnings = resource.read_proj_file(self.filename())
+         projfile2, warnings = resource.read_proj_file(self.filename())
- class TestLoadingProjFileWithEmptyProjectionlist(support.FileLoadTestCase):
+         # Both projfiles should be the same object
+         self.assert_(projfile2 is projfile)
+         # If we clear the cache we should get a new one.
+         resource.clear_proj_file_cache()
+         projfile3, warnings = resource.read_proj_file(self.filename())
+         self.assert_(projfile3 is not projfile)
+ class TestLoadingProjFileWithEmptyProjectionlist(ProjFileLoadTestCase):
-     file_extension = ".proj"
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE projectionlist SYSTEM "projfile.dtd">
-Line 389 
 class TestLoadingProjFileWithEmptyProjec
+Line 418 
 class TestLoadingProjFileWithEmptyProjec
          self.assertEquals(len(projfile.GetProjections()), 0)
- class TestProjFileWithInvalidParameters(unittest.TestCase,
+ class TestProjFileWithInvalidParameters(ProjFileLoadTestCase):
-                                         support.FileLoadTestCase):
-     file_extension = ".proj"
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE projectionlist SYSTEM "projfile.dtd">

 Legend:



Removed from v.1827
 


changed lines


 
Added in v.1831
 Legend:



Removed from v.1827
 


changed lines


 
Added in v.1831
-Removed from v.1827
+Added in v.1831

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26