From 2a89fd826e1b2723897d27a63bce8167d8a7113b Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 13 Jun 2020 16:18:48 -0400
Subject: [PATCH] Update tests to use templates instead of literal strings for
 string parameters.

---
 src/parser/parser.rs | 94 ++++++++++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/src/parser/parser.rs b/src/parser/parser.rs
index daa9431..d9cb88f 100644
--- a/src/parser/parser.rs
+++ b/src/parser/parser.rs
@@ -1204,7 +1204,9 @@ mod tests {
                         },
                         KVPair {
                             key: "animal",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ]
                 })
@@ -1230,7 +1232,9 @@ mod tests {
                         },
                         KVPair {
                             key: "animal",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ]
                 })
@@ -1265,7 +1269,9 @@ mod tests {
                         },
                         KVPair {
                             key: "animal",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ]
                 })
@@ -1293,7 +1299,9 @@ mod tests {
                         },
                         KVPair {
                             key: "animal",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ]
                 })
@@ -1323,7 +1331,9 @@ mod tests {
                         },
                         KVPair {
                             key: "animal",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ]
                 })
@@ -1334,7 +1344,7 @@ mod tests {
     #[test]
     fn test_literals() {
         assert_eq!(
-            dust_tag(r#"{>foo a="foo" b=179/}"#),
+            dust_tag(r#"{>foo a="foo" b=179 c=17.1 d=-12 e=-17.4/}"#),
             Ok((
                 "",
                 DustTag::DTPartial(Partial {
@@ -1345,11 +1355,25 @@ mod tests {
                     params: vec![
                         KVPair {
                             key: "a",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("foo".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "foo".to_owned()
+                            }])
                         },
                         KVPair {
                             key: "b",
                             value: RValue::RVLiteral(OwnedLiteral::LPositiveInteger(179))
+                        },
+                        KVPair {
+                            key: "c",
+                            value: RValue::RVLiteral(OwnedLiteral::LFloat(17.1))
+                        },
+                        KVPair {
+                            key: "d",
+                            value: RValue::RVLiteral(OwnedLiteral::LNegativeInteger(-12))
+                        },
+                        KVPair {
+                            key: "e",
+                            value: RValue::RVLiteral(OwnedLiteral::LFloat(-17.4))
                         }
                     ]
                 })
@@ -1373,7 +1397,9 @@ mod tests {
                         },
                         KVPair {
                             key: "value",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ],
                     contents: Some(Body {
@@ -1410,7 +1436,9 @@ mod tests {
                         },
                         KVPair {
                             key: "value",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ],
                     contents: None,
@@ -1438,7 +1466,9 @@ mod tests {
                         },
                         KVPair {
                             key: "value",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ],
                     contents: Some(Body {
@@ -1477,7 +1507,9 @@ mod tests {
                         },
                         KVPair {
                             key: "value",
-                            value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
+                            value: RValue::RVTemplate(vec![PartialNameElement::PNSpan {
+                                contents: "cat".to_owned()
+                            }])
                         }
                     ],
                     contents: None,
@@ -1593,33 +1625,43 @@ mod tests {
                                             params: vec![
                                                 KVPair {
                                                     key: "v1",
-                                                    value: RValue::RVLiteral(
-                                                        OwnedLiteral::LString("b".to_owned())
-                                                    )
+                                                    value: RValue::RVTemplate(vec![
+                                                        PartialNameElement::PNSpan {
+                                                            contents: "b".to_owned()
+                                                        }
+                                                    ])
                                                 },
                                                 KVPair {
                                                     key: "v2",
-                                                    value: RValue::RVLiteral(
-                                                        OwnedLiteral::LString("b".to_owned())
-                                                    )
+                                                    value: RValue::RVTemplate(vec![
+                                                        PartialNameElement::PNSpan {
+                                                            contents: "b".to_owned()
+                                                        }
+                                                    ])
                                                 },
                                                 KVPair {
                                                     key: "v3",
-                                                    value: RValue::RVLiteral(
-                                                        OwnedLiteral::LString("b".to_owned())
-                                                    )
+                                                    value: RValue::RVTemplate(vec![
+                                                        PartialNameElement::PNSpan {
+                                                            contents: "b".to_owned()
+                                                        }
+                                                    ])
                                                 },
                                                 KVPair {
                                                     key: "v4",
-                                                    value: RValue::RVLiteral(
-                                                        OwnedLiteral::LString("b".to_owned())
-                                                    )
+                                                    value: RValue::RVTemplate(vec![
+                                                        PartialNameElement::PNSpan {
+                                                            contents: "b".to_owned()
+                                                        }
+                                                    ])
                                                 },
                                                 KVPair {
                                                     key: "v5",
-                                                    value: RValue::RVLiteral(
-                                                        OwnedLiteral::LString("b".to_owned())
-                                                    )
+                                                    value: RValue::RVTemplate(vec![
+                                                        PartialNameElement::PNSpan {
+                                                            contents: "b".to_owned()
+                                                        }
+                                                    ])
                                                 }
                                             ]
                                         }