From 79f1dddf8958a65ce57ac4601a36289019b5f384 Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Fri, 10 Nov 2017 15:03:16 +0100 Subject: Added round function --- tests/dataType_test.ml | 49 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'tests') diff --git a/tests/dataType_test.ml b/tests/dataType_test.ml index 23ecf5d..3900f28 100755 --- a/tests/dataType_test.ml +++ b/tests/dataType_test.ml @@ -22,46 +22,37 @@ let test_num_sub n1 n2 result ctx = begin (N.to_int @@ N.sub n1 n2) end -let test_floor n1 expected ctx = begin - - let result = N.to_int @@ N.floor n1 in +let test_round func number expected ctx = begin + let result = N.to_int @@ func number in assert_equal ~msg:(Printf.sprintf "Expected %d but got %d" expected result) ~cmp:(=) expected result - end -let test_round_down n1 expected ctx = begin - - let result = N.to_int @@ N.round_down n1 in - - assert_equal - ~msg:(Printf.sprintf "Expected %d but got %d" expected result) - ~cmp:(=) - expected - result - -end - - - let n1 = N.of_int 1 let n2 = N.of_int 2 let num_tests = "num_test">::: [ - "test_add" >:: test_num_add n1 n1 2; - "test_mult" >:: test_num_mult n2 n1 2; - "test_sub" >:: test_num_sub n1 n1 0; - "test_floor1" >:: test_floor (N.of_float 1.2) 1; - "test_floor2" >:: test_floor (N.of_float (-1.2)) (-2); - "test_floor3" >:: test_floor (N.of_float 1.8) 1; - "test_floor4" >:: test_floor (N.of_float (-1.8)) (-2); - "test_round_down1" >:: test_round_down (N.of_float 1.2) 1; - "test_round_down2" >:: test_round_down (N.of_float (-1.2)) (-1); - "test_round_down3" >:: test_round_down (N.of_float 1.8) 1; - "test_round_down4" >:: test_round_down (N.of_float (-1.8)) (-1); + "test_add" >:: test_num_add n1 n1 2; + "test_mult" >:: test_num_mult n2 n1 2; + "test_sub" >:: test_num_sub n1 n1 0; + + "test_floor1" >:: test_round N.floor (N.of_float 1.2) 1; + "test_floor2" >:: test_round N.floor (N.of_float (-1.2)) (-2); + "test_floor3" >:: test_round N.floor (N.of_float 1.8) 1; + "test_floor4" >:: test_round N.floor (N.of_float (-1.8)) (-2); + + "test_round_down1" >:: test_round N.round_down (N.of_float 1.2) 1; + "test_round_down2" >:: test_round N.round_down (N.of_float (-1.2)) (-1); + "test_round_down3" >:: test_round N.round_down (N.of_float 1.8) 1; + "test_round_down4" >:: test_round N.round_down (N.of_float (-1.8)) (-1); + + "test_round" >:: test_round N.round (N.of_float 1.2) 1; + "test_round" >:: test_round N.round (N.of_float (-1.2)) (-1); + "test_round" >:: test_round N.round (N.of_float 1.8) 2; + "test_round" >:: test_round N.round (N.of_float (-1.8)) (-2); ] -- cgit v1.2.3