greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test simplification

Browse Source
This commit is contained in:
greg 2017-01-02 16:55:26 -08:00
parent 48343d3fad
commit ad994c38ae
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/parser.rs
View File

@ -444,14 +444,14 @@ mod tests {
parsetest!( parsetest!(
"fn a() 1 + 2 end", "fn a() 1 + 2 end",
&[FuncNode(Function {prototype: Prototype { name: ref name, parameters: ref parameters }, body: ref body})], &[FuncNode(Function {prototype: Prototype { ref name, ref parameters }, ref body})],
match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false } match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false }
&& name == "a" && match &parameters[..] { &[] => true, _ => false } && name == "a" && match &parameters[..] { &[] => true, _ => false }
); );
parsetest!( parsetest!(
"fn a(x,y) 1 + 2 end", "fn a(x,y) 1 + 2 end",
&[FuncNode(Function {prototype: Prototype { name: ref name, parameters: ref parameters }, body: ref body})], &[FuncNode(Function {prototype: Prototype { ref name, ref parameters }, ref body})],
match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false } match &body[..] { &[BinExp(_, box Number(1.0), box Number(2.0))] => true, _ => false }
&& name == "a" && *parameters == ["x","y"] && name == "a" && *parameters == ["x","y"]
); );
@ -485,11 +485,8 @@ mod tests {
let t1 = "if null then 20 else 40 end"; let t1 = "if null then 20 else 40 end";
let tokens = tokenizer::tokenize(t1).unwrap(); let tokens = tokenizer::tokenize(t1).unwrap();
match parse(&tokens, &[]).unwrap()[..] { match parse(&tokens, &[]).unwrap()[..] {
[ExprNode(Conditional(box Null, box ref a, Some(box ref b)))] => { [ExprNode(Conditional(box Null, box Block(_), Some(box Block(_))))] => (),
// TODO make this test better _ => panic!(),
}
_ => panic!("Bad conditional test"),
} }
} }
} }