From e8081a84a2e398805e0c281a42372933845ffbd5 Mon Sep 17 00:00:00 2001
From: stroeder <stroeder>
Date: Sat, 18 Feb 2017 15:32:56 +0000
Subject: [PATCH] some more re-factoring

---
 Tests/t_ldap_schema_tokenizer.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/Tests/t_ldap_schema_tokenizer.py b/Tests/t_ldap_schema_tokenizer.py
index c0fe950..79a12e9 100644
--- a/Tests/t_ldap_schema_tokenizer.py
+++ b/Tests/t_ldap_schema_tokenizer.py
@@ -6,7 +6,7 @@
 
 import ldap.schema
 
-# all basic test cases
+# basic test cases
 TESTCASES_BASIC = (
     (" BLUBBER DI BLUBB ", ["BLUBBER", "DI", "BLUBB"]),
     ("BLUBBER DI BLUBB", ["BLUBBER", "DI", "BLUBB"]),
@@ -25,12 +25,18 @@
     ("BLUBB DI 'BLU B B ER' DA 'BLAH' ", ['BLUBB', 'DI', 'BLU B B ER', 'DA', 'BLAH']),
     ("BLUBB DI 'BLU B B ER' DA 'BLAH' LABER", ['BLUBB', 'DI', 'BLU B B ER', 'DA', 'BLAH', 'LABER']),
 )
-# for broken schema of Oracle Internet Directory
-TESTCASES_OID = (
+
+# broken schema of Oracle Internet Directory
+TESTCASES_BROKEN_OID = (
     ("BLUBBER DI 'BLU'BB ER' DA 'BLAH' ", ["BLUBBER", "DI", "BLU'BB ER", "DA", "BLAH"]),
     ("BLUBB DI 'BLU B B ER'MUST 'BLAH' ", ['BLUBB', 'DI', 'BLU B B ER', 'MUST', 'BLAH'])
 )
 
+# for quoted single quotes inside string values
+TESTCASES_ESCAPED_QUOTES = (
+    ("BLUBBER DI 'BLU\'BB ER' DA 'BLAH' ", ["BLUBBER", "DI", "BLU'BB ER", "DA", "BLAH"]),
+)
+
 
 class TestSplitTokens(unittest.TestCase):
     """
@@ -39,7 +45,7 @@ class TestSplitTokens(unittest.TestCase):
 
     def _run_split_tokens_tests(self, test_cases):
         for test_value, test_result in test_cases:
-            token_list = ldap.schema.split_tokens(test_value, None)
+            token_list = ldap.schema.split_tokens(test_value)
             self.assertEqual(token_list, test_result)
 
     def test_basic(self):
@@ -49,11 +55,18 @@ def test_basic(self):
         self._run_split_tokens_tests(TESTCASES_BASIC)
 
     @unittest.expectedFailure
-    def test_oid(self):
+    def test_broken_oid(self):
+        """
+        run test cases specified in constant TESTCASES_BROKEN_OID
+        """
+        self._run_split_tokens_tests(TESTCASES_BROKEN_OID)
+
+    @unittest.expectedFailure
+    def test_escaped_quotes(self):
         """
-        run test cases specified in constant TESTCASES_OID
+        run test cases specified in constant TESTCASES_ESCAPED_QUOTES
         """
-        self._run_split_tokens_tests(TESTCASES_OID)
+        self._run_split_tokens_tests(TESTCASES_ESCAPED_QUOTES)
 
 
 if __name__ == '__main__':