summaryrefslogtreecommitdiff
path: root/morphology-img/tests
diff options
context:
space:
mode:
authorjacksonfu14 <jackson@fashionunited.com>2025-11-18 21:47:55 +0100
committerJackson Moore <jacksonmoore@tuta.io>2025-11-18 21:47:55 +0100
commitf4380758ee94fc137073471f52bf8a20fda34f1b (patch)
treec34aa85e2aa89be9cd062eb3deb2b07c27cb6388 /morphology-img/tests
parent53aca050d78bcda82bd3f2c22b672df91bba23e6 (diff)
calculate ledger lines correctlyHEADmain
Diffstat (limited to 'morphology-img/tests')
-rw-r--r--morphology-img/tests/staff_and_ledgers.rs102
-rw-r--r--morphology-img/tests/template.rs37
2 files changed, 129 insertions, 10 deletions
diff --git a/morphology-img/tests/staff_and_ledgers.rs b/morphology-img/tests/staff_and_ledgers.rs
new file mode 100644
index 0000000..6de6637
--- /dev/null
+++ b/morphology-img/tests/staff_and_ledgers.rs
@@ -0,0 +1,102 @@
+use morphology::{Sequence, Value};
+use morphology_img::note::{sequence_to_staff, sequence_to_ledgers, vector_to_scheme};
+
+#[test]
+fn test_sequence_to_staff_simple() {
+ let seq = Sequence::new(vec![
+ Value::new(1, 0),
+ Value::new(-1, 0),
+ Value::new(0, 0),
+ ]);
+
+ // Unique outers: [1, -1, 0]
+ // max_abs_inner = 0, factor = 3
+ // Staff: [3, -3, 0] -> sorted: [-3, 0, 3]
+ let staff = sequence_to_staff(&seq);
+ assert_eq!(staff, vec![-3, 0, 3]);
+}
+
+#[test]
+fn test_sequence_to_staff_with_inner_values() {
+ let seq = Sequence::new(vec![
+ Value::new(1, 0),
+ Value::new(-1, -1),
+ Value::new(0, 0),
+ ]);
+
+ // Unique outers: [1, -1, 0]
+ // max_abs_inner = 1, factor = 4
+ // Staff: [4, -4, 0] -> sorted: [-4, 0, 4]
+ let staff = sequence_to_staff(&seq);
+ assert_eq!(staff, vec![-4, 0, 4]);
+}
+
+#[test]
+fn test_sequence_to_ledgers_simple() {
+ let seq = Sequence::new(vec![
+ Value::new(1, 0),
+ Value::new(0, 0),
+ ]);
+
+ // Subsets by outer:
+ // outer=1: inner=[0], range [0,0], even: 0 -> (1*3)+0 = 3
+ // outer=0: inner=[0], range [0,0], even: 0 -> (0*3)+0 = 0
+ // max_abs_inner = 0, factor = 3
+ let ledgers = sequence_to_ledgers(&seq);
+ assert_eq!(ledgers, vec![0, 3]);
+}
+
+#[test]
+fn test_sequence_to_ledgers_with_even_range() {
+ let seq = Sequence::new(vec![
+ Value::new(1, -2),
+ Value::new(1, 0),
+ Value::new(0, 0),
+ ]);
+
+ // Subsets by outer:
+ // outer=1: inner=[-2, 0], range [-2,0], even: -2,0 -> (1*5)+(-2)=3, (1*5)+0=5
+ // outer=0: inner=[0], range [0,0], even: 0 -> (0*5)+0=0
+ // max_abs_inner = 2, factor = 5
+ let ledgers = sequence_to_ledgers(&seq);
+ assert_eq!(ledgers, vec![0, 3, 5]);
+}
+
+#[test]
+fn test_vector_to_scheme_basic() {
+ let values = vec![-3, 0, 3];
+ assert_eq!(vector_to_scheme(&values), "#'(-3 0 3)");
+}
+
+#[test]
+fn test_vector_to_scheme_empty() {
+ let values: Vec<i32> = vec![];
+ assert_eq!(vector_to_scheme(&values), "#'()");
+}
+
+#[test]
+fn test_integration_complete_workflow() {
+ // Simple sequence with all components
+ let seq = Sequence::new(vec![
+ Value::new(1, 0),
+ Value::new(-1, -2),
+ Value::new(0, 0),
+ ]);
+
+ // max_abs_inner = 2, factor = 5
+
+ // Staff: unique outers [1, -1, 0] * 5 = [5, -5, 0] -> sorted: [-5, 0, 5]
+ let staff = sequence_to_staff(&seq);
+ assert_eq!(staff, vec![-5, 0, 5]);
+
+ // Ledgers:
+ // outer=1: inner=[0], range [0,0], even: 0 -> (1*5)+0=5
+ // outer=-1: inner=[-2], range [-2,-2], even: -2 -> (-1*5)+(-2)=-7
+ // outer=0: inner=[0], range [0,0], even: 0 -> (0*5)+0=0
+ let ledgers = sequence_to_ledgers(&seq);
+ assert_eq!(ledgers, vec![-7, 0, 5]);
+
+ // Verify Scheme conversion
+ assert_eq!(vector_to_scheme(&staff), "#'(-5 0 5)");
+ assert_eq!(vector_to_scheme(&ledgers), "#'(-7 0 5)");
+}
diff --git a/morphology-img/tests/template.rs b/morphology-img/tests/template.rs
index 07a5f3b..b53689c 100644
--- a/morphology-img/tests/template.rs
+++ b/morphology-img/tests/template.rs
@@ -14,10 +14,11 @@ fn test_embedded_templates_non_empty() {
#[test]
fn test_template_contains_placeholders() {
- // Verify the template contains both placeholders
+ // Verify the template contains all three placeholders
let template = get_template();
assert!(template.contains("%MORPHEME%"), "template should contain '%MORPHEME%' placeholder");
assert!(template.contains("%RUNGS%"), "template should contain '%RUNGS%' placeholder");
+ assert!(template.contains("%LEDGERS%"), "template should contain '%LEDGERS%' placeholder");
}
#[test]
@@ -25,19 +26,22 @@ fn test_successful_substitution() {
// Test successful substitution with simple markup
let morpheme = "c'4 d'4 e'4";
let rungs = "#'(-5 0 5)";
- let result = substitute_template(morpheme, rungs);
+ let ledgers = "#'(-3 3)";
+ let result = substitute_template(morpheme, rungs, ledgers);
assert!(result.is_ok(), "substitution should succeed");
let substituted = result.unwrap();
- // Verify both values are present in the result
+ // Verify all three values are present in the result
assert!(substituted.contains(morpheme), "result should contain the morpheme");
assert!(substituted.contains(rungs), "result should contain the rungs");
+ assert!(substituted.contains(ledgers), "result should contain the ledgers");
// Verify the placeholders are no longer present
assert!(!substituted.contains("%MORPHEME%"), "result should not contain morpheme placeholder");
assert!(!substituted.contains("%RUNGS%"), "result should not contain rungs placeholder");
+ assert!(!substituted.contains("%LEDGERS%"), "result should not contain ledgers placeholder");
// Verify the template structure is preserved
assert!(substituted.contains(r#"\version "2.24.0""#), "version should be preserved");
@@ -50,7 +54,8 @@ fn test_substitution_with_empty_markup() {
// Test with empty morpheme string
let morpheme = "";
let rungs = "#'(0)";
- let result = substitute_template(morpheme, rungs);
+ let ledgers = "#'(0)";
+ let result = substitute_template(morpheme, rungs, ledgers);
assert!(result.is_ok(), "substitution with empty morpheme should succeed");
@@ -59,18 +64,21 @@ fn test_substitution_with_empty_markup() {
// Placeholders should be replaced
assert!(!substituted.contains("%MORPHEME%"));
assert!(!substituted.contains("%RUNGS%"));
+ assert!(!substituted.contains("%LEDGERS%"));
assert!(substituted.contains(rungs));
+ assert!(substituted.contains(ledgers));
}
#[test]
fn test_error_when_placeholder_missing() {
// Verify error handling works by checking that our current template
- // has both required placeholders
+ // has all required placeholders
let template = get_template();
- // Current template should have both placeholders
+ // Current template should have all three placeholders
assert!(template.contains("%MORPHEME%"), "template should have morpheme placeholder");
assert!(template.contains("%RUNGS%"), "template should have rungs placeholder");
+ assert!(template.contains("%LEDGERS%"), "template should have ledgers placeholder");
}
#[test]
@@ -91,7 +99,8 @@ fn test_substitution_preserves_whitespace() {
// Test that substitution preserves indentation and whitespace
let morpheme = "c'4 d'4";
let rungs = "#'(0)";
- let result = substitute_template(morpheme, rungs).unwrap();
+ let ledgers = "#'(0)";
+ let result = substitute_template(morpheme, rungs, ledgers).unwrap();
// The indented structure should be preserved
// The markup should be indented within the entry block
@@ -105,19 +114,25 @@ fn test_multiple_substitutions_independent() {
let morpheme2 = "e'4 f'4";
let rungs1 = "#'(-3 0 3)";
let rungs2 = "#'(-5 0 5)";
+ let ledgers1 = "#'(-3 3)";
+ let ledgers2 = "#'(-5 5)";
- let result1 = substitute_template(morpheme1, rungs1).unwrap();
- let result2 = substitute_template(morpheme2, rungs2).unwrap();
+ let result1 = substitute_template(morpheme1, rungs1, ledgers1).unwrap();
+ let result2 = substitute_template(morpheme2, rungs2, ledgers2).unwrap();
assert!(result1.contains(morpheme1));
assert!(result1.contains(rungs1));
+ assert!(result1.contains(ledgers1));
assert!(!result1.contains(morpheme2));
assert!(!result1.contains(rungs2));
+ assert!(!result1.contains(ledgers2));
assert!(result2.contains(morpheme2));
assert!(result2.contains(rungs2));
+ assert!(result2.contains(ledgers2));
assert!(!result2.contains(morpheme1));
assert!(!result2.contains(rungs1));
+ assert!(!result2.contains(ledgers1));
}
#[test]
@@ -125,8 +140,9 @@ fn test_substitution_with_actual_sequence_markup() {
// Test with markup that would come from the actual transformation pipeline
let morpheme = "f'4 f4 e4 b4";
let rungs = "#'(-4 0 4)";
+ let ledgers = "#'(-4 0 4)";
- let result = substitute_template(morpheme, rungs);
+ let result = substitute_template(morpheme, rungs, ledgers);
assert!(result.is_ok());
let substituted = result.unwrap();
@@ -135,6 +151,7 @@ fn test_substitution_with_actual_sequence_markup() {
assert!(substituted.contains(r#"\entry {"#));
assert!(substituted.contains(morpheme));
assert!(substituted.contains(rungs));
+ assert!(substituted.contains(ledgers));
assert!(substituted.contains("}"));
// The substituted values should be in the correct positions