From 911d64b1897f3ffdfa927968c356859c50e9af97 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Fri, 26 May 2017 09:06:40 +0800 Subject: [PATCH] considered length --- src/unittest.scad | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/unittest.scad b/src/unittest.scad index b0978fa0..4d17ba3f 100644 --- a/src/unittest.scad +++ b/src/unittest.scad @@ -33,28 +33,42 @@ function all_shift_to_int(points, digits) = [for(pt = points) shift_to_int(pt, digits) / digits]; module assertEqualPoint(expected, actual) { - n = 10000; + leng_expected = len(expected); + leng_actual = len(actual); - shifted_expected = shift_to_int( - expected, n - ); - - shifted_actual = shift_to_int( - actual, n - ); - - if(shifted_expected != shifted_actual) { - fail( + if(leng_expected != leng_actual) { + fail( "assertEqualPoint", - str("expected: ", shifted_expected / n, - ", but: ", shifted_actual / n) + str("expected length: ", leng_expected, + ", but: ", leng_actual) + ); + } else { + n = 10000; + + shifted_expected = shift_to_int( + expected, n ); + + shifted_actual = shift_to_int( + actual, n + ); + + if(shifted_expected != shifted_actual) { + fail( + "assertEqualPoint", + str("expected: ", shifted_expected / n, + ", but: ", shifted_actual / n) + ); + } } + + } module assertEqualPoints(expected, actual) { leng_expected = len(expected); leng_actual = len(actual); + if(leng_expected != leng_actual) { fail( "assertEqualPoints",