--- a/tests/validate.py	Mon Feb 27 22:21:22 2012 +0100
+++ b/tests/validate.py	Mon Feb 27 22:26:10 2012 +0100
@@ -1,4 +1,4 @@
-import unittest
+from twisted.trial import unittest
 
 from iro.validate import vBool, vInteger, vHash
 from iro.error import ValidateException
@@ -19,42 +19,32 @@
         self.assertEqual(vBool("False",None),False)
         self.assertEqual(vBool("FALSE",None),False)
 
-        with self.assertRaises(ValidateException) as e:
-            vBool("TRue","test")
-        self.assertEqual(e.exception.msg,"test is not boolean")
+        e = self.assertRaises(ValidateException, vBool, "TRue","test")
+        self.assertEqual(e.msg,"test is not boolean")
 
     def testInteger(self):
         self.assertEqual(vInteger(123,None),123)
         self.assertEqual(vInteger("123",None),123)
         self.assertEqual(vInteger("-123",None),-123)
 
-        with self.assertRaises(ValidateException):
-            vInteger("a123",None)
+        self.assertRaises(ValidateException, vInteger, "a123",None)
 
     def testIntegerLimits(self):
         self.assertEqual(vInteger(10,None,maxv=10),10)
-        with self.assertRaises(ValidateException):
-            vInteger(11,None,maxv=10)
+        self.assertRaises(ValidateException, vInteger, 11, None, maxv=10)
 
         self.assertEqual(vInteger(4,None,minv=4),4)
-        with self.assertRaises(ValidateException):
-            vInteger(3,None,minv=4)
+        self.assertRaises(ValidateException, vInteger, 3, None, minv=4)
 
-        with self.assertRaises(ValidateException):
-            vInteger(-1,None, minv=0)
-
-        with self.assertRaises(ValidateException):
-            vInteger(1,None, maxv=0)
+        self.assertRaises(ValidateException, vInteger, -1, None, minv=0)
+        self.assertRaises(ValidateException, vInteger, 1, None, maxv=0)
 
     def testIntegerNoneAllowed(self):
         self.assertEqual(vInteger(None,None,none_allowed=True),None)
         self.assertEqual(vInteger('',None,none_allowed=True),None)
 
-        with self.assertRaises(ValidateException):
-            vInteger("",None)
-
-        with self.assertRaises(ValidateException):
-            vInteger(None,None)
+        self.assertRaises(ValidateException, vInteger, "", None)
+        self.assertRaises(ValidateException, vInteger, None, None)
 
     def testHash(self):
         self.assertEqual(vHash("0123456789abcdef",None),"0123456789abcdef")
@@ -62,14 +52,11 @@
         self.assertEqual(vHash("F",None),"f")
         self.assertEqual(vHash("",None),'')
 
-        with self.assertRaises(ValidateException):
-            vHash("GHIJKL",None)
+        self.assertRaises(ValidateException, vHash, "GHIJKL", None)
         
     def testHashLimits(self):
         self.assertEqual(vHash("F",None,minlength=1),"f")
-        with self.assertRaises(ValidateException):
-            vHash("",None, minlength=1)
+        self.assertRaises(ValidateException, vHash, "", None, minlength=1)
 
         self.assertEqual(vHash("Fa",None,maxlength=2),"fa")
-        with self.assertRaises(ValidateException):
-            vHash("123",None, maxlength=1)
+        self.assertRaises(ValidateException, vHash, "123", None, maxlength=1)