Add more tests

3 files changed, 30 insertions, 9 deletions

diff --git a/tests/files/blank b/tests/files/blank
deleted file mode 100644
index e69de29..0000000
--- a/tests/files/blank
+++ /dev/null
diff --git a/tests/files/empty.zip b/tests/files/empty.zip
deleted file mode 100644
index 15cb0ec..0000000
--- a/tests/files/empty.zip
+++ /dev/null
diff --git a/tests/zip.rs b/tests/zip.rs
index e2b5c20..1422bb3 100644
--- a/tests/zip.rs
+++ b/tests/zip.rs
@@ -1,6 +1,6 @@
 use archivator::zip::ZipError;
 use archivator::{Archive, Zip};
-use std::io::{Read, Seek, SeekFrom};
+use std::io::{Cursor, Read, Seek, SeekFrom};
 
 #[test]
 fn test_zip_aes() {
@@ -90,14 +90,11 @@ fn test_zip_weak() {
     }
 }
 
+const EMPTY: Cursor<&[u8]> = Cursor::new(b"PK\x05\x06\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+
 #[test]
 fn test_zip() {
-    assert_eq!(
-        Archive::<Zip>::read_from_file("tests/files/empty.zip")
-            .unwrap()
-            .len(),
-        0
-    );
+    assert_eq!(Archive::<Zip<_>>::read(EMPTY).unwrap().len(), 0);
 
     let mut archive = Archive::<Zip>::read_from_file("tests/files/archive.zip").unwrap();
 
@@ -161,8 +158,32 @@ fn test_zip() {
     }
 }
 
+const NOT_FOUND: Cursor<&[u8]> = Cursor::new(b"");
+const INVALID: Cursor<&[u8]> = Cursor::new(
+    b"PK\x06\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0PK\x05\x06\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0",
+);
+const OVERLAP: Cursor<&[u8]> = Cursor::new(b"PK\x05\x06\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0");
+const OVERLAP64: Cursor<&[u8]> = Cursor::new(b"PK\x06\x06\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0PK\x06\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0PK\x05\x06\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0");
+
 #[test]
 fn test_bad_zip() {
-    assert!(Archive::<Zip>::read_from_file("tests/files/blank")
-        .is_err_and(|e| e == ZipError::StructNotFound("Eocdr")));
+    assert!(
+        Archive::<Zip<_>>::read(NOT_FOUND).is_err_and(|e| e == ZipError::StructNotFound("Eocdr"))
+    );
+
+    assert!(
+        Archive::<Zip<_>>::read(INVALID).is_err_and(|e| e == ZipError::InvalidSignature("Eocdr64"))
+    );
+
+    assert!(Archive::<Zip<_>>::read(OVERLAP).is_err_and(|e| e
+        == ZipError::Overlapping(
+            "Central directory records",
+            "End of central directory record"
+        )));
+
+    assert!(Archive::<Zip<_>>::read(OVERLAP64).is_err_and(|e| e
+        == ZipError::Overlapping(
+            "Central directory records",
+            "Zip64 end of central directory record"
+        )));
 }