From 5a6903e4e66733c6d39459485d11cd69af237c26 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 1 Feb 2020 22:09:04 +0200 Subject: [PATCH] Update unit tests. --- scripts/unittest/script/02-rgb_to_grayscale.py | 2 +- scripts/unittest/script/10-find_circles.py | 2 +- scripts/unittest/script/11-find_lines.py | 12 ++++++++---- scripts/unittest/script/13-find_rects.py | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/unittest/script/02-rgb_to_grayscale.py b/scripts/unittest/script/02-rgb_to_grayscale.py index 244ceefbf..ba858697e 100644 --- a/scripts/unittest/script/02-rgb_to_grayscale.py +++ b/scripts/unittest/script/02-rgb_to_grayscale.py @@ -1,4 +1,4 @@ def unittest(data_path, temp_path): import image gs = image.rgb_to_grayscale((120, 200, 120)) - return (gs == 167) + return (abs(167-gs) < 2) diff --git a/scripts/unittest/script/10-find_circles.py b/scripts/unittest/script/10-find_circles.py index 1aa96aaea..41abdea96 100644 --- a/scripts/unittest/script/10-find_circles.py +++ b/scripts/unittest/script/10-find_circles.py @@ -2,4 +2,4 @@ def unittest(data_path, temp_path): import image img = image.Image("unittest/data/shapes.ppm", copy_to_fb=True) circles = img.find_circles(threshold = 5000, x_margin = 30, y_margin = 30, r_margin = 30) - return len(circles) == 1 and circles[0][0:] == (118, 56, 22, 5829) + return len(circles) == 1 and circles[0][0:-1] == (118, 56, 22) diff --git a/scripts/unittest/script/11-find_lines.py b/scripts/unittest/script/11-find_lines.py index a95d6b619..f0afb091f 100644 --- a/scripts/unittest/script/11-find_lines.py +++ b/scripts/unittest/script/11-find_lines.py @@ -3,7 +3,11 @@ def unittest(data_path, temp_path): img = image.Image("unittest/data/shapes.ppm", copy_to_fb=True) lines = img.find_lines(threshold = 10000, theta_margin = 25, rho_margin = 25) return len(lines) == 4 and\ - lines[0][0:] == (22, 0, 22, 119, 119, 17340, 0, 22) and\ - lines[1][0:] == (0, 39, 159, 39, 159, 17340, 90, 39) and\ - lines[2][0:] == (57, 0, 57, 119, 119, 17340, 0, 57) and\ - lines[3][0:] == (0, 75, 159, 75, 159, 21420, 90, 75) + lines[0][0:-3] == (22, 0, 22, 119, 119) and\ + lines[1][0:-3] == (0, 39, 159, 39, 159) and\ + lines[2][0:-3] == (57, 0, 57, 119, 119) and\ + lines[3][0:-3] == (0, 75, 159, 75, 159) and\ + lines[0][-2:] == (0, 22) and\ + lines[1][-2:] == (90, 39) and\ + lines[2][-2:] == (0, 57) and\ + lines[3][-2:] == (90, 75) diff --git a/scripts/unittest/script/13-find_rects.py b/scripts/unittest/script/13-find_rects.py index 816813780..53368e132 100644 --- a/scripts/unittest/script/13-find_rects.py +++ b/scripts/unittest/script/13-find_rects.py @@ -2,4 +2,4 @@ def unittest(data_path, temp_path): import image img = image.Image("unittest/data/shapes.ppm", copy_to_fb=True) rects = img.find_rects(threshold = 50000) - return len(rects) == 1 and rects[0][0:] == (23, 39, 35, 36, 146566) + return len(rects) == 1 and rects[0][0:-1] == (23, 39, 35, 36)