[Jython-checkins] SF.net SVN: jython:[5446] trunk/jython/Lib/test/test_java_integration.py

[<cg...@us...>]

Revision: 5446
          http://jython.svn.sourceforge.net/jython/?rev=5446&view=rev
Author:   cgroves
Date:     2008-10-16 20:59:53 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Use assertRaises instead of
try: 
  code
except ExpectedException:
  pass
else:
  self.fail

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

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:36:11 UTC (rev 5445)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:59:53 UTC (rev 5446)
@@ -130,10 +130,7 @@
         self.assertRaises(TypeError, A)
         
     def test_no_public_constructors(self):
-        try:
-           Math() 
-        except TypeError, e:
-            self.assert_("no public constructors for" in str(e))
+        self.assertRaises(TypeError, Math)
 
 class PyObjectCmpTest(unittest.TestCase):
 
@@ -150,21 +147,12 @@
     def test_io_errors(self):
         "Check that IOException isn't mangled into an IOError"
         from java.io import UnsupportedEncodingException
-        try:
-            x = OutputStreamWriter(System.out, "garbage")
-        except UnsupportedEncodingException:
-            pass
-        else:
-            self.fail("Should have raised java.io.UnsupportedEncodingException")
+        self.assertRaises(UnsupportedEncodingException, OutputStreamWriter, 
+                System.out, "garbage")
     
     def test_fileio_error(self):
-        from java.io import FileInputStream, IOException
-        try:
-            stream = FileInputStream("garbage")
-        except IOException:
-            pass
-        else:
-            self.fail("Should raise java.io.IOException")
+        from java.io import FileInputStream, FileNotFoundException
+        self.assertRaises(FileNotFoundException, FileInputStream, "garbage")
 
 class VectorTest(unittest.TestCase):
 
@@ -329,11 +317,8 @@
 class ImportTest(unittest.TestCase):
     
     def test_bad_input_exception(self):
-        try:
-            __import__('')
-        except ValueError, e:
-            self.assert_("Empty module name" in str(e))
-        
+        self.assertRaises(ValueError, __import__, '')
+
 class ButtonTest(unittest.TestCase):
 
     def test_setLabel(self):
@@ -402,12 +387,7 @@
     def test_string_not_iterable(self):
         from java import lang
         x = lang.String('test')
-        try:
-            list(x)
-        except TypeError:
-            pass
-        else:
-            self.fail("Should have raised TypeError")
+        self.assertRaises(TypeError, list, x)
 
 def test_main():
     test_support.run_unittest(AbstractOnSyspathTest,


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