3 files changed, 22 insertions, 12 deletions

diff --git a/tests/files/archive.zip b/tests/files/archive.zip
new file mode 100644
index 0000000..f5c0137
--- /dev/null
+++ b/tests/files/archive.zip
diff --git a/tests/files/zip.zip b/tests/files/zip.zip
deleted file mode 100644
index f3a090b..0000000
--- a/tests/files/zip.zip
+++ /dev/null
diff --git a/tests/zip.rs b/tests/zip.rs
index e5872c5..eb195f2 100644
--- a/tests/zip.rs
+++ b/tests/zip.rs
@@ -3,7 +3,7 @@ use std::io::{Read, Seek, SeekFrom};
 
 #[test]
 fn test_zip() {
-    let mut archive = Archive::<Zip<_>>::read_from_file("tests/files/zip.zip").unwrap();
+    let mut archive = Archive::<Zip<_>>::read_from_file("tests/files/archive.zip").unwrap();
 
     assert_eq!(archive.comment(), "archive comment");
     assert_eq!(
@@ -12,36 +12,46 @@ fn test_zip() {
             .iter()
             .map(|f| &f.name)
             .collect::<Vec<&String>>(),
-        vec!["b", "c", "a"]
+        vec!["bzip", "deflate", "lzma", "store", "xz"]
     );
 
-    let mut f = archive.get_file_reader(2).unwrap();
+    let mut f = archive.get_file_reader("store").unwrap();
 
     let mut data = String::new();
     f.read_to_string(&mut data).unwrap();
-    assert_eq!(data, "file data \"a\"");
+    assert_eq!(data, "test file data");
 
     assert_eq!(f.seek(SeekFrom::Start(5)).unwrap(), 5);
     let mut data = String::new();
     f.read_to_string(&mut data).unwrap();
-    assert_eq!(data, "data \"a\"");
+    assert_eq!(data, "file data");
 
     assert_eq!(f.seek(SeekFrom::Start(0)).unwrap(), 0);
     let mut data = vec![0; 4];
     f.read(&mut data).unwrap();
-    assert_eq!(String::from_utf8(data).unwrap(), "file");
+    assert_eq!(String::from_utf8(data).unwrap(), "test");
 
     assert_eq!(f.seek(SeekFrom::Current(1)).unwrap(), 5);
     let mut data = vec![0; 4];
     f.read(&mut data).unwrap();
-    assert_eq!(String::from_utf8(data).unwrap(), "data");
+    assert_eq!(String::from_utf8(data).unwrap(), "file");
 
-    assert_eq!(f.seek(SeekFrom::End(-3)).unwrap(), 10);
-    let mut data = vec![0; 3];
+    assert_eq!(f.seek(SeekFrom::End(-4)).unwrap(), 10);
+    let mut data = vec![0; 4];
     f.read(&mut data).unwrap();
-    assert_eq!(String::from_utf8(data).unwrap(), "\"a\"");
+    assert_eq!(String::from_utf8(data).unwrap(), "data");
 
-    assert_eq!(f.seek(SeekFrom::Current(0)).unwrap(), 13);
+    f.seek(SeekFrom::Start(7)).unwrap();
+    assert_eq!(f.seek(SeekFrom::Current(0)).unwrap(), 7);
     f.seek(SeekFrom::End(-100)).unwrap_err();
-    assert_eq!(f.seek(SeekFrom::Current(0)).unwrap(), 13);
+    assert_eq!(f.seek(SeekFrom::Current(0)).unwrap(), 7);
+
+    assert_eq!(f.seek(SeekFrom::Start(100)).unwrap(), 14);
+
+    for name in ["store", "deflate", "bzip", "lzma", "xz"] {
+        let mut f = archive.get_file_reader(name).unwrap();
+        let mut data = String::new();
+        f.read_to_string(&mut data).unwrap();
+        assert_eq!(data, "test file data");
+    }
 }