Update tests so they aren't packaged with crate

Cargo.toml

@@ -10,6 +10,6 @@ readme = "README.md"
 keywords = ["image", "size"]
 categories = ["multimedia", "multimedia::images"]
 license = "MIT"
-exclude = ["test/*"]
+exclude = ["tests/*"]
 
 [dependencies]

tests/bmp.rs

@@ -3,7 +3,7 @@ use imagesize::size;
 
 #[test]
 fn bmp_test() {
-    let dim = size("test/bmp/test.bmp").unwrap();
+    let dim = size("tests/images/bmp/test.bmp").unwrap();
     assert_eq!(dim.width, 512);
     assert_eq!(dim.height, 512);
 }

tests/fuzz.rs

@@ -8,7 +8,7 @@ use std::{
 
 #[test]
 fn fuzzer_crashes_fixed() {
-    let mut entries = read_dir("test/fuzz_crashes")
+    let mut entries = read_dir("tests/fuzz_crashes")
         .unwrap()
         .map(|res| res.map(|e| e.path()))
         .collect::<Result<Vec<_>, Error>>()

tests/gif.rs

@@ -3,7 +3,7 @@ use imagesize::size;
 
 #[test]
 fn gif_test() {
-    let dim = size("test/gif/test.gif").unwrap();
+    let dim = size("tests/images/gif/test.gif").unwrap();
     assert_eq!(dim.width, 100);
     assert_eq!(dim.height, 100);
 }

tests/heic.rs

@@ -3,14 +3,14 @@ use imagesize::size;
 
 #[test]
 fn heif_test() {
-    let dim = size("test/heic/test.heic").unwrap();
+    let dim = size("tests/images/heic/test.heic").unwrap();
     assert_eq!(dim.width, 1280);
     assert_eq!(dim.height, 720);
 }
 
 #[test]
 fn heif_multi_picks_largest() {
-    let dim = size("test/heic/IMG_0007.heic").unwrap();
+    let dim = size("tests/images/heic/IMG_0007.heic").unwrap();
     assert_eq!(dim.width, 2448);
     assert_eq!(dim.height, 3264);
 }

tests/ico.rs

@@ -3,22 +3,22 @@ use imagesize::size;
 
 #[test]
 fn ico_test() {
-    let dim = size("test/ico/test.ico").unwrap();
+    let dim = size("tests/images/ico/test.ico").unwrap();
     assert_eq!(dim.width, 16);
     assert_eq!(dim.height, 16);
 }
 
 #[test]
 fn max_size_test() {
-    let dim = size("test/ico/max_width.ico").unwrap();
+    let dim = size("tests/images/ico/max_width.ico").unwrap();
     assert_eq!(dim.width, 256);
     assert_eq!(dim.height, 255);
 }
 
 #[test]
 fn multiple_test() {
     // Contains 48x48, 32x32, and 16x16 versions of the same image
-    let dim = size("test/ico/multiple.ico").unwrap();
+    let dim = size("tests/images/ico/multiple.ico").unwrap();
     assert_eq!(dim.width, 48);
     assert_eq!(dim.height, 48);
 }

tests/jpeg.rs

@@ -3,49 +3,49 @@ use imagesize::size;
 
 #[test]
 fn jpeg_test() {
-    let dim = size("test/jpg/test.jpg").unwrap();
+    let dim = size("tests/images/jpg/test.jpg").unwrap();
     assert_eq!(dim.width, 690);
     assert_eq!(dim.height, 298);
 }
 
 #[test]
 fn jpeg_extra_info_test() {
-    let dim = size("test/jpg/extra.jpg").unwrap();
+    let dim = size("tests/images/jpg/extra.jpg").unwrap();
     assert_eq!(dim.width, 1500);
     assert_eq!(dim.height, 844);
 }
 
 #[test]
 fn issue_9_test() {
-    let dim = size("test/jpg/issue-9.jpg").unwrap();
+    let dim = size("tests/images/jpg/issue-9.jpg").unwrap();
     assert_eq!(dim.width, 1360);
     assert_eq!(dim.height, 1904);
 }
 
 #[test]
 fn jpg_unexpected_eof() {
-    let dim = size("test/jpg/unexpected_eof.jpg").unwrap();
+    let dim = size("tests/images/jpg/unexpected_eof.jpg").unwrap();
     assert_eq!(dim.width, 3047);
     assert_eq!(dim.height, 2008);
 }
 
 #[test]
 fn jpg_unexpected_eof_2() {
-    let dim = size("test/jpg/unexpected_eof_2.jpg").unwrap();
+    let dim = size("tests/images/jpg/unexpected_eof_2.jpg").unwrap();
     assert_eq!(dim.width, 4980);
     assert_eq!(dim.height, 3321);
 }
 
 #[test]
 fn jpg_unexpected_eof_3() {
-    let dim = size("test/jpg/unexpected_eof_3.jpg").unwrap();
+    let dim = size("tests/images/jpg/unexpected_eof_3.jpg").unwrap();
     assert_eq!(dim.width, 2995);
     assert_eq!(dim.height, 1998);
 }
 
 #[test]
 fn jpg_wrong_size() {
-    let dim = size("test/jpg/wrong_size.jpg").unwrap();
+    let dim = size("tests/images/jpg/wrong_size.jpg").unwrap();
     assert_eq!(dim.width, 1080);
     assert_eq!(dim.height, 1080);
 }

tests/jxl.rs

@@ -5,7 +5,7 @@ use imagesize::size;
 
 #[test]
 fn jxl_valid_small() {
-    let dim = size("test/jxl/valid_small.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_small.jxl").unwrap();
     assert_eq!(dim.width, 32);
     assert_eq!(dim.height, 32);
 }
@@ -14,28 +14,28 @@ fn jxl_valid_small() {
 
 #[test]
 fn jxl_valid_9w_9h() {
-    let dim = size("test/jxl/valid_9w_9h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_9w_9h.jxl").unwrap();
     assert_eq!(dim.width, 256);
     assert_eq!(dim.height, 256);
 }
 
 #[test]
 fn jxl_valid_9w_13h() {
-    let dim = size("test/jxl/valid_9w_13h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_9w_13h.jxl").unwrap();
     assert_eq!(dim.width, 1);
     assert_eq!(dim.height, 4096);
 }
 
 #[test]
 fn jxl_valid_9w_18h() {
-    let dim = size("test/jxl/valid_9w_18h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_9w_18h.jxl").unwrap();
     assert_eq!(dim.width, 1);
     assert_eq!(dim.height, 65536);
 }
 
 #[test]
 fn jxl_valid_9w_30h() {
-    let dim = size("test/jxl/valid_9w_30h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_9w_30h.jxl").unwrap();
     assert_eq!(dim.width, 1);
     assert_eq!(dim.height, 16777216);
 }
@@ -44,21 +44,21 @@ fn jxl_valid_9w_30h() {
 
 #[test]
 fn jxl_valid_13w_9h() {
-    let dim = size("test/jxl/valid_13w_9h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_13w_9h.jxl").unwrap();
     assert_eq!(dim.width, 4096);
     assert_eq!(dim.height, 1);
 }
 
 #[test]
 fn jxl_valid_18w_9h() {
-    let dim = size("test/jxl/valid_18w_9h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_18w_9h.jxl").unwrap();
     assert_eq!(dim.width, 65536);
     assert_eq!(dim.height, 1);
 }
 
 #[test]
 fn jxl_valid_30w_9h() {
-    let dim = size("test/jxl/valid_30w_9h.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_30w_9h.jxl").unwrap();
     assert_eq!(dim.width, 16777216);
     assert_eq!(dim.height, 1);
 }
@@ -67,49 +67,49 @@ fn jxl_valid_30w_9h() {
 
 #[test]
 fn jxl_valid_ratio1() {
-    let dim = size("test/jxl/valid_ratio1.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio1.jxl").unwrap();
     assert_eq!(dim.width, 100);
     assert_eq!(dim.height, 100);
 }
 
 #[test]
 fn jxl_valid_ratio2() {
-    let dim = size("test/jxl/valid_ratio2.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio2.jxl").unwrap();
     assert_eq!(dim.width, 120);
     assert_eq!(dim.height, 100);
 }
 
 #[test]
 fn jxl_valid_ratio3() {
-    let dim = size("test/jxl/valid_ratio3.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio3.jxl").unwrap();
     assert_eq!(dim.width, 400);
     assert_eq!(dim.height, 300);
 }
 
 #[test]
 fn jxl_valid_ratio4() {
-    let dim = size("test/jxl/valid_ratio4.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio4.jxl").unwrap();
     assert_eq!(dim.width, 300);
     assert_eq!(dim.height, 200);
 }
 
 #[test]
 fn jxl_valid_ratio5() {
-    let dim = size("test/jxl/valid_ratio5.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio5.jxl").unwrap();
     assert_eq!(dim.width, 160);
     assert_eq!(dim.height, 90);
 }
 
 #[test]
 fn jxl_valid_ratio6() {
-    let dim = size("test/jxl/valid_ratio6.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio6.jxl").unwrap();
     assert_eq!(dim.width, 500);
     assert_eq!(dim.height, 400);
 }
 
 #[test]
 fn jxl_valid_ratio7() {
-    let dim = size("test/jxl/valid_ratio7.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_ratio7.jxl").unwrap();
     assert_eq!(dim.width, 200);
     assert_eq!(dim.height, 100);
 }
@@ -118,14 +118,14 @@ fn jxl_valid_ratio7() {
 
 #[test]
 fn jxl_valid_box_jxlc() {
-    let dim = size("test/jxl/valid_box_jxlc.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_box_jxlc.jxl").unwrap();
     assert_eq!(dim.width, 256);
     assert_eq!(dim.height, 256);
 }
 
 #[test]
 fn jxl_valid_box_jxlp() {
-    let dim = size("test/jxl/valid_box_jxlp.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_box_jxlp.jxl").unwrap();
     assert_eq!(dim.width, 256);
     assert_eq!(dim.height, 256);
 }
@@ -134,14 +134,14 @@ fn jxl_valid_box_jxlp() {
 
 #[test]
 fn jxl_valid_orientation0() {
-    let dim = size("test/jxl/valid_orientation0.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_orientation0.jxl").unwrap();
     assert_eq!(dim.width, 1386);
     assert_eq!(dim.height, 924);
 }
 
 #[test]
 fn jxl_valid_orientation4() {
-    let dim = size("test/jxl/valid_orientation4.jxl").unwrap();
+    let dim = size("tests/images/jxl/valid_orientation4.jxl").unwrap();
     assert_eq!(dim.width, 924);
     assert_eq!(dim.height, 1386);
 }
@@ -150,15 +150,15 @@ fn jxl_valid_orientation4() {
 
 #[test]
 fn jxl_err_box() {
-    assert!(size("test/jxl/err_box.jxl").is_err());
+    assert!(size("tests/images/jxl/err_box.jxl").is_err());
 }
 
 #[test]
 fn jxl_err_header() {
-    assert!(size("test/jxl/err_header.jxl").is_err());
+    assert!(size("tests/images/jxl/err_header.jxl").is_err());
 }
 
 #[test]
 fn jxl_err_signature() {
-    assert!(size("test/jxl/err_signature.jxl").is_err());
+    assert!(size("tests/images/jxl/err_signature.jxl").is_err());
 }

tests/png.rs

@@ -3,14 +3,14 @@ use imagesize::size;
 
 #[test]
 fn apng_test() {
-    let dim = size("test/png/test.apng").unwrap();
+    let dim = size("tests/images/png/test.apng").unwrap();
     assert_eq!(dim.width, 100);
     assert_eq!(dim.height, 100);
 }
 
 #[test]
 fn png_test() {
-    let dim = size("test/png/test.png").unwrap();
+    let dim = size("tests/images/png/test.png").unwrap();
     assert_eq!(dim.width, 690);
     assert_eq!(dim.height, 298);
 }

tests/psd.rs

@@ -3,7 +3,7 @@ use imagesize::size;
 
 #[test]
 fn psd_test() {
-    let dim = size("test/psd/test.psd").unwrap();
+    let dim = size("tests/images/psd/test.psd").unwrap();
     assert_eq!(dim.width, 500);
     assert_eq!(dim.height, 500);
 }

tests/tif.rs

@@ -3,15 +3,15 @@ use imagesize::size;
 
 #[test]
 fn tiff_test() {
-    let dim = size("test/tif/test.tif").unwrap();
+    let dim = size("tests/images/tif/test.tif").unwrap();
     assert_eq!(dim.width, 1419);
     assert_eq!(dim.height, 1001);
 }
 
 
 #[test]
 fn tiff_test_16bit_size() {
-    let dim = size("test/tif/test_16.tif").unwrap();
+    let dim = size("tests/images/tif/test_16.tif").unwrap();
     assert_eq!(dim.width, 256);
     assert_eq!(dim.height, 256);
 }

tests/webp.rs

@@ -3,35 +3,35 @@ use imagesize::size;
 
 #[test]
 fn webp_test() {
-    let dim = size("test/webp/test.webp").unwrap();
+    let dim = size("tests/images/webp/test.webp").unwrap();
     assert_eq!(dim.width, 716);
     assert_eq!(dim.height, 716);
 }
 
 #[test]
 fn riffx_webp_test() {
-    let dim = size("test/webp/riffx.webp").unwrap();
+    let dim = size("tests/images/webp/riffx.webp").unwrap();
     assert_eq!(dim.width, 128);
     assert_eq!(dim.height, 128);
 }
 
 #[test]
 fn webp_extended() {
-    let dim = size("test/webp/extended.16x32.webp").unwrap();
+    let dim = size("tests/images/webp/extended.16x32.webp").unwrap();
     assert_eq!(dim.width, 16);
     assert_eq!(dim.height, 32);
 }
 
 #[test]
 fn webp_lossless() {
-    let dim = size("test/webp/lossless.16x32.webp").unwrap();
+    let dim = size("tests/images/webp/lossless.16x32.webp").unwrap();
     assert_eq!(dim.width, 16);
     assert_eq!(dim.height, 32);
 }
 
 #[test]
 fn webp_lossy() {
-    let dim = size("test/webp/lossy.16x32.webp").unwrap();
+    let dim = size("tests/images/webp/lossy.16x32.webp").unwrap();
     assert_eq!(dim.width, 16);
     assert_eq!(dim.height, 32);
 }