From 2f3163c75604f066a42c1d2f15e0b43a0d586d2a Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Thu, 22 Jun 2017 14:55:11 +0800 Subject: [PATCH] added __is_float --- src/__private__/__is_float.scad | 1 + src/unittest.scad | 6 ++++-- test/test_sub_str.scad | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 src/__private__/__is_float.scad diff --git a/src/__private__/__is_float.scad b/src/__private__/__is_float.scad new file mode 100644 index 00000000..f5889769 --- /dev/null +++ b/src/__private__/__is_float.scad @@ -0,0 +1 @@ +function __is_float(value) = value + 0 != undef; \ No newline at end of file diff --git a/src/unittest.scad b/src/unittest.scad index 53c44acd..2adffe67 100644 --- a/src/unittest.scad +++ b/src/unittest.scad @@ -1,3 +1,5 @@ +include <__private__/__is_float.scad>; + module fail(title, message) { echo( str( @@ -84,8 +86,8 @@ module assertEqualPoints(expected, actual, float_digits = 4) { } module assertEqual(expected, actual, float_digits = 4) { - r_expected = round_n(expected, float_digits); - r_actual = round_n(actual, float_digits); + r_expected = __is_float(expected) ? round_n(expected, float_digits) : expected; + r_actual = __is_float(actual) ? round_n(actual, float_digits) : actual; if(r_expected != r_actual) { fail( diff --git a/test/test_sub_str.scad b/test/test_sub_str.scad index d97dd389..036d20bd 100644 --- a/test/test_sub_str.scad +++ b/test/test_sub_str.scad @@ -1,4 +1,3 @@ - include ; include ;