tc_displayable: improved (but not fixed) test_boundaries

1 files changed, 8 insertions, 6 deletions

diff --git a/test/tc_displayable.py b/test/tc_displayable.py
index 0d720c2c..558a20ff 100644
--- a/test/tc_displayable.py
+++ b/test/tc_displayable.py
@@ -114,16 +114,18 @@ class TestDisplayableWithCurses(unittest.TestCase):
 		self.assertRaises(ValueError, disp.resize, 0, -1, hei, wid)
 
 		for i in range(1000):
-			box = [int(randint(0, hei) * 0.2), 0,
-					int(randint(0, wid) * 0.2), 0]
-			box[1] = randint(box[0], hei)
-			box[1] = randint(box[0], hei)
+			box = [int(randint(0, hei) * 0.2), int(randint(0, wid) * 0.2)]
+			box.append(randint(0, hei - box[0]))
+			box.append(randint(0, wid - box[1]))
 
 			def in_box(y, x):
-				return (x >= box[1] and x < box[1] + box[3]) and \
-						(y >= box[0] and y < box[0] + box[2])
+				return (y >= box[1] and y < box[1] + box[3]) and \
+						(x >= box[0] and x < box[0] + box[2])
 
 			disp.resize(*box)
+			self.assertEqual(box, [disp.y, disp.x, disp.hei, disp.wid],
+					"Resizing failed for some reason on loop " + str(i))
+
 			for y, x in zip(range(10), range(10)):
 				is_in_box = in_box(y, x)