From 9fbc5e48ea8183dda8fdb652364c0c29f8a309d5 Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Wed, 1 Nov 2017 14:53:09 +0100 Subject: Made scTypes.types private. --- tests/expression_test.ml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'tests/expression_test.ml') diff --git a/tests/expression_test.ml b/tests/expression_test.ml index 0950383..2fa4d9b 100755 --- a/tests/expression_test.ml +++ b/tests/expression_test.ml @@ -28,7 +28,7 @@ let assert_equal expected result = let test_str ctx = begin let result = Expression.load @@ u"cafe" in let expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Str (u"cafe")) in + ScTypes.string (u"cafe")) in assert_equal expected result end @@ -36,7 +36,7 @@ end let test_str_space ctx = begin let result = Expression.load @@ u" =cafe" in let expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Str (u" =cafe")) in + ScTypes.string (u" =cafe")) in assert_equal expected result end @@ -45,15 +45,14 @@ let test_formula_str ctx = begin let expected = Expression.load_expr @@ Expression.Formula ( Expression.Expression ( ScTypes.Value ( - ScTypes.Str (u"cafe")))) in + ScTypes.string (u"cafe")))) in assert_equal expected result end let test_num ctx = begin let result = Expression.load @@ u"123" in let expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Num ( - ScTypes.Number, + ScTypes.number ( DataType.Num.of_num @@ Num.num_of_int 123 )) in assert_equal expected result @@ -62,8 +61,7 @@ end let test_float ctx = begin let result = Expression.load @@ u"12.45" in let expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Num ( - ScTypes.Number, + ScTypes.number ( DataType.Num.of_num @@ T.Num.of_float_string "12.45" )) in assert_equal expected result @@ -72,8 +70,7 @@ end let test_relative ctx = begin let result = Expression.load @@ u"-123" in let expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Num ( - ScTypes.Number, + ScTypes.number ( DataType.Num.of_num @@ Num.num_of_int (-123) )) in assert_equal expected result @@ -82,8 +79,7 @@ end let test_date ctx = begin let result = Expression.load @@ u"1900/01/01" and expected = Expression.load_expr @@ Expression.Basic ( - ScTypes.Num ( - ScTypes.Date, + ScTypes.date ( DataType.Num.of_num @@ Date.get_julian_day 1900 01 01 )) in assert_equal expected result -- cgit v1.2.3