Fix the rest of the SnapshotValueReader tests.

Author: nedtwigg

python/selfie-lib/tests/SnapshotValueReader_test.py

@@ -27,8 +27,10 @@ def test_no_escaping_needed(self):
 """
         )
         assert reader.peek_key() == "00_empty"
+        assert reader.peek_key() == "00_empty"
         assert reader.next_value().value_string() == ""
         assert reader.peek_key() == "01_singleLineString"
+        assert reader.peek_key() == "01_singleLineString"
         assert reader.next_value().value_string() == "this is one line"
         assert reader.peek_key() == "01a_singleLineLeadingSpace"
         assert reader.next_value().value_string() == " the leading space is significant"
@@ -73,27 +75,25 @@ def test_invalid_names(self):
 
     def test_escape_characters_in_name(self):
         reader = SnapshotValueReader.of(
-            """
-            ╔═ test with \\(square brackets\\) in name ═╗
-            ╔═ test with \\\\backslash\\\\ in name ═╗
-            ╔═ test with\\nnewline\\nin name ═╗
-            ╔═ test with \\ttab\\t in name ═╗
-            ╔═ test with \\┌\\─ ascii art \\─\\┐ in name ═╗
-        """.strip()
+            """╔═ test with \\(square brackets\\) in name ═╗
+╔═ test with \\\\backslash\\\\ in name ═╗
+╔═ test with\\nnewline\\nin name ═╗
+╔═ test with \\ttab\\t in name ═╗
+╔═ test with \\┌\\─ ascii art \\─\\┐ in name ═╗"""
         )
-        assert reader.peek_key() == "test with (square brackets) in name"
+        assert reader.peek_key() == "test with [square brackets] in name"
         assert reader.next_value().value_string() == ""
         assert reader.peek_key() == "test with \\backslash\\ in name"
         assert reader.next_value().value_string() == ""
-        assert reader.peek_key().strip() == "test with\nnewline\nin name"
+        assert reader.peek_key() == "test with\nnewline\nin name"
         assert reader.next_value().value_string() == ""
         assert reader.peek_key() == "test with \ttab\t in name"
         assert reader.next_value().value_string() == ""
         assert reader.peek_key() == "test with ╔═ ascii art ═╗ in name"
         assert reader.next_value().value_string() == ""
 
-    def assert_key_value_with_skip(self, key, expected_value):
-        reader = SnapshotValueReader.of(self)
+    def assert_key_value_with_skip(self, test_content, key, expected_value):
+        reader = SnapshotValueReader.of(test_content)
         while reader.peek_key() != key:
             reader.skip_value()
         assert reader.peek_key() == key
@@ -102,15 +102,13 @@ def assert_key_value_with_skip(self, key, expected_value):
             reader.skip_value()
 
     def test_skip_values(self):
-        test_content = """
-            ╔═ 00_empty ═╗
-            ╔═ 01_singleLineString ═╗
-            this is one line
-            ╔═ 02_multiLineStringTrimmed ═╗
-            Line 1
-            Line 2
-            ╔═ 05_notSureHowKotlinMultilineWorks ═╗
-        """.strip()
+        test_content = """╔═ 00_empty ═╗
+╔═ 01_singleLineString ═╗
+this is one line
+╔═ 02_multiLineStringTrimmed ═╗
+Line 1
+Line 2
+╔═ 05_notSureHowKotlinMultilineWorks ═╗"""
         self.assert_key_value_with_skip(test_content, "00_empty", "")
         self.assert_key_value_with_skip(
             test_content, "01_singleLineString", "this is one line"
@@ -119,11 +117,10 @@ def test_skip_values(self):
             test_content, "02_multiLineStringTrimmed", "Line 1\nLine 2"
         )
 
-    def test_binary():
-        reader = SnapshotValueReader(
+    def test_binary(self):
+        reader = SnapshotValueReader.of(
             """╔═ Apple ═╗ base64 length 3 bytes
-    c2Fk
-    """
+c2Fk"""
         )
         assert reader.peek_key() == "Apple"
-        assert reader.next_value() == b"sad"
+        assert reader.next_value().value_binary() == b"sad"