Remove original test fixtures

Author: Antti

CONTRIBUTING.md

@@ -192,7 +192,7 @@ fn transcodes_audio_to_wav_output() {
 
     assert_eq!(
         std::fs::read(output.path()).expect("read wav"),
-        read_fixture("rust/test_file_mono_converted.wav")
+        read_fixture("test_file_mono_converted.wav")
     );
 }
 

README.md

@@ -8,14 +8,10 @@ use tempfile::{Builder, NamedTempFile};
 
 pub fn fixture_path(name: &str) -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("../../test/data")
+        .join("../../fixtures")
         .join(name)
 }
 
-pub fn rust_png_fixture_path(name: &str) -> PathBuf {
-    fixture_path("rust").join(name)
-}
-
 pub fn read_fixture(name: &str) -> Vec<u8> {
     fs::read(fixture_path(name)).expect("fixture bytes")
 }
@@ -29,7 +25,7 @@ pub fn named_temp_file(suffix: &str) -> NamedTempFile {
 
 pub fn assert_png_file_matches_fixture(actual: impl AsRef<Path>, fixture: &str) {
     let actual = image::open(actual).expect("open actual png").into_rgba8();
-    let expected = image::open(rust_png_fixture_path(fixture))
+    let expected = image::open(fixture_path(fixture))
         .expect("open expected png")
         .into_rgba8();
     assert_png_eq(&actual, &expected, fixture);
@@ -39,7 +35,7 @@ pub fn assert_png_bytes_match_fixture(actual: &[u8], fixture: &str) {
     let actual = load_from_memory(actual)
         .expect("decode actual png")
         .into_rgba8();
-    let expected = image::open(rust_png_fixture_path(fixture))
+    let expected = image::open(fixture_path(fixture))
         .expect("open expected png")
         .into_rgba8();
     assert_png_eq(&actual, &expected, fixture);

crates/audiowaveform-cli/tests/cli.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut args = env::args().skip(1);
     let input = args
         .next()
-        .unwrap_or_else(|| "test/data/test_file_stereo.wav".to_string());
+        .unwrap_or_else(|| "fixtures/test_file_stereo.wav".to_string());
     let output = args.next().unwrap_or_else(|| "output.dat".to_string());
 
     let waveform = generate_waveform_from_path(&input, &GenerateOptions::default())?;

crates/audiowaveform-cli/tests/support/mod.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut args = env::args().skip(1);
     let input = args
         .next()
-        .unwrap_or_else(|| "test/data/test_file_stereo_8bit_64spp_wav.dat".to_string());
+        .unwrap_or_else(|| "fixtures/test_file_stereo_8bit_64spp_wav.dat".to_string());
     let output = args.next().unwrap_or_else(|| "output.png".to_string());
 
     let waveform = Waveform::load_from_path(&input, None)?;

crates/audiowaveform/examples/generate_waveform.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut args = env::args().skip(1);
     let input = args
         .next()
-        .unwrap_or_else(|| "test/data/test_file_stereo_8bit_64spp_wav.dat".to_string());
+        .unwrap_or_else(|| "fixtures/test_file_stereo_8bit_64spp_wav.dat".to_string());
     let output = args.next().unwrap_or_else(|| "resampled.dat".to_string());
 
     let waveform = Waveform::load_from_path(&input, None)?;

crates/audiowaveform/examples/render_waveform.rs

@@ -57,18 +57,18 @@ fn generates_expected_waveform_bytes_from_supported_audio_inputs() {
         ),
         (
             "test_file_stereo.mp3",
-            "rust/test_file_stereo_8bit_64spp_mp3.dat",
-            "rust/test_file_stereo_8bit_64spp_mp3.json",
+            "test_file_stereo_8bit_64spp_mp3.dat",
+            "test_file_stereo_8bit_64spp_mp3.json",
         ),
         (
             "test_file_stereo.flac",
-            "rust/test_file_stereo_8bit_64spp_flac.dat",
-            "rust/test_file_stereo_8bit_64spp_flac.json",
+            "test_file_stereo_8bit_64spp_flac.dat",
+            "test_file_stereo_8bit_64spp_flac.json",
         ),
         (
             "test_file_stereo.oga",
-            "rust/test_file_stereo_8bit_64spp_oga.dat",
-            "rust/test_file_stereo_8bit_64spp_oga.json",
+            "test_file_stereo_8bit_64spp_oga.dat",
+            "test_file_stereo_8bit_64spp_oga.json",
         ),
     ];
 

crates/audiowaveform/examples/resample_waveform.rs

@@ -9,14 +9,10 @@ use tempfile::{Builder, NamedTempFile};
 
 pub fn fixture_path(name: &str) -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("../../test/data")
+        .join("../../fixtures")
         .join(name)
 }
 
-pub fn rust_png_fixture_path(name: &str) -> PathBuf {
-    fixture_path("rust").join(name)
-}
-
 pub fn read_fixture(name: &str) -> Vec<u8> {
     fs::read(fixture_path(name)).expect("fixture bytes")
 }
@@ -54,7 +50,7 @@ pub fn assert_png_file_matches_fixture(actual: impl AsRef<Path>, fixture: &str)
 }
 
 pub fn assert_png_image_matches_fixture(actual: &RgbaImage, fixture: &str) {
-    let expected = image::open(rust_png_fixture_path(fixture))
+    let expected = image::open(fixture_path(fixture))
         .expect("open expected png")
         .into_rgba8();
     assert_eq!(

crates/audiowaveform/tests/generate.rs

@@ -50,6 +50,6 @@ fn transcodes_audio_to_expected_wav_fixture() {
 
     assert_bytes_eq(
         &std::fs::read(output.path()).expect("read wav"),
-        "rust/test_file_mono_converted.wav",
+        "test_file_mono_converted.wav",
     );
 }