subst test: Test format 2 more thoroughly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 1842490022740d3519e003e9652e899688cb0ede..766ecb896b13f5f23dbaf9a6856d4521ede5b7eb 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1205,9 +1205,17 @@ fn test_subst_mf2() {
   assert_eq!(subst(s_f("die-image-_c"), "_c", "blue")
              .unwrap().finish().unwrap(),
              "die-image-blue");
+  assert!{matches!{
+    dbg!(subst(s_f("die-image-_c"), "_colour", "")).unwrap_err().kind,
+    SEK::Internal(_)
+  }}
+
   assert_eq!(subst(s_t("a ${colour} die"), "_colour", "blue")
              .unwrap().finish().unwrap(),
              "a blue die");
+  assert_eq!(subst(s_t("a ${c} die"), "_c", "blue")
+             .unwrap().finish().unwrap(),
+             "a blue die");
   assert_eq!(subst(s_t("a ${colour} die"), "_colour", "")
              .unwrap().finish().unwrap(),
              "a die");