From 1678d59a37c619e7a3a2604f4bd23bb10c1769f6 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 12 Mar 2019 15:48:23 +0100 Subject: [PATCH] move test files into subdirectories --- nihav-commonfmt/src/codecs/clearvideo.rs | 4 ++-- nihav-commonfmt/src/demuxers/avi.rs | 2 +- nihav-core/src/io/byteio.rs | 2 +- nihav-game/src/codecs/bmv.rs | 12 ++++++------ nihav-game/src/codecs/gremlinvideo.rs | 2 +- nihav-game/src/codecs/vmd.rs | 12 ++++++------ nihav-game/src/demuxers/bmv.rs | 2 +- nihav-game/src/demuxers/gdv.rs | 2 +- nihav-game/src/demuxers/vmd.rs | 4 ++-- nihav-indeo/src/codecs/imc.rs | 10 +++++----- nihav-indeo/src/codecs/indeo2.rs | 2 +- nihav-indeo/src/codecs/indeo3.rs | 2 +- nihav-indeo/src/codecs/indeo4.rs | 2 +- nihav-indeo/src/codecs/indeo5.rs | 4 ++-- nihav-indeo/src/codecs/intel263.rs | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs index face26c..71b82f6 100644 --- 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 da941b3..099f962 100644 --- 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 880e89b..286a117 100644 --- 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 229ac49..0bdb624 100644 --- 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 7de585f..65d5ed1 100644 --- 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 bd8e772..a70ef60 100644 --- 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 08c59c0..8baa6e4 100644 --- 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 8d407f9..665058e 100644 --- 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 a41967e..b670b63 100644 --- 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 669e0fe..53ea686 100644 --- 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 8c1930f..49b8e9b 100644 --- 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 a30cd1f..3571a30 100644 --- 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 c1e6902..6311dc9 100644 --- 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 0e67ecf..98bd340 100644 --- 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 2a837a1..d84aff5 100644 --- 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); } } -- 2.39.5