aboutsummaryrefslogtreecommitdiff
path: root/tests/expression_test.ml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/expression_test.ml')
-rwxr-xr-xtests/expression_test.ml18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/expression_test.ml b/tests/expression_test.ml
index 2fa4d9b..5def730 100755
--- a/tests/expression_test.ml
+++ b/tests/expression_test.ml
@@ -6,11 +6,11 @@ let u = UTF8.from_utf8string
let _msg ~expected ~result =
let get_type = function
- | Expression.Basic ScTypes.Num (ScTypes.Number, _) -> "N"
- | Expression.Basic ScTypes.Num (ScTypes.Date, _) -> "D"
- | Expression.Basic ScTypes.Str _ -> "S"
- | Expression.Basic ScTypes.Bool _ -> "B"
- | Expression.Formula _ -> "F" in
+ | Expression.Basic ScTypes.Num (ScTypes.Number, _) -> "N"
+ | Expression.Basic ScTypes.Num (ScTypes.Date, _) -> "D"
+ | Expression.Basic ScTypes.Str _ -> "S"
+ | Expression.Basic ScTypes.Bool _ -> "B"
+ | Expression.Formula _ -> "F" in
Printf.sprintf "Expected %s:%s but got %s:%s"
(UTF8.raw_encode @@ Expression.show expected)
@@ -53,7 +53,7 @@ let test_num ctx = begin
let result = Expression.load @@ u"123" in
let expected = Expression.load_expr @@ Expression.Basic (
ScTypes.number (
- DataType.Num.of_num @@ Num.num_of_int 123
+ DataType.Num.of_int 123
)) in
assert_equal expected result
end
@@ -62,7 +62,7 @@ let test_float ctx = begin
let result = Expression.load @@ u"12.45" in
let expected = Expression.load_expr @@ Expression.Basic (
ScTypes.number (
- DataType.Num.of_num @@ T.Num.of_float_string "12.45"
+ DataType.Num.of_float @@ float_of_string "12.45"
)) in
assert_equal expected result
end
@@ -71,7 +71,7 @@ let test_relative ctx = begin
let result = Expression.load @@ u"-123" in
let expected = Expression.load_expr @@ Expression.Basic (
ScTypes.number (
- DataType.Num.of_num @@ Num.num_of_int (-123)
+ DataType.Num.of_int (-123)
)) in
assert_equal expected result
end
@@ -80,7 +80,7 @@ let test_date ctx = begin
let result = Expression.load @@ u"1900/01/01"
and expected = Expression.load_expr @@ Expression.Basic (
ScTypes.date (
- DataType.Num.of_num @@ Date.get_julian_day 1900 01 01
+ DataType.Date.get_julian_day 1900 01 01
)) in
assert_equal expected result
end