aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-11-30 21:44:52 -0800
committerbnewbold <bnewbold@robocracy.org>2016-11-30 21:44:52 -0800
commit53f703416730ed277cd1b76d886d4256a0063bcb (patch)
tree09ed38b10c5f61016a2e68a21350c9d9c9f6cd4a /src
parenta2d795d2ce787841a4f149ccf3ff25b39f73c5b5 (diff)
downloadmodelthing-53f703416730ed277cd1b76d886d4256a0063bcb.tar.gz
modelthing-53f703416730ed277cd1b76d886d4256a0063bcb.zip
move tests from in-file to separate dir
Diffstat (limited to 'src')
-rw-r--r--src/lib.rs64
-rw-r--r--src/modelica_ast.rs52
2 files changed, 1 insertions, 115 deletions
diff --git a/src/lib.rs b/src/lib.rs
index e38d10f..7020a9b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -182,67 +182,3 @@ pub fn pp_parseerror(raw: &str, pe: ParseError<usize, (usize, &str), ()>) -> Str
format!("{} {:?}", "parse error:".red().bold(), pe) },
}
}
-
-/* ******************************** Tests ******************************* */
-
-#[test]
-fn test_parse_metadata() {
- let raw =
-r#"
-[model]
-name-en = "Bogus Dummy Model"
-[variables]
-"#.to_string();
- assert_eq!(parse_metadata(raw).unwrap(),
- ModelMetadata {
- name_en: "Bogus Dummy Model".to_string(),
- description_en: None,
- vars: vec![],
- });
-}
-
-#[test]
-fn test_load_model_entry() {
- load_model_entry(Path::new("./examples/classic_gravitation/")).unwrap();
-}
-
-#[test]
-fn test_search_models() {
- assert_eq!(search_models(Path::new("./examples/")).len() > 1, true);
-}
-
-#[test]
-fn test_lexical() {
- assert_eq!(&format!("{:?}", modelica_parser::parse_integer("+123").unwrap()),
- "123");
- assert_eq!(&format!("{:?}", modelica_parser::parse_integer("-9").unwrap()),
- "-9");
- assert_eq!(&format!("{:?}", modelica_parser::parse_float("-1.0e0").unwrap()),
- "-1");
- assert_eq!(&format!("{:?}", modelica_parser::parse_float("123.456").unwrap()),
- "123.456");
-}
-
-#[test]
-fn test_parse() {
- let example1 =
-r#"model MinimalModel
- Real x;
-equation
- x = 1;
-end MinimalModel;
-"#;
- assert_eq!(&format!("{:?}", modelica_parser::parse_model(example1).unwrap()), example1);
-
- let example2 =
-r#"model MinimalModel
- parameter Real a;
- Real b;
-equation
- connect(a, b);
- a = 1;
- b = ((abs(a) + 2) / 4);
-end MinimalModel;
-"#;
- assert_eq!(&format!("{:?}", modelica_parser::parse_model(example2).unwrap()), example2);
-}
diff --git a/src/modelica_ast.rs b/src/modelica_ast.rs
index d93d81d..6fd29f8 100644
--- a/src/modelica_ast.rs
+++ b/src/modelica_ast.rs
@@ -1,6 +1,6 @@
use std::fmt::{Debug, Formatter, Error};
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
#[derive(PartialEq)]
pub struct ModelicaModel {
@@ -129,37 +129,6 @@ impl Expr {
}
}
-#[cfg(test)]
-fn set_eq(a: Vec<String>, b: Vec<String>) -> bool {
- let set_a: HashSet<String> = HashSet::from_iter(a);
- let set_b: HashSet<String> = HashSet::from_iter(b);
- return set_a == set_b;
-}
-
-#[test]
-fn test_expr_identifiers() {
- use self::Expr::*;
-
- assert!(set_eq(
- vec![],
- Integer(0).identifiers()));
- assert!(set_eq(
- vec!["x".to_string()],
- Ident("x".to_string()).identifiers()));
- assert!(set_eq(
- vec!["x".to_string(), "y".to_string(), "z".to_string()],
- BinExpr(BinOperator::Add,
- Box::new(Abs(Box::new(Ident("z".to_string())))),
- Box::new(BinExpr(BinOperator::Add,
- Box::new(Abs(Box::new(Ident("x".to_string())))),
- Box::new(Abs(Box::new(Ident("y".to_string()))))))).identifiers()));
- assert!(set_eq(
- vec!["z".to_string()],
- BinExpr(BinOperator::Add,
- Box::new(Ident("z".to_string())),
- Box::new(Ident("z".to_string()))).identifiers()));
-}
-
impl SimpleEquation {
// Order is undefined
@@ -168,25 +137,6 @@ impl SimpleEquation {
}
}
-#[test]
-fn test_eqn_identifiers() {
- use self::Expr::*;
-
- assert!(set_eq(
- vec![],
- SimpleEquation{
- lhs: Integer(0),
- rhs: Integer(0),
- }.identifiers()));
- assert!(set_eq(
- vec!["z".to_string()],
- SimpleEquation{
- lhs: Ident("z".to_string()),
- rhs: BinExpr(BinOperator::Add,
- Box::new(Ident("z".to_string())),
- Box::new(Ident("z".to_string()))),
- }.identifiers()));
-}
//// Debug Implementations