Merge pull request #259 from ajtribick/windows-tests

Fix Windows test cases

Author: tafia

tests/documents/html5-windows.txt

@@ -0,0 +1,8 @@
+DocType( html)
+Characters(
+)
+StartElement(a, attr-error: error while parsing attribute at position 7: Attribute value must start with a quote.)
+Characters(Hey)
+EndElement(a)
+InvalidUtf8([13, 10, 38, 110, 98, 115, 112, 59, 13, 10]; invalid utf-8 sequence of 1 bytes from index 2)
+EndDocument

tests/unit_tests.rs

@@ -255,6 +255,11 @@ fn test_writer_indent() {
 
     let result = writer.into_inner().into_inner();
     // println!("{:?}", String::from_utf8_lossy(&result));
+
+    #[cfg(windows)]
+    assert!(result.into_iter().eq(txt.bytes().filter(|b| *b != 13)));
+
+    #[cfg(not(windows))]
     assert_eq!(result, txt.as_bytes());
 }
 
@@ -274,6 +279,11 @@ fn test_writer_indent_cdata() {
     }
 
     let result = writer.into_inner().into_inner();
+
+    #[cfg(windows)]
+    assert!(result.into_iter().eq(txt.bytes().filter(|b| *b != 13)));
+
+    #[cfg(not(windows))]
     assert_eq!(result, txt.as_bytes());
 }
 

tests/xmlrs_reader_tests.rs

@@ -40,7 +40,7 @@ fn sample_2_full() {
     );
 }
 
-#[cfg(feature = "escape-html")]
+#[cfg(all(not(windows), feature = "escape-html"))]
 #[test]
 fn html5() {
     test(
@@ -50,6 +50,17 @@ fn html5() {
     );
 }
 
+#[cfg(all(windows, feature = "escape-html"))]
+#[test]
+fn html5() {
+    test(
+        include_bytes!("documents/html5.html"),
+        include_bytes!("documents/html5-windows.txt"),
+        false,
+    );
+}
+
+
 // #[test]
 // fn sample_3_short() {
 //     test(
@@ -421,24 +432,23 @@ impl<'a> Iterator for SpecIter<'a> {
         let start = self
             .0
             .iter()
-            .position(|b| match *b {
-                b' ' | b'\r' | b'\n' | b'\t' | b'|' | b':' => false,
-                b'0'..=b'9' => false,
-                _ => true,
-            })
+            .position(|b| !matches!(*b, b' ' | b'\r' | b'\n' | b'\t' | b'|' | b':' | b'0'..=b'9'))
             .unwrap_or(0);
-        if let Some(p) = self.0.windows(2).position(|w| w == b")\n") {
+
+        if let Some(p) = self.0.windows(3).position(|w| w == b")\r\n") {
+            let (prev, next) = self.0.split_at(p + 1);
+            self.0 = &next[1..];
+            Some(from_utf8(&prev[start..]).expect("Error decoding to uft8"))
+        } else if let Some(p) = self.0.windows(2).position(|w| w == b")\n") {
             let (prev, next) = self.0.split_at(p + 1);
             self.0 = next;
             Some(from_utf8(&prev[start..]).expect("Error decoding to uft8"))
+        } else if self.0.is_empty() {
+            None
         } else {
-            if self.0.is_empty() {
-                None
-            } else {
-                let p = self.0;
-                self.0 = &[];
-                Some(from_utf8(&p[start..]).unwrap())
-            }
+            let p = self.0;
+            self.0 = &[];
+            Some(from_utf8(&p[start..]).unwrap())
         }
     }
 }