[Jython-checkins] SF.net SVN: jython:[6654] trunk/jython/Lib/test

[<fwi...@us...>]

Revision: 6654
          http://jython.svn.sourceforge.net/jython/?rev=6654&view=rev
Author:   fwierzbicki
Date:     2009-08-10 18:30:18 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Merge test_bugfixes into test_exceptions, since test_bugfixes is a poor name
and it was testing exception behaviors.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_exceptions_jy.py

Removed Paths:
-------------
    trunk/jython/Lib/test/test_bugfixes.py

Deleted: trunk/jython/Lib/test/test_bugfixes.py
===================================================================
--- trunk/jython/Lib/test/test_bugfixes.py	2009-08-10 18:15:24 UTC (rev 6653)
+++ trunk/jython/Lib/test/test_bugfixes.py	2009-08-10 18:30:18 UTC (rev 6654)
@@ -1,31 +0,0 @@
-
-import unittest
-from test_support import run_suite
-
-class C:
-  def __str__(self):
-    raise Exception("E")
-  def __repr__(self):
-    raise Exception("S")
-
-class ExceptionHandling(unittest.TestCase):
-  def testBugFix1149372(self):
-    try:
-      c = C()
-      str(c)
-    except Exception, e:
-      assert e.args[0] == "E"
-      return
-    unittest.fail("if __str__ raises an exception, re-raise")
-
-def test_main():
-  test_suite = unittest.TestSuite()
-  test_loader = unittest.TestLoader()
-  def suite_add(case):
-    test_suite.addTest(test_loader.loadTestsFromTestCase(case))
-  suite_add(ExceptionHandling)
-  run_suite(test_suite)
-
-if __name__ == "__main__":
-  test_main()
-

Modified: trunk/jython/Lib/test/test_exceptions_jy.py
===================================================================
--- trunk/jython/Lib/test/test_exceptions_jy.py	2009-08-10 18:15:24 UTC (rev 6653)
+++ trunk/jython/Lib/test/test_exceptions_jy.py	2009-08-10 18:30:18 UTC (rev 6654)
@@ -5,6 +5,12 @@
 from test import test_support
 import unittest
 
+class C:
+    def __str__(self):
+        raise Exception("E")
+    def __repr__(self):
+        raise Exception("S")
+
 class ExceptionsTestCase(unittest.TestCase):
 
     def test_keyerror_str(self):
@@ -26,6 +32,16 @@
 
         self.assertEquals(r, "dummy")
 
+    def testBugFix1149372(self):
+        try:
+            c = C()
+            str(c)
+        except Exception, e:
+            assert e.args[0] == "E"
+            return
+        unittest.fail("if __str__ raises an exception, re-raise")
+
+
 def test_main():
     test_support.run_unittest(ExceptionsTestCase)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.