From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 14:29:40 +0000 (+0100)
Subject: subst tests: Add test cases for converting needles
X-Git-Tag: otter-1.1.0~108
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c0773bf9ef758f4ef1dc25407524e1afe27ef664;p=otter.git

subst tests: Add test cases for converting needles

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 92a606db..a7fe6f0f 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1184,6 +1184,9 @@ fn test_subst_mf1() {
   assert_eq!(subst(s_t("a _colour die"), "_colour", "blue")
              .unwrap().finish().unwrap(),
              "a blue die");
+  assert_eq!(subst(s_t("a _colour die"), "${colour}", "blue")
+             .unwrap().finish().unwrap(),
+             "a blue die");
   assert_eq!(subst(s_t("a _colour die"), "_colour", "")
              .unwrap().finish().unwrap(),
              "a die");
@@ -1234,6 +1237,9 @@ fn test_subst_mf2() {
   assert_eq!(subst(s_t("a ${colour} die"), "_colour", "")
              .unwrap().finish().unwrap(),
              "a die");
+  assert_eq!(subst(s_t("a ${colour} die"), "${colour}", "")
+             .unwrap().finish().unwrap(),
+             "a die");
   assert!{matches!{
     dbg!(subst(s_t("a die"), "_colour", "")).unwrap_err().kind,
     SEK::MissingToken(c) if c == "${colour}",