adding tests, no escaping for android yet

openformats/formats/android.py

@@ -19,6 +19,8 @@ class AndroidHandler(Handler):
         'translatable': 'false'
     }
 
+    EXTRACTS_RAW = False
+
     def parse(self, content):
         stringset = []
         if type(content) == str:
@@ -345,17 +347,3 @@ def _compile_plurals(self, plurals_tag, plurals_offset):
             # didn't find it, must remove by skipping it
             self.transcriber.skip_until(plurals_offset +
                                         len(plurals_tag.content))
-
-    @staticmethod
-    def escape(string):
-        escaped_string = string.replace('"', r'\"'). \
-                                replace("'", r"\'")
-
-        return escaped_string
-
-    @staticmethod
-    def unescape(string):
-        unescaped_string = string.replace(r'\"', '"'). \
-                                replace(r"\'", "'")
-
-        return unescaped_string

openformats/formats/json.py

@@ -251,18 +251,12 @@ def _get_next_string(self):
 
     @staticmethod
     def escape(string):
-        escaped_string = string.replace('\\', r'\\'). \
-                                replace('.', r'\.'). \
-                                replace('"', '\\"'). \
-                                replace('/', '\/"')
+        escaped_string = string.replace('\\', r'\\').replace('"', '\\"')
 
         return escaped_string
 
     @staticmethod
     def unescape(string):
-        unescaped_string = string.replace(r'\\', '\\'). \
-                                replace(r'\.', '.'). \
-                                replace(r'\"', '"'). \
-                                replace(r'\/', '/"')
+        unescaped_string = string.replace(r'\\', '\\').replace(r'\"', '"')
 
         return unescaped_string

openformats/tests/formats/json/test_json.py

@@ -268,6 +268,15 @@ def test_skip_middle_of_list(self):
     def test_invalid_json(self):
         self._test_parse_error('jaosjf', "No JSON object could be decoded")
 
+    def test_invalid_json_type(self):
+        template, stringset = self.handler.parse('[false]')
+        self.assertEqual(stringset, [])
+        self.assertEqual(template, '[false]')
+
+        template, stringset = self.handler.parse('{"false": false}')
+        self.assertEqual(stringset, [])
+        self.assertEqual(template, '{"false": false}')
+
     def test_not_json_container(self):
         self._test_parse_error('"hello"', "Input is not a JSON container")
         self._test_parse_error('3', "Input is not a JSON container")
@@ -287,3 +296,15 @@ def test_display_json_errors(self):
         self._test_parse_error('["]',
                                "Unterminated string starting at: line 1 "
                                "column 2 (char 1)")
+
+    def test_escape_json(self):
+        self.assertEqual(
+            self.handler.escape("a \\ string. with \"quotes\""),
+            "a \\\\ string. with \\\"quotes\\\""
+        )
+
+    def test_unescape_json(self):
+        self.assertEqual(
+            self.handler.unescape("a \\\\ string. with \\\"quotes\\\""),
+            "a \\ string. with \"quotes\""
+        )