more fixes

Author: XChaitanyaX

Lib/test/string_tests.py

@@ -142,9 +142,7 @@ def test_count(self):
         # For a variety of combinations,
         #    verify that str.count() matches an equivalent function
         #    replacing all occurrences and then differencing the string lengths
-        charset = ['', 'a', 'b']
-        digits = 7
-        teststrings = self._get_teststrings(charset, digits)
+        teststrings = self._get_teststrings(['', 'a', 'b'], 7)
         for i in teststrings:
             n = len(i)
             for j in teststrings:
@@ -201,9 +199,7 @@ def test_find(self):
         # For a variety of combinations,
         #    verify that str.find() matches __contains__
         #    and that the found substring is really at that location
-        charset = ['', 'a', 'b', 'c']
-        digits = 5
-        teststrings = self._get_teststrings(charset, digits)
+        teststrings = self._get_teststrings(['', 'a', 'b', 'c'], 5)
         for i in teststrings:
             for j in teststrings:
                 loc = i.find(j)
@@ -240,9 +236,7 @@ def test_rfind(self):
         # For a variety of combinations,
         #    verify that str.rfind() matches __contains__
         #    and that the found substring is really at that location
-        charset = ['', 'a', 'b', 'c']
-        digits = 5
-        teststrings = self._get_teststrings(charset, digits)
+        teststrings = self._get_teststrings(['', 'a', 'b', 'c'], 5)
         for i in teststrings:
             for j in teststrings:
                 loc = i.rfind(j)
@@ -286,21 +280,15 @@ def test_index(self):
         # For a variety of combinations,
         #    verify that str.index() matches __contains__
         #    and that the found substring is really at that location
-        charset = ['', 'a', 'b', 'c']
-        digits = 5
-        teststrings = self._get_teststrings(charset, digits)
+        teststrings = self._get_teststrings(['', 'a', 'b', 'c'], 5)
         for i in teststrings:
             for j in teststrings:
                 if j in i:
                     loc = i.index(j)
+                    self.assertGreaterEqual(loc, 0)
+                    self.assertEqual(i[loc:loc+len(j)], j)
                 else:
                     self.assertRaises(ValueError, i.index, j)
-                    loc = -1
-                r1 = (loc != -1)
-                r2 = j in i
-                self.assertEqual(r1, r2)
-                if loc != -1:
-                    self.assertEqual(i[loc:loc+len(j)], j)
 
     def test_rindex(self):
         self.checkequal(12, 'abcdefghiabc', 'rindex', '')
@@ -331,21 +319,15 @@ def test_rindex(self):
         # For a variety of combinations,
         #    verify that str.rindex() matches __contains__
         #    and that the found substring is really at that location
-        charset = ['', 'a', 'b', 'c']
-        digits = 5
-        teststrings = self._get_teststrings(charset, digits)
+        teststrings = self._get_teststrings(['', 'a', 'b', 'c'], 5)
         for i in teststrings:
             for j in teststrings:
                 if j in i:
                     loc = i.rindex(j)
+                    self.assertGreaterEqual(loc, 0)
+                    self.assertEqual(i[loc:loc+len(j)], j)
                 else:
                     self.assertRaises(ValueError, i.rindex, j)
-                    loc = -1
-                r1 = (loc != -1)
-                r2 = j in i
-                self.assertEqual(r1, r2)
-                if loc != -1:
-                    self.assertEqual(i[loc:loc+len(j)], j)
 
     def test_find_periodic_pattern(self):
         """Cover the special path for periodic patterns."""