From 142b03a39be77b8d2b1e62b4d738df6581aae708 Mon Sep 17 00:00:00 2001 From: gered Date: Wed, 19 May 2021 17:58:02 -0400 Subject: [PATCH] move test assets into `test-assets/` i like this better than `assets/tests/`. meh. --- psoutils/src/quest/bin.rs | 8 ++++---- psoutils/src/quest/dat.rs | 8 ++++---- psoutils/src/quest/qst.rs | 16 ++++++++-------- .../test => test-assets}/q058-ret-gc.bin | Bin .../test => test-assets}/q058-ret-gc.dat | Bin .../q058-ret-gc.offline.qst | Bin .../test => test-assets}/q058-ret-gc.online.qst | Bin .../q058-ret-gc.uncompressed.bin | Bin .../q058-ret-gc.uncompressed.dat | Bin .../{assets/test => test-assets}/q118-vr-gc.bin | Bin .../{assets/test => test-assets}/q118-vr-gc.dat | Bin .../test => test-assets}/q118-vr-gc.offline.qst | Bin .../test => test-assets}/q118-vr-gc.online.qst | Bin .../q118-vr-gc.uncompressed.bin | Bin .../q118-vr-gc.uncompressed.dat | Bin 15 files changed, 16 insertions(+), 16 deletions(-) rename psoutils/{assets/test => test-assets}/q058-ret-gc.bin (100%) rename psoutils/{assets/test => test-assets}/q058-ret-gc.dat (100%) rename psoutils/{assets/test => test-assets}/q058-ret-gc.offline.qst (100%) rename psoutils/{assets/test => test-assets}/q058-ret-gc.online.qst (100%) rename psoutils/{assets/test => test-assets}/q058-ret-gc.uncompressed.bin (100%) rename psoutils/{assets/test => test-assets}/q058-ret-gc.uncompressed.dat (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.bin (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.dat (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.offline.qst (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.online.qst (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.uncompressed.bin (100%) rename psoutils/{assets/test => test-assets}/q118-vr-gc.uncompressed.dat (100%) diff --git a/psoutils/src/quest/bin.rs b/psoutils/src/quest/bin.rs index cf99ed3..033cc69 100644 --- a/psoutils/src/quest/bin.rs +++ b/psoutils/src/quest/bin.rs @@ -334,7 +334,7 @@ pub mod tests { #[test] pub fn read_compressed_quest_58_bin() -> Result<(), QuestBinError> { - let path = Path::new("assets/test/q058-ret-gc.bin"); + let path = Path::new("test-assets/q058-ret-gc.bin"); let bin = QuestBin::from_compressed_file(&path)?; validate_quest_58_bin(&bin); Ok(()) @@ -342,7 +342,7 @@ pub mod tests { #[test] pub fn read_uncompressed_quest_58_bin() -> Result<(), QuestBinError> { - let path = Path::new("assets/test/q058-ret-gc.uncompressed.bin"); + let path = Path::new("test-assets/q058-ret-gc.uncompressed.bin"); let bin = QuestBin::from_uncompressed_file(&path)?; validate_quest_58_bin(&bin); Ok(()) @@ -350,7 +350,7 @@ pub mod tests { #[test] pub fn read_compressed_quest_118_bin() -> Result<(), QuestBinError> { - let path = Path::new("assets/test/q118-vr-gc.bin"); + let path = Path::new("test-assets/q118-vr-gc.bin"); let bin = QuestBin::from_compressed_file(&path)?; validate_quest_118_bin(&bin); Ok(()) @@ -358,7 +358,7 @@ pub mod tests { #[test] pub fn read_uncompressed_quest_118_bin() -> Result<(), QuestBinError> { - let path = Path::new("assets/test/q118-vr-gc.uncompressed.bin"); + let path = Path::new("test-assets/q118-vr-gc.uncompressed.bin"); let bin = QuestBin::from_uncompressed_file(&path)?; validate_quest_118_bin(&bin); Ok(()) diff --git a/psoutils/src/quest/dat.rs b/psoutils/src/quest/dat.rs index 1c36f68..fdd4618 100644 --- a/psoutils/src/quest/dat.rs +++ b/psoutils/src/quest/dat.rs @@ -517,7 +517,7 @@ pub mod tests { #[test] pub fn read_compressed_quest_58_dat() -> Result<(), QuestDatError> { - let path = Path::new("assets/test/q058-ret-gc.dat"); + let path = Path::new("test-assets/q058-ret-gc.dat"); let dat = QuestDat::from_compressed_file(&path)?; validate_quest_58_dat(&dat); Ok(()) @@ -525,7 +525,7 @@ pub mod tests { #[test] pub fn read_uncompressed_quest_58_dat() -> Result<(), QuestDatError> { - let path = Path::new("assets/test/q058-ret-gc.uncompressed.dat"); + let path = Path::new("test-assets/q058-ret-gc.uncompressed.dat"); let dat = QuestDat::from_uncompressed_file(&path)?; validate_quest_58_dat(&dat); Ok(()) @@ -533,7 +533,7 @@ pub mod tests { #[test] pub fn read_compressed_quest_118_dat() -> Result<(), QuestDatError> { - let path = Path::new("assets/test/q118-vr-gc.dat"); + let path = Path::new("test-assets/q118-vr-gc.dat"); let dat = QuestDat::from_compressed_file(&path)?; validate_quest_118_dat(&dat); Ok(()) @@ -541,7 +541,7 @@ pub mod tests { #[test] pub fn read_uncompressed_quest_118_dat() -> Result<(), QuestDatError> { - let path = Path::new("assets/test/q118-vr-gc.uncompressed.dat"); + let path = Path::new("test-assets/q118-vr-gc.uncompressed.dat"); let dat = QuestDat::from_uncompressed_file(&path)?; validate_quest_118_dat(&dat); Ok(()) diff --git a/psoutils/src/quest/qst.rs b/psoutils/src/quest/qst.rs index 5041f8f..ca86cff 100644 --- a/psoutils/src/quest/qst.rs +++ b/psoutils/src/quest/qst.rs @@ -534,10 +534,10 @@ mod tests { #[test] pub fn read_quest_58_qst_from_file() -> Result<(), QuestQstError> { - let qst = QuestQst::from_file(Path::new("assets/test/q058-ret-gc.online.qst"))?; + let qst = QuestQst::from_file(Path::new("test-assets/q058-ret-gc.online.qst"))?; validate_quest_58_qst(&qst, 1438, 15097, true)?; - let qst = QuestQst::from_file(Path::new("assets/test/q058-ret-gc.offline.qst"))?; + let qst = QuestQst::from_file(Path::new("test-assets/q058-ret-gc.offline.qst"))?; validate_quest_58_qst(&qst, 1571, 15105, false)?; Ok(()) @@ -545,10 +545,10 @@ mod tests { #[test] pub fn read_quest_118_qst_from_file() -> Result<(), QuestQstError> { - let qst = QuestQst::from_file(Path::new("assets/test/q118-vr-gc.online.qst"))?; + let qst = QuestQst::from_file(Path::new("test-assets/q118-vr-gc.online.qst"))?; validate_quest_118_qst(&qst, 14208, 11802, true)?; - let qst = QuestQst::from_file(Path::new("assets/test/q118-vr-gc.offline.qst"))?; + let qst = QuestQst::from_file(Path::new("test-assets/q118-vr-gc.offline.qst"))?; validate_quest_118_qst(&qst, 14801, 11810, false)?; Ok(()) @@ -556,8 +556,8 @@ mod tests { #[test] pub fn create_qst_from_quest_58_bindat_files() -> Result<(), QuestQstError> { - let mut bin = QuestBin::from_compressed_file(Path::new("assets/test/q058-ret-gc.bin"))?; - let dat = QuestDat::from_compressed_file(Path::new("assets/test/q058-ret-gc.dat"))?; + let mut bin = QuestBin::from_compressed_file(Path::new("test-assets/q058-ret-gc.bin"))?; + let dat = QuestDat::from_compressed_file(Path::new("test-assets/q058-ret-gc.dat"))?; let qst = QuestQst::from_bindat(&bin, &dat)?; validate_quest_58_qst(&qst, 1565, 15507, true)?; @@ -571,8 +571,8 @@ mod tests { #[test] pub fn create_qst_from_quest_118_bindat_files() -> Result<(), QuestQstError> { - let mut bin = QuestBin::from_compressed_file(Path::new("assets/test/q118-vr-gc.bin"))?; - let dat = QuestDat::from_compressed_file(Path::new("assets/test/q118-vr-gc.dat"))?; + let mut bin = QuestBin::from_compressed_file(Path::new("test-assets/q118-vr-gc.bin"))?; + let dat = QuestDat::from_compressed_file(Path::new("test-assets/q118-vr-gc.dat"))?; let qst = QuestQst::from_bindat(&bin, &dat)?; validate_quest_118_qst(&qst, 14794, 12277, true)?; diff --git a/psoutils/assets/test/q058-ret-gc.bin b/psoutils/test-assets/q058-ret-gc.bin similarity index 100% rename from psoutils/assets/test/q058-ret-gc.bin rename to psoutils/test-assets/q058-ret-gc.bin diff --git a/psoutils/assets/test/q058-ret-gc.dat b/psoutils/test-assets/q058-ret-gc.dat similarity index 100% rename from psoutils/assets/test/q058-ret-gc.dat rename to psoutils/test-assets/q058-ret-gc.dat diff --git a/psoutils/assets/test/q058-ret-gc.offline.qst b/psoutils/test-assets/q058-ret-gc.offline.qst similarity index 100% rename from psoutils/assets/test/q058-ret-gc.offline.qst rename to psoutils/test-assets/q058-ret-gc.offline.qst diff --git a/psoutils/assets/test/q058-ret-gc.online.qst b/psoutils/test-assets/q058-ret-gc.online.qst similarity index 100% rename from psoutils/assets/test/q058-ret-gc.online.qst rename to psoutils/test-assets/q058-ret-gc.online.qst diff --git a/psoutils/assets/test/q058-ret-gc.uncompressed.bin b/psoutils/test-assets/q058-ret-gc.uncompressed.bin similarity index 100% rename from psoutils/assets/test/q058-ret-gc.uncompressed.bin rename to psoutils/test-assets/q058-ret-gc.uncompressed.bin diff --git a/psoutils/assets/test/q058-ret-gc.uncompressed.dat b/psoutils/test-assets/q058-ret-gc.uncompressed.dat similarity index 100% rename from psoutils/assets/test/q058-ret-gc.uncompressed.dat rename to psoutils/test-assets/q058-ret-gc.uncompressed.dat diff --git a/psoutils/assets/test/q118-vr-gc.bin b/psoutils/test-assets/q118-vr-gc.bin similarity index 100% rename from psoutils/assets/test/q118-vr-gc.bin rename to psoutils/test-assets/q118-vr-gc.bin diff --git a/psoutils/assets/test/q118-vr-gc.dat b/psoutils/test-assets/q118-vr-gc.dat similarity index 100% rename from psoutils/assets/test/q118-vr-gc.dat rename to psoutils/test-assets/q118-vr-gc.dat diff --git a/psoutils/assets/test/q118-vr-gc.offline.qst b/psoutils/test-assets/q118-vr-gc.offline.qst similarity index 100% rename from psoutils/assets/test/q118-vr-gc.offline.qst rename to psoutils/test-assets/q118-vr-gc.offline.qst diff --git a/psoutils/assets/test/q118-vr-gc.online.qst b/psoutils/test-assets/q118-vr-gc.online.qst similarity index 100% rename from psoutils/assets/test/q118-vr-gc.online.qst rename to psoutils/test-assets/q118-vr-gc.online.qst diff --git a/psoutils/assets/test/q118-vr-gc.uncompressed.bin b/psoutils/test-assets/q118-vr-gc.uncompressed.bin similarity index 100% rename from psoutils/assets/test/q118-vr-gc.uncompressed.bin rename to psoutils/test-assets/q118-vr-gc.uncompressed.bin diff --git a/psoutils/assets/test/q118-vr-gc.uncompressed.dat b/psoutils/test-assets/q118-vr-gc.uncompressed.dat similarity index 100% rename from psoutils/assets/test/q118-vr-gc.uncompressed.dat rename to psoutils/test-assets/q118-vr-gc.uncompressed.dat