--- a/tests/telnumber.py	Tue Feb 28 01:18:52 2012 +0100
+++ b/tests/telnumber.py	Tue Feb 28 01:19:15 2012 +0100
@@ -11,7 +11,7 @@
         '''test the telefon validator'''
         ret = vTel(["0123/456(78)","+4912346785433","00123435456-658"], None)
         x=[Telnumber('+4912345678'),Telnumber('012346785433'),Telnumber('+123435456658')]
-        self.failUnlessEqual(ret,x)
+        self.assertEqual(ret,x)
 
     def testInvalidTelnumbers(self):
         '''invalid telnumbers'''
@@ -21,49 +21,60 @@
         for number in numbers:
             with self.assertRaises(InvalidTel) as e:
                 vTel([number], None)
-            self.failUnlessEqual(e.exception.number,number)
+            self.assertEqual(e.exception.number,number)
 
         with self.assertRaises(InvalidTel) as e:
             vTel(['01234']+numbers, None)
-        self.failUnlessEqual(e.exception.number,numbers[0])
+        self.assertEqual(e.exception.number,numbers[0])
 
     def testDoubles(self):
         ret = vTel(["0123/456(78)","+4912345678","004912345678"], None)
         x=[Telnumber('+4912345678')]
-        self.failUnlessEqual(ret,x)
-
+        self.assertEqual(ret,x)
 
     def equalNumber(self, tel1, tel2):
-        self.failUnlessEqual(tel1.number, tel2.number)
-        self.failUnlessEqual(tel1.land, tel2.land)
+        self.assertEqual(tel1.number, tel2.number)
+        self.assertEqual(tel1.land, tel2.land)
         
     def testWrongNumber(self):
         telnum=Telnumber()
         self.assertRaises(InvalidTel, telnum.createNumber,  "hallo")
         self.assertRaises(InvalidTel, telnum.createNumber,  "0?242")
-        
    
     def testNumber(self):
-        telnum=Telnumber("0551-28293640")
-        telnum2=Telnumber("+49551/28293640")
-        telnum3=Telnumber("00495512829364-0")
-        telnum4=Telnumber("+49(0)551-28293640")
+        telnum=Telnumber("0345-94103640")
+        telnum2=Telnumber("+49345/94103640")
+        telnum3=Telnumber("00493459410364-0")
+        telnum4=Telnumber("+49(0)345-94103640")
         
-        self.failUnlessEqual(telnum.land, "49")
-        self.failUnlessEqual(telnum.number, "55128293640")
+        self.assertEqual(telnum.land, "49")
+        self.assertEqual(telnum.number, "34594103640")
         
         self.equalNumber(telnum, telnum2)
         self.equalNumber(telnum, telnum3)
         self.equalNumber(telnum, telnum4)
 
     def testEqual(self):
-        telnum=Telnumber("0551-28293640")
-        telnum2=Telnumber("+49551/28293640")
+        telnum=Telnumber("0345-94103640")
+        telnum2=Telnumber("+49345/94103640")
         li=[]
-        self.failUnlessEqual(telnum == telnum2, True)
-        self.failUnlessEqual(telnum <> telnum2, False)
-        self.failUnlessEqual(telnum,  telnum2)
-        self.failUnlessEqual(telnum in li,False)
+        self.assertEqual(telnum == telnum2, True)
+        self.assertEqual(telnum <> telnum2, False)
+        self.assertEqual(telnum,  telnum2)
+        self.assertEqual(telnum in li,False)
         li.append(telnum)
-        self.failUnlessEqual(telnum in li,True)
-        self.failUnlessEqual(telnum2 in li,True)
+        self.assertEqual(telnum in li,True)
+        self.assertEqual(telnum2 in li,True)
+
+    def testHash(self):
+        telnum=Telnumber("0345-94103640")
+        self.assertEqual(hash(telnum),hash("004934594103640"))
+        self.assertNotEqual(hash(telnum),hash("004934594103641"))
+
+    def testString(self):
+        telnum=Telnumber("0345-94103640")
+        self.assertEqual(str(telnum),"004934594103640")
+
+    def testRepr(self):
+        telnum=Telnumber("0345-94103640") 
+        self.assertEqual(repr(telnum),"<Telnumber 004934594103640>")