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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1555 by bh,
Thu Aug  7 15:41:05 2003 UTC
+revision 1839 by bh,
Tue Oct 21 09:58:51 2003 UTC
 Line 15 
 __version__ = "$Revision$"
  import os, sys
  import unittest
+ import traceback
+ import postgissupport
  def thuban_dir():
      """Return the directory containing the Thuban package"""
-Line 44 
 def initthuban():
+Line 48 
 def initthuban():
      """
      global _initthuban_done
      if not _initthuban_done:
+         # Thuban uses gettext to translate some strings. Some of these
+         # strings are tested for equality in some test cases. So we
+         # unset any LANG environment setting to make sure only the
+         # untranslated messages are used.
+         try:
+             del os.environ["LANG"]
+         except KeyError:
+             pass
          add_thuban_dir_to_path()
          import thubaninit
          _initthuban_done = 1
-Line 98 
 class ThubanTestResult(unittest._TextTes
+Line 110 
 class ThubanTestResult(unittest._TextTes
                  self.stream.writeln()
              self.stream.writeln("Skipped tests:")
              for reason, tests in self.skipped_tests.items():
-                 self.stream.writeln("%s:" % reason)
+                 self.stream.writeln("  %s:" % reason)
                  for test in tests:
                      self.stream.writeln("    " + test.id())
          unittest._TextTestResult.printErrors(self)
+     def getDescription(self, test):
+         return test.id()
  class ThubanTestRunner(unittest.TextTestRunner):
-Line 119 
 class ThubanTestProgram(unittest.TestPro
+Line 134 
 class ThubanTestProgram(unittest.TestPro
      def runTests(self):
          """Extend inherited method so that we use a ThubanTestRunner"""
-         print "ThubanTestProgram.runTests"
          self.testRunner = ThubanTestRunner(verbosity = self.verbosity)
          unittest.TestProgram.runTests(self)
- def run_tests():
+ def execute_as_testsuite(callable, *args, **kw):
-     """Frontend for unittest.main that prints some additional debug information
+     """Call callable  with args as if it were the entry point to the test suite
-     After calling unittest.main, run the garbage collector and print
+     Return watever callable returns.
-     uncollected objects. Also print any un-unsubscribed messages.
+     This is a helper function for run_tests and runtests.py. Call
+     callable in a try-finally block and run some cleanup and print some
+     additional information in the finally block.
+     The additionaly information include:
+      - A list of uncollected objects (after an explicit garbage
+        collector call)
+      - any unsubscribed messages
      """
      try:
-         ThubanTestProgram()
+         return callable(*args, **kw)
      finally:
          # This has to be in a finally clause because unittest.main()
          # ends with a sys.exit to make sure that the process exits with
          # an appropriate exit code
+         # Shutdown the postgis server if it's running
+         try:
+             postgissupport.shutdown_test_server()
+         except:
+             traceback.print_exc()
+         # Print additional information
          print_additional_summary()
+ def run_tests():
+     """Frontend for unittest.main that prints some additional debug information
+     After calling unittest.main, run the garbage collector and print
+     uncollected objects. Also print any un-unsubscribed messages.
+     """
+     execute_as_testsuite(ThubanTestProgram)
  def print_additional_summary():
      """Print some additional summary information after tests have been run"""
      print_garbage_information()
-Line 150 
 def print_garbage_information():
+Line 191 
 def print_garbage_information():
      Run the garbage collector and print uncollected objects. Also print
      any un-unsubscribed messages.
      """
+     # this function may be called indirectly from test cases that test
+     # test support modules which do not use anything from thuban itself,
+     # so we call initthuban so that we can import the connector module
+     initthuban()
      import gc, Thuban.Lib.connector
      gc.collect()
      if gc.garbage:
-Line 248 
 class FloatComparisonMixin:
+Line 293 
 class FloatComparisonMixin:
      fp_epsilon = 1e-6
      fp_inf = float('1e1000')   # FIXME: hack for infinite
      def assertFloatEqual(self, test, value, epsilon = None):
          """Assert equality of test and value with some tolerance.
-Line 270 
 class FloatComparisonMixin:
+Line 315 
 class FloatComparisonMixin:
          value in test and value is less than the optional parameter
          epsilon. If epsilon is not given use self.fp_epsilon.
          """
+         self.assertEquals(len(test), len(value))
          for i in range(len(test)):
              self.assertFloatEqual(test[i], value[i], epsilon)
+     def assertPointListEquals(self, test, value):
+         """Assert equality of two lists of lists of tuples of float
+         This assertion is usually used to compare the geometry of shapes
+         as returned by a Shape object's Points() method, hence the name.
+         """
+         for i in range(len(test)):
+             self.assertEquals(len(test[i]), len(value[i]))
+             for j in range(len(test[i])):
+                 self.assertFloatSeqEqual(test[i][j], value[i][j])
  class SubscriberMixin:
      """Mixin class for tests for messages sent through the Connector

 Legend:



Removed from v.1555
 


changed lines


 
Added in v.1839
 Legend:



Removed from v.1555
 


changed lines


 
Added in v.1839
-Removed from v.1555
+Added in v.1839

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26