move test files into subdirectories

diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs
index face26cfd4cf0c1ec32f6db7812a3f73202e2bd1..71b82f6921e1d6a39eca48d8848d46c4fb54780c 100644 (file)
--- a/nihav-commonfmt/src/codecs/clearvideo.rs
+++ b/nihav-commonfmt/src/codecs/clearvideo.rs
@@ -784,8 +784,8 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_codecs(&mut dec_reg);
-        test_file_decoding("avi", "assets/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
-//         test_file_decoding("avi", "assets/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
+        test_file_decoding("avi", "assets/Misc/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
+//         test_file_decoding("avi", "assets/Misc/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
 //panic!("debug");
     }
 }

diff --git a/nihav-commonfmt/src/demuxers/avi.rs b/nihav-commonfmt/src/demuxers/avi.rs
index da941b3f40c76de78c070a631d3d0878c3da99d9..099f962bb8433ba19059550b7e9ef78aaa5f34ea 100644 (file)
--- a/nihav-commonfmt/src/demuxers/avi.rs
+++ b/nihav-commonfmt/src/demuxers/avi.rs
@@ -398,7 +398,7 @@ mod test {
 
     #[test]
     fn test_avi_demux() {
-        let mut file = File::open("assets/laser05.avi").unwrap();
+        let mut file = File::open("assets/Indeo/laser05.avi").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = AVIDemuxer::new(&mut br);

diff --git a/nihav-core/src/io/byteio.rs b/nihav-core/src/io/byteio.rs
index 880e89b49191f3d06e828d4e691e3744136843a1..286a1177a55f40d63bff4e8972f3912a5ee57827 100644 (file)
--- a/nihav-core/src/io/byteio.rs
+++ b/nihav-core/src/io/byteio.rs
@@ -626,7 +626,7 @@ mod test {
         assert_eq!(reader.read_u24le().unwrap(), 0x010101u32);
         assert_eq!(reader.read_u32le().unwrap(), 0x01010101u32);
         assert_eq!(reader.read_u64le().unwrap(), 0x0101010101010101u64);
-        let mut file = File::open("assets/MaoMacha.asx").unwrap();
+        let mut file = File::open("assets/Misc/MaoMacha.asx").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br2 = ByteReader::new(&mut fr);
         assert_eq!(br2.read_byte().unwrap(), 0x30);

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index 229ac4940a6556b5f7073100567c831a8116ff57..0bdb6245c07cf354923fa24a628775fcdbf326c2 100644 (file)
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -320,9 +320,9 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/PERFECT.BMV";
-//        let file = "assets/DW2-MOUSE.BMV";
-        let file = "assets/WILDCAT.BMV";
+//        let file = "assets/Game/PERFECT.BMV";
+//        let file = "assets/Game/DW2-MOUSE.BMV";
+        let file = "assets/Game/WILDCAT.BMV";
         test_file_decoding("bmv", file, Some(40), true, false, None, &dmx_reg, &dec_reg);
     }
     #[test]
@@ -332,9 +332,9 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-        let file = "assets/PERFECT.BMV";
-//        let file = "assets/DW2-MOUSE.BMV";
-//        let file = "assets/WILDCAT.BMV";
+        let file = "assets/Game/PERFECT.BMV";
+//        let file = "assets/Game/DW2-MOUSE.BMV";
+//        let file = "assets/Game/WILDCAT.BMV";
         test_decode_audio("bmv", file, None, "bmv", &dmx_reg, &dec_reg);
     }
 }

diff --git a/nihav-game/src/codecs/gremlinvideo.rs b/nihav-game/src/codecs/gremlinvideo.rs
index 7de585ffa91355f3c9203dd38e0084afd789fe29..65d5ed121bd02bba750db1a1fd0d1513c16a0dc5 100644 (file)
--- a/nihav-game/src/codecs/gremlinvideo.rs
+++ b/nihav-game/src/codecs/gremlinvideo.rs
@@ -573,6 +573,6 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("gdv", "assets/intro1.gdv", Some(10), true, false, None, &dmx_reg, &dec_reg);
+        test_file_decoding("gdv", "assets/Game/intro1.gdv", Some(10), true, false, None, &dmx_reg, &dec_reg);
     }
 }

diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs
index bd8e772694b98ddce92589f79f31009c9c14ab3f..a70ef6044e2518a3e47af225e3ae8b05ec556502 100644 (file)
--- a/nihav-game/src/codecs/vmd.rs
+++ b/nihav-game/src/codecs/vmd.rs
@@ -458,8 +458,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/1491.VMD";
-        let file = "assets/128.vmd";
+//        let file = "assets/Game/1491.VMD";
+        let file = "assets/Game/128.vmd";
         test_file_decoding("vmd", file, Some(10), true, false, None/*Some("vmd")*/, &dmx_reg, &dec_reg);
     }
     #[test]
@@ -469,10 +469,10 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/1491.VMD";
-        let file = "assets/128.vmd";
-//        let file = "assets/1000.VMD";
-//        let file = "assets/235.VMD";
+//        let file = "assets/Game/1491.VMD";
+        let file = "assets/Game/128.vmd";
+//        let file = "assets/Game/1000.VMD";
+//        let file = "assets/Game/235.VMD";
         test_decode_audio("vmd", file, None, "vmd", &dmx_reg, &dec_reg);
     }
 }

diff --git a/nihav-game/src/demuxers/bmv.rs b/nihav-game/src/demuxers/bmv.rs
index 08c59c0928f252a9695e0f8e6a0f62161bab821b..8baa6e4eca3fbf77735e4f24f27c55b78a95193f 100644 (file)
--- a/nihav-game/src/demuxers/bmv.rs
+++ b/nihav-game/src/demuxers/bmv.rs
@@ -106,7 +106,7 @@ mod test {
 
     #[test]
     fn test_bmv_demux() {
-        let mut file = File::open("assets/DW2-MOUSE.BMV").unwrap();
+        let mut file = File::open("assets/Game/DW2-MOUSE.BMV").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = BMVDemuxer::new(&mut br);

diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs
index 8d407f96bf2ba6c7e5ce201b6dfbee763bca8f6a..665058e5773cf621e5bd1d9f4898759ac86f7ff7 100644 (file)
--- a/nihav-game/src/demuxers/gdv.rs
+++ b/nihav-game/src/demuxers/gdv.rs
@@ -175,7 +175,7 @@ mod test {
 
     #[test]
     fn test_gdv_demux() {
-        let mut file = File::open("assets/intro1.gdv").unwrap();
+        let mut file = File::open("assets/Game/intro1.gdv").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = GremlinVideoDemuxer::new(&mut br);

diff --git a/nihav-game/src/demuxers/vmd.rs b/nihav-game/src/demuxers/vmd.rs
index a41967e2c9aa642768b2b37d3100926c60d1dc8e..b670b63b406ace4f212088b2c95a11c5650253b1 100644 (file)
--- a/nihav-game/src/demuxers/vmd.rs
+++ b/nihav-game/src/demuxers/vmd.rs
@@ -184,8 +184,8 @@ mod test {
 
     #[test]
     fn test_vmd_demux() {
-        let mut file = File::open("assets/128.vmd").unwrap();
-        //let mut file = File::open("assets/1491.VMD").unwrap();
+        let mut file = File::open("assets/Game/128.vmd").unwrap();
+        //let mut file = File::open("assets/Game/1491.VMD").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = VMDDemuxer::new(&mut br);

diff --git a/nihav-indeo/src/codecs/imc.rs b/nihav-indeo/src/codecs/imc.rs
index 669e0fe9680f1014a61f77ef6e96c3c9f8dbd00a..53ea68600133443ab7a078231ae3d9b0c101fbb7 100644 (file)
--- a/nihav-indeo/src/codecs/imc.rs
+++ b/nihav-indeo/src/codecs/imc.rs
@@ -1121,11 +1121,11 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/neal73_saber.avi";
-//        let file = "assets/IMC/hvalen.avi";
-        let file = "assets/IMC/8khz.avi";
-//        let file = "assets/STsKlassFist-1a.avi";
-//        let file = "assets/IMC/Angel Bday.avi";
+//        let file = "assets/Indeo/neal73_saber.avi";
+//        let file = "assets/Indeo/IMC/hvalen.avi";
+        let file = "assets/Indeo/IMC/8khz.avi";
+//        let file = "assets/Indeo/STsKlassFist-1a.avi";
+//        let file = "assets/Indeo/IMC/Angel Bday.avi";
         test_decode_audio("avi", file, None, "imc", &dmx_reg, &dec_reg);
         //test_file_decoding("avi", file, None, false, true, None);
     }

diff --git a/nihav-indeo/src/codecs/indeo2.rs b/nihav-indeo/src/codecs/indeo2.rs
index 8c1930f437c6a1146c8d27ecc26ac0efafd008cb..49b8e9bbc364d7cdb737a98b43b297f257981dd6 100644 (file)
--- a/nihav-indeo/src/codecs/indeo2.rs
+++ b/nihav-indeo/src/codecs/indeo2.rs
@@ -381,6 +381,6 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+        test_file_decoding("avi", "assets/Indeo/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
     }
 }

diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs
index a30cd1f2917d0890ad91593b3b81d8bf427f969d..3571a306766075fb977e115c2b29be29daff9669 100644 (file)
--- a/nihav-indeo/src/codecs/indeo3.rs
+++ b/nihav-indeo/src/codecs/indeo3.rs
@@ -807,7 +807,7 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+        test_file_decoding("avi", "assets/Indeo/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
     }
 }
 

diff --git a/nihav-indeo/src/codecs/indeo4.rs b/nihav-indeo/src/codecs/indeo4.rs
index c1e69022b4cc9bee95d16b5404d5e4e613b2e4fc..6311dc9975a2584454d949c2225866f11bf6a01b 100644 (file)
--- a/nihav-indeo/src/codecs/indeo4.rs
+++ b/nihav-indeo/src/codecs/indeo4.rs
@@ -778,7 +778,7 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/, &dmx_reg, &dec_reg);
+        test_file_decoding("avi", "assets/Indeo/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/, &dmx_reg, &dec_reg);
 //panic!("the end");
     }
 }

diff --git a/nihav-indeo/src/codecs/indeo5.rs b/nihav-indeo/src/codecs/indeo5.rs
index 0e67ecf1600bec80ce23dc2ef6bfb4351af9fc9c..98bd34031aad20d432acae4d93297529629af43d 100644 (file)
--- a/nihav-indeo/src/codecs/indeo5.rs
+++ b/nihav-indeo/src/codecs/indeo5.rs
@@ -731,8 +731,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/IV5/sample.avi", /*None*/Some(2), true, false, None, &dmx_reg, &dec_reg);
-//         test_file_decoding("avi", "assets/IV5/W32mdl_1.avi", None/*Some(2)*/, true, false, Some("iv5"));
+        test_file_decoding("avi", "assets/Indeo/IV5/sample.avi", /*None*/Some(2), true, false, None, &dmx_reg, &dec_reg);
+//         test_file_decoding("avi", "assets/Indeo/IV5/W32mdl_1.avi", None/*Some(2)*/, true, false, Some("iv5"));
 //panic!("the end");
     }
 }

diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs
index 2a837a162e952725f5fb1ee025e7baca6f404efe..d84aff51c9f99a2d8a9c7623e6d897e1ee9a2246 100644 (file)
--- a/nihav-indeo/src/codecs/intel263.rs
+++ b/nihav-indeo/src/codecs/intel263.rs
@@ -427,6 +427,6 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/neal73_saber.avi", Some(16), true, false, None/*Some("i263")*/, &dmx_reg, &dec_reg);
+        test_file_decoding("avi", "assets/Indeo/neal73_saber.avi", Some(16), true, false, None/*Some("i263")*/, &dmx_reg, &dec_reg);
     }
 }