talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix tests.

Browse Source
This commit is contained in:
Tom Alexander 2020-05-16 22:39:29 -04:00
parent c905e705ff
commit 189dfb1755
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 96 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/parser/parser.rs
View File

@ -920,7 +920,7 @@ mod tests {
}, },
KVPair { KVPair {
key: "animal", key: "animal",
value: RValue::RVString("cat".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
} }
] ]
}) })
@ -943,7 +943,7 @@ mod tests {
}, },
KVPair { KVPair {
key: "animal", key: "animal",
value: RValue::RVString("cat".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
} }
] ]
}) })
@ -962,11 +962,11 @@ mod tests {
params: vec![ params: vec![
KVPair { KVPair {
key: "a", key: "a",
value: RValue::RVString("foo".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString("foo".to_owned()))
}, },
KVPair { KVPair {
key: "b", key: "b",
value: RValue::RVPositiveInteger(179) value: RValue::RVLiteral(OwnedLiteral::LPositiveInteger(179))
} }
] ]
}) })
@ -989,7 +989,7 @@ mod tests {
}, },
KVPair { KVPair {
key: "value", key: "value",
value: RValue::RVString("cat".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
} }
], ],
contents: Some(Body { contents: Some(Body {
@ -1025,7 +1025,7 @@ mod tests {
}, },
KVPair { KVPair {
key: "value", key: "value",
value: RValue::RVString("cat".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString("cat".to_owned()))
} }
], ],
contents: None, contents: None,
@ -1131,23 +1131,33 @@ mod tests {
params: vec![ params: vec![
KVPair { KVPair {
key: "v1", key: "v1",
value: RValue::RVString("b".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString(
"b".to_owned()
))
}, },
KVPair { KVPair {
key: "v2", key: "v2",
value: RValue::RVString("b".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString(
"b".to_owned()
))
}, },
KVPair { KVPair {
key: "v3", key: "v3",
value: RValue::RVString("b".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString(
"b".to_owned()
))
}, },
KVPair { KVPair {
key: "v4", key: "v4",
value: RValue::RVString("b".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString(
"b".to_owned()
))
}, },
KVPair { KVPair {
key: "v5", key: "v5",
value: RValue::RVString("b".to_owned()) value: RValue::RVLiteral(OwnedLiteral::LString(
"b".to_owned()
))
} }
] ]
} }

75
src/renderer/renderer.rs
View File

@ -493,6 +493,81 @@ mod tests {
use crate::renderer::context_element::Walkable; use crate::renderer::context_element::Walkable;
use crate::renderer::CompareContextElement; use crate::renderer::CompareContextElement;
impl ContextElement for String {}
impl Renderable for String {
fn render(&self, _filters: &Vec<Filter>) -> Result<String, RenderError> {
Ok(self.clone())
}
}
impl Loopable for String {
fn get_loop_elements(&self) -> Vec<&dyn ContextElement> {
if self.is_empty() {
Vec::new()
} else {
vec![self]
}
}
}
impl Walkable for String {
fn walk(&self, segment: &str) -> Result<&dyn ContextElement, WalkError> {
Err(WalkError::CantWalk)
}
}
impl CompareContextElement for String {
fn equals(&self, other: &dyn ContextElement) -> bool {
match other.to_any().downcast_ref::<Self>() {
None => false,
Some(other_string) => self == other_string,
}
}
fn partial_compare(&self, other: &dyn ContextElement) -> Option<Ordering> {
match other.to_any().downcast_ref::<Self>() {
None => None,
Some(other_string) => self.partial_cmp(other_string),
}
}
}
impl ContextElement for u64 {}
impl Renderable for u64 {
fn render(&self, _filters: &Vec<Filter>) -> Result<String, RenderError> {
Ok(self.to_string())
}
}
impl Loopable for u64 {
fn get_loop_elements(&self) -> Vec<&dyn ContextElement> {
vec![self]
}
}
impl Walkable for u64 {
fn walk(&self, segment: &str) -> Result<&dyn ContextElement, WalkError> {
Err(WalkError::CantWalk)
}
}
impl CompareContextElement for u64 {
fn equals(&self, other: &dyn ContextElement) -> bool {
match other.to_any().downcast_ref::<Self>() {
None => false,
Some(other_num) => self == other_num,
}
}
fn partial_compare(&self, other: &dyn ContextElement) -> Option<Ordering> {
match other.to_any().downcast_ref::<Self>() {
None => None,
Some(other_num) => self.partial_cmp(other_num),
}
}
}
impl<I: 'static + ContextElement + Clone> ContextElement for HashMap<String, I> {} impl<I: 'static + ContextElement + Clone> ContextElement for HashMap<String, I> {}
impl<I: ContextElement> Renderable for HashMap<String, I> { impl<I: ContextElement> Renderable for HashMap<String, I> {