BuboBubo/Cagire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes and additions
All checks were successful
Deploy Website / deploy (push) Has been skipped
Details

Browse Source
This commit is contained in:
Raphaël Forment
2026-03-05 19:20:52 +01:00
parent 0097777449
commit 5a72e4cef4
6 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/forth/sound.rs
View File

@@ -8,13 +8,13 @@ fn basic_emit() {
#[test]
fn alias_s() {
let outputs = expect_outputs(r#""snare" s ."#, 1);
let outputs = expect_outputs(r#""snare" snd ."#, 1);
assert!(outputs[0].contains("sound/snare"));
}
#[test]
fn with_params() {
let outputs = expect_outputs(r#""kick" s 440 freq 0.5 gain ."#, 1);
let outputs = expect_outputs(r#""kick" snd 440 freq 0.5 gain ."#, 1);
assert!(outputs[0].contains("sound/kick"));
assert!(outputs[0].contains("freq/440"));
assert!(outputs[0].contains("gain/0.5"));
@@ -22,13 +22,13 @@ fn with_params() {
#[test]
fn auto_dur() {
let outputs = expect_outputs(r#""kick" s ."#, 1);
let outputs = expect_outputs(r#""kick" snd ."#, 1);
assert!(outputs[0].contains("dur/"));
}
#[test]
fn auto_delaytime() {
let outputs = expect_outputs(r#""kick" s ."#, 1);
let outputs = expect_outputs(r#""kick" snd ."#, 1);
assert!(outputs[0].contains("delaytime/"));
}
@@ -39,7 +39,7 @@ fn emit_no_sound() {
#[test]
fn multiple_emits() {
let outputs = expect_outputs(r#""kick" s . "snare" s ."#, 2);
let outputs = expect_outputs(r#""kick" snd . "snare" snd ."#, 2);
assert!(outputs[0].contains("sound/kick"));
assert!(outputs[1].contains("sound/snare"));
}
@@ -48,7 +48,7 @@ fn multiple_emits() {
fn envelope_params() {
// Values are tempo-scaled: 0.01 * step_duration(0.125) = 0.00125, etc.
let outputs = expect_outputs(
r#""synth" s 0.01 attack 0.1 decay 0.7 sustain 0.3 release ."#,
r#""synth" snd 0.01 attack 0.1 decay 0.7 sustain 0.3 release ."#,
1,
);
assert!(outputs[0].contains("attack/0.00125"));
@@ -59,14 +59,14 @@ fn envelope_params() {
#[test]
fn filter_params() {
let outputs = expect_outputs(r#""synth" s 2000 lpf 0.5 lpq ."#, 1);
let outputs = expect_outputs(r#""synth" snd 2000 lpf 0.5 lpq ."#, 1);
assert!(outputs[0].contains("lpf/2000"));
assert!(outputs[0].contains("lpq/0.5"));
}
#[test]
fn adsr_sets_all_envelope_params() {
let outputs = expect_outputs(r#""synth" s 0.01 0.1 0.5 0.3 adsr ."#, 1);
let outputs = expect_outputs(r#""synth" snd 0.01 0.1 0.5 0.3 adsr ."#, 1);
assert!(outputs[0].contains("attack/0.00125"));
assert!(outputs[0].contains("decay/0.0125"));
assert!(outputs[0].contains("sustain/0.5"));
@@ -75,7 +75,7 @@ fn adsr_sets_all_envelope_params() {
#[test]
fn ad_sets_attack_decay_sustain_zero() {
let outputs = expect_outputs(r#""synth" s 0.01 0.1 ad ."#, 1);
let outputs = expect_outputs(r#""synth" snd 0.01 0.1 ad ."#, 1);
assert!(outputs[0].contains("attack/0.00125"));
assert!(outputs[0].contains("decay/0.0125"));
assert!(outputs[0].contains("sustain/0"));
@@ -83,7 +83,7 @@ fn ad_sets_attack_decay_sustain_zero() {
#[test]
fn bank_param() {
let outputs = expect_outputs(r#""loop" s "a" bank ."#, 1);
let outputs = expect_outputs(r#""loop" snd "a" bank ."#, 1);
assert!(outputs[0].contains("sound/loop"));
assert!(outputs[0].contains("bank/a"));
}
@@ -109,7 +109,7 @@ fn param_only_multiple_params() {
#[test]
fn polyphonic_notes() {
let outputs = expect_outputs(r#"60 64 67 note sine s ."#, 3);
let outputs = expect_outputs(r#"60 64 67 note sine snd ."#, 3);
assert!(outputs[0].contains("note/60"));
assert!(outputs[1].contains("note/64"));
assert!(outputs[2].contains("note/67"));
@@ -117,14 +117,14 @@ fn polyphonic_notes() {
#[test]
fn polyphonic_sounds() {
let outputs = expect_outputs(r#"440 freq kick hat s ."#, 2);
let outputs = expect_outputs(r#"440 freq kick hat snd ."#, 2);
assert!(outputs[0].contains("sound/kick"));
assert!(outputs[1].contains("sound/hat"));
}
#[test]
fn polyphonic_cycling() {
let outputs = expect_outputs(r#"60 64 67 note 0.5 1.0 gain sine s ."#, 3);
let outputs = expect_outputs(r#"60 64 67 note 0.5 1.0 gain sine snd ."#, 3);
assert!(outputs[0].contains("note/60"));
assert!(outputs[0].contains("gain/0.5"));
assert!(outputs[1].contains("note/64"));
@@ -135,7 +135,7 @@ fn polyphonic_cycling() {
#[test]
fn polyphonic_with_at() {
let outputs = expect_outputs(r#"0 0.5 at 60 64 note sine s ."#, 4);
let outputs = expect_outputs(r#"0 0.5 at 60 64 note sine snd ."#, 4);
assert_eq!(outputs.len(), 4);
}
@@ -148,7 +148,7 @@ fn explicit_dur_zero_is_infinite() {
#[test]
fn all_before_sounds() {
let outputs = expect_outputs(
r#"500 lpf 0.5 verb all "kick" s 60 note . "hat" s 70 note ."#,
r#"500 lpf 0.5 verb all "kick" snd 60 note . "hat" snd 70 note ."#,
2,
);
assert!(outputs[0].contains("sound/kick"));
@@ -162,7 +162,7 @@ fn all_before_sounds() {
#[test]
fn all_after_sounds() {
let outputs = expect_outputs(
r#""kick" s 60 note . "hat" s 70 note . 500 lpf 0.5 verb all"#,
r#""kick" snd 60 note . "hat" snd 70 note . 500 lpf 0.5 verb all"#,
2,
);
assert!(outputs[0].contains("sound/kick"));
@@ -176,7 +176,7 @@ fn all_after_sounds() {
#[test]
fn noall_clears_global_params() {
let outputs = expect_outputs(
r#"500 lpf all "kick" s 60 note . noall "hat" s 70 note ."#,
r#"500 lpf all "kick" snd 60 note . noall "hat" snd 70 note ."#,
2,
);
assert!(outputs[0].contains("lpf/500"));
@@ -187,7 +187,7 @@ fn noall_clears_global_params() {
fn all_with_tempo_scaled_params() {
// attack is tempo-scaled: 0.01 * step_duration(0.125) = 0.00125
let outputs = expect_outputs(
r#"0.01 attack all "kick" s 60 note ."#,
r#"0.01 attack all "kick" snd 60 note ."#,
1,
);
assert!(outputs[0].contains("attack/0.00125"));
@@ -196,7 +196,7 @@ fn all_with_tempo_scaled_params() {
#[test]
fn all_per_sound_override() {
let outputs = expect_outputs(
r#"500 lpf all "kick" s 2000 lpf . "hat" s ."#,
r#"500 lpf all "kick" snd 2000 lpf . "hat" snd ."#,
2,
);
// kick has both global lpf=500 and per-sound lpf=2000; per-sound wins (comes last)
@@ -210,7 +210,7 @@ fn all_persists_across_evaluations() {
let f = forth();
let ctx = default_ctx();
f.evaluate(r#"500 lpf 0.5 verb all"#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" s 60 note ."#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" snd 60 note ."#, &ctx).unwrap();
assert_eq!(outputs.len(), 1);
assert!(outputs[0].contains("lpf/500"), "global lpf missing: {}", outputs[0]);
assert!(outputs[0].contains("verb/0.5"), "global verb missing: {}", outputs[0]);
@@ -222,7 +222,7 @@ fn noall_clears_across_evaluations() {
let ctx = default_ctx();
f.evaluate(r#"500 lpf all"#, &ctx).unwrap();
f.evaluate(r#"noall"#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" s 60 note ."#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" snd 60 note ."#, &ctx).unwrap();
assert_eq!(outputs.len(), 1);
assert!(!outputs[0].contains("lpf"), "lpf should be cleared: {}", outputs[0]);
}
@@ -251,20 +251,20 @@ fn all_replaces_previous_global() {
let ctx = default_ctx();
f.evaluate(r#"500 lpf 0.5 verb all"#, &ctx).unwrap();
f.evaluate(r#"2000 lpf all"#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" s ."#, &ctx).unwrap();
let outputs = f.evaluate(r#""kick" snd ."#, &ctx).unwrap();
assert_eq!(outputs.len(), 1);
assert!(outputs[0].contains("lpf/2000"), "latest lpf should be 2000: {}", outputs[0]);
}
#[test]
fn slice_param() {
let outputs = expect_outputs(r#""break" s 8 slice ."#, 1);
let outputs = expect_outputs(r#""break" snd 8 slice ."#, 1);
assert!(outputs[0].contains("slice/8"));
}
#[test]
fn pick_param() {
let outputs = expect_outputs(r#""break" s 8 slice 3 pick ."#, 1);
let outputs = expect_outputs(r#""break" snd 8 slice 3 pick ."#, 1);
assert!(outputs[0].contains("slice/8"));
assert!(outputs[0].contains("pick/3"));
}