Additional random unit tests; fix a random unit test

Patch as per Lorenz on the mailing list.

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/Crypto/SelfTest/Random/test_random.py b/lib/Crypto/SelfTest/Random/test_random.py
index 3ae2142..d25756f 100644
--- a/lib/Crypto/SelfTest/Random/test_random.py
+++ b/lib/Crypto/SelfTest/Random/test_random.py
@@ -69,10 +69,13 @@ class SimpleTest(unittest.TestCase):
             x = random.randrange(start,stop,step)
             y = random.randrange(start,stop,step)
             self.assertNotEqual(x, y)
-            self.assertEqual(start <= x <= stop, True)
-            self.assertEqual(start <= y <= stop, True)
+            self.assertEqual(start <= x < stop, True)
+            self.assertEqual(start <= y < stop, True)
+            self.assertEqual((x - start) % step, 0)
+            self.assertEqual((y - start) % step, 0)
         for i in range(10):
             self.assertEqual(random.randrange(1,2), 1)
+        self.assertRaises(ValueError, random.randrange, start, start)
         self.assertRaises(ValueError, random.randrange, stop, start, step)
         self.assertRaises(TypeError, random.randrange, start, stop, step, step)
         self.assertRaises(TypeError, random.randrange, start, stop, "1")
@@ -115,9 +118,13 @@ class SimpleTest(unittest.TestCase):
         random.shuffle(x)
         random.shuffle(y)
         self.assertNotEqual(x, y)
+        self.assertEqual(len(seq), len(x))
+        self.assertEqual(len(seq), len(y))
         for i in range(len(seq)):
            self.assertEqual(x[i] in seq, True)
            self.assertEqual(y[i] in seq, True)
+           self.assertEqual(seq[i] in x, True)
+           self.assertEqual(seq[i] in y, True)
         z = [1]
         random.shuffle(z)
         self.assertEqual(z, [1])