Fix tests

Author: Gijsreyn

dsc_lib/src/functions/greater.rs

@@ -52,26 +52,25 @@ impl Function for Greater {
 mod tests {
     use crate::configure::context::Context;
     use crate::parser::Statement;
-    use serde_json::Value;
 
     #[test]
     fn number_greater() {
         let mut parser = Statement::new().unwrap();
         let result = parser.parse_and_execute("[greater(2,1)]", &Context::new()).unwrap();
-        assert_eq!(result, Value::Bool(true));
+        assert_eq!(result, true);
     }
 
     #[test]
     fn number_not_greater() {
         let mut parser = Statement::new().unwrap();
         let result = parser.parse_and_execute("[greater(1,2)]", &Context::new()).unwrap();
-        assert_eq!(result, Value::Bool(false));
+        assert_eq!(result, false);
     }
 
     #[test]
     fn number_equal() {
         let mut parser = Statement::new().unwrap();
         let result = parser.parse_and_execute("[greater(1,1)]", &Context::new()).unwrap();
-        assert_eq!(result, Value::Bool(false));
+        assert_eq!(result, false);
     }
 }

dsc_lib/src/functions/greater_or_equals.rs

@@ -51,33 +51,27 @@ impl Function for GreaterOrEquals {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::configure::context::Context;
+    use crate::parser::Statement;
 
     #[test]
-    fn test_greater_or_equals() {
-        let greater_or_equals = GreaterOrEquals {};
-        let context = Context::new().unwrap();
-        
-        let result = greater_or_equals.invoke(&[Value::Number(5.into()), Value::Number(3.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(true));
-        
-        let result = greater_or_equals.invoke(&[Value::Number(3.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(false));
-        
-        let result = greater_or_equals.invoke(&[Value::Number(5.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(true));
+    fn number_greater_or_equals() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[greaterOrEquals(5,3)]", &Context::new()).unwrap();
+        assert_eq!(result, true);
     }
 
     #[test]
-    fn test_invalid_args() {
-        let greater_or_equals = GreaterOrEquals {};
-        let context = Context::new().unwrap();
-        
-        let result = greater_or_equals.invoke(&[Value::Number(5.into())], &context);
-        assert!(result.is_err());
+    fn number_not_greater_or_equals() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[greaterOrEquals(3,5)]", &Context::new()).unwrap();
+        assert_eq!(result, false);
+    }
+
+    #[test]
+    fn number_equal() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[greaterOrEquals(5,5)]", &Context::new()).unwrap();
+        assert_eq!(result, true);
     }
 }

dsc_lib/src/functions/less.rs

@@ -51,33 +51,27 @@ impl Function for Less {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::configure::context::Context;
+    use crate::parser::Statement;
 
     #[test]
-    fn test_less() {
-        let less = Less {};
-        let context = Context::new().unwrap();
-        
-        let result = less.invoke(&[Value::Number(3.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(true));
-        
-        let result = less.invoke(&[Value::Number(5.into()), Value::Number(3.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(false));
-        
-        let result = less.invoke(&[Value::Number(5.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(false));
+    fn number_less() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[less(3,5)]", &Context::new()).unwrap();
+        assert_eq!(result, true);
     }
 
     #[test]
-    fn test_invalid_args() {
-        let less = Less {};
-        let context = Context::new().unwrap();
-        
-        let result = less.invoke(&[Value::Number(5.into())], &context);
-        assert!(result.is_err());
+    fn number_not_less() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[less(5,3)]", &Context::new()).unwrap();
+        assert_eq!(result, false);
+    }
+
+    #[test]
+    fn number_equal() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[less(5,5)]", &Context::new()).unwrap();
+        assert_eq!(result, false);
     }
 }

dsc_lib/src/functions/less_or_equals.rs

@@ -51,33 +51,27 @@ impl Function for LessOrEquals {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::configure::context::Context;
+    use crate::parser::Statement;
 
     #[test]
-    fn test_less_or_equals() {
-        let less_or_equals = LessOrEquals {};
-        let context = Context::new().unwrap();
-        
-        let result = less_or_equals.invoke(&[Value::Number(3.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(true));
-        
-        let result = less_or_equals.invoke(&[Value::Number(5.into()), Value::Number(3.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(false));
-        
-        let result = less_or_equals.invoke(&[Value::Number(5.into()), Value::Number(5.into())], &context);
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), Value::Bool(true));
+    fn number_less_or_equals() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[lessOrEquals(3,5)]", &Context::new()).unwrap();
+        assert_eq!(result, true);
     }
 
     #[test]
-    fn test_invalid_args() {
-        let less_or_equals = LessOrEquals {};
-        let context = Context::new().unwrap();
-        
-        let result = less_or_equals.invoke(&[Value::Number(5.into())], &context);
-        assert!(result.is_err());
+    fn number_not_less_or_equals() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[lessOrEquals(5,3)]", &Context::new()).unwrap();
+        assert_eq!(result, false);
+    }
+
+    #[test]
+    fn number_equal() {
+        let mut parser = Statement::new().unwrap();
+        let result = parser.parse_and_execute("[lessOrEquals(5,5)]", &Context::new()).unwrap();
+        assert_eq!(result, true);
     }
 }