From 0576e5a9b93f28bd4d2adc224598de319e14f1be Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Sun, 3 Sep 2023 09:34:28 +0200
Subject: refactor: make test_and_annotate test encoding-independence

---
 tests/test_spans.rs | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/test_spans.rs b/tests/test_spans.rs
index ca23141..08b5a31 100644
--- a/tests/test_spans.rs
+++ b/tests/test_spans.rs
@@ -24,7 +24,7 @@ fn test_and_annotate<S: AsRef<str> + Clone>(
 ) -> String {
     let labels = labeler(Box::new(tokenizer(html)));
 
-    // TODO: assert character encoding independence here once all tests support it
+    assert_char_encoding_independence(html, labeler);
 
     annotate(html, labels)
 }
@@ -66,7 +66,6 @@ fn start_tag_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     <x> <xyz> <xyz  > <xyz/>
     ^^^ ^^^^^ ^^^^^^^ ^^^^^^
@@ -85,7 +84,6 @@ fn end_tag_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     </x> </xyz> </xyz  > </xyz/>
     ^^^^ ^^^^^^ ^^^^^^^^ ^^^^^^^
@@ -104,7 +102,6 @@ fn start_tag_name_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     <x> <xyz> <xyz  > <xyz/>
      ^   ^^^   ^^^     ^^^
@@ -123,7 +120,6 @@ fn end_tag_name_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     </x> </xyz> </xyz  > </xyz/>
       ^    ^^^    ^^^      ^^^
@@ -143,7 +139,6 @@ fn attribute_name_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     <test x xyz y=VAL xy=VAL z = VAL yzx = VAL>
           ^ ^^^ ^     ^^     ^       ^^^
@@ -163,7 +158,6 @@ fn attribute_value_span() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     <test x=unquoted y = unquoted z='single-quoted' zz="double-quoted" empty=''>
             ^^^^^^^^     ^^^^^^^^    ^^^^^^^^^^^^^      ^^^^^^^^^^^^^         ^
@@ -183,7 +177,6 @@ fn attribute_value_with_char_ref() {
         }
         labels
     };
-    assert_char_encoding_independence(html, labeler);
     assert_snapshot!(test_and_annotate(html, labeler), @r###"
     <test x=&amp; y='&amp;' z="&amp;">
             ^^^^^    ^^^^^     ^^^^^
@@ -224,7 +217,6 @@ fn comment_data_span() {
             vec![(comment.data_span(), "")]
         };
 
-        assert_char_encoding_independence(case, labeler);
         annotated.push_str(&test_and_annotate(case, labeler));
     }
 
@@ -288,7 +280,6 @@ fn doctype_span() {
             };
             vec![(doctype.span, "")]
         };
-        assert_char_encoding_independence(case, labeler);
         annotated.push_str(&test_and_annotate(case, labeler));
     }
 
@@ -326,7 +317,6 @@ fn doctype_id_spans() {
             labels
         };
 
-        assert_char_encoding_independence(case, labeler);
         annotated.push_str(&test_and_annotate(case, labeler));
     }
 
@@ -365,9 +355,6 @@ fn annotate_errors(html: &'static str) -> String {
         labels
     };
 
-    // TODO: Move this assertion into test_and_annotate once all tests support it.
-    assert_char_encoding_independence(html, labeler);
-
     test_and_annotate(html, labeler)
 }
 
-- 
cgit v1.2.3