From 6b274b4c5e22a06ad72a682f7cb80a8b541dd87b Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Mon, 12 May 2014 21:45:16 +0300
Subject: [PATCH] More ImageDraw tests. Some may need redoing after issues #367
 and #463 are sorted.

---
 Tests/images/imagedraw_line.png      | Bin 0 -> 286 bytes
 Tests/images/imagedraw_point.png     | Bin 0 -> 124 bytes
 Tests/images/imagedraw_polygon.png   | Bin 0 -> 292 bytes
 Tests/images/imagedraw_rectangle.png | Bin 0 -> 228 bytes
 Tests/test_imagedraw.py              |  88 +++++++++++++++++++++++++++
 5 files changed, 88 insertions(+)
 create mode 100644 Tests/images/imagedraw_line.png
 create mode 100644 Tests/images/imagedraw_point.png
 create mode 100644 Tests/images/imagedraw_polygon.png
 create mode 100644 Tests/images/imagedraw_rectangle.png

diff --git a/Tests/images/imagedraw_line.png b/Tests/images/imagedraw_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d0e6994d861246c94a905d395b683775489ed09
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjwEr=Bj3Ar*7p-ZbPpWFX*ru=V%-
zn<9-GUM(NhG9%7+aNYUv#GgxvfuZ65#}_r%Zaoipf5l~<a{INc$*+$VEi7xx6YIVh
zF-^igIr7moNi~(E$VcxZrtL5~+!C|q<a7&>(?a5DGbZ$zeim|1j!c@7cxq<EWj#Z|
z(?Vwr9;U4MClp=1zw6{tsmMp$0yoB)pWhHMckbtneX)J-MXJ@7B-j4__tg7ntnr+M
zAu&B$O=c|#`SO3_yBB{ZgzJiKx98=a-c_A^RZnzzvh40D`l8`^*S4MGSqk(NDtJ}J
X`00<9^-hj!2SE~^u6{1-oD!M<B*AzB

literal 0
HcmV?d00001

diff --git a/Tests/images/imagedraw_point.png b/Tests/images/imagedraw_point.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7c1a3223fa14e838dc4c32fae3cfa14545f07a
GIT binary patch
literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjuuXHOT$kcv5PZ#eQYFmNy%{+TUT
z&*R{+`oX-@s~8v>%qP7CDP~|u_;jC{;ef806_|%a9N^|HJI(rAL?`wsNYvBS&t;uc
GLK6VpyB)Xy

literal 0
HcmV?d00001

diff --git a/Tests/images/imagedraw_polygon.png b/Tests/images/imagedraw_polygon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f160be76ceef3d85c7092a63d87e48115ec3303
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjwE*PbqpAr*7p-Z+?b*g(YPV&MP(
z^RKq<;>w+vGjmJT^EHnX^geT_FfuUkUHZNI{sZ}!Rk|0m4{9vEKINY9-e)hTs>plK
zf0wzoVExtz&HLGxuB(RaJN`74*Yta-VVKvqS^Za|;!cOWF0GApUKv-OyfkS2(un&p
zj{=rlZ%gGBt;+45%Ct8u`ENz%;hTHQ^s+5>T>lqgxjlUMmyq|u{M){)zW?9dcGH?U
z5nB95tu}?MJNE0X`Nu0kH}|b+_D;=Tv)TLZmtXf^?!N!LuzFf(O0aa2sAg&W`hwcs
f8mvISp@4!0|C_PVOkF`octGNwu6{1-oD!M<E)#(b

literal 0
HcmV?d00001

diff --git a/Tests/images/imagedraw_rectangle.png b/Tests/images/imagedraw_rectangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..782d84461ee3f31bcaeede2cac6ac71010e547cf
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjwE)t)YnAr*7pUbx8F%pl<6C>-=-
z>O8hT9}YG)8MEq~w&nw>0Rg?=IellJ-B`Bs_km6zUKttvYn|@ihKNQQ!h`vh`P05b
c>}QaB%D<L{=~-2IloUwB)78&qol`;+03*&+vj6}9

literal 0
HcmV?d00001

diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index 9904457af..727275c2d 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -16,6 +16,10 @@ y1 = int(x0 * 3)
 bbox1 = [(x0, y0), (x1, y1)]
 bbox2 = [x0, y0, x1, y1]
 
+# Two kinds of coordinate sequences
+points1 = [(10, 10), (20, 40), (30, 30)]
+points2 = [10, 10, 20, 40, 30, 30]
+
 
 def test_sanity():
 
@@ -109,6 +113,27 @@ def test_ellipse2():
     helper_ellipse(bbox2)
 
 
+def helper_line(points):
+    # Arrange
+    im = Image.new("RGB", (w, h))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.line(points1, fill="yellow", width=2)
+    del draw
+
+    # Assert
+    assert_image_equal(im, Image.open("Tests/images/imagedraw_line.png"))
+
+
+def test_line1():
+    helper_line(points1)
+
+
+def test_line2():
+    helper_line(points2)
+
+
 def helper_pieslice(bbox):
     # Arrange
     im = Image.new("RGB", (w, h))
@@ -131,4 +156,67 @@ def test_pieslice2():
     helper_pieslice(bbox2)
 
 
+def helper_point(points):
+    # Arrange
+    im = Image.new("RGB", (w, h))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.point(points1, fill="yellow")
+    del draw
+
+    # Assert
+    assert_image_equal(im, Image.open("Tests/images/imagedraw_point.png"))
+
+
+def test_point1():
+    helper_point(points1)
+
+
+def test_point2():
+    helper_point(points2)
+
+
+def helper_polygon(points):
+    # Arrange
+    im = Image.new("RGB", (w, h))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.polygon(points1, fill="red", outline="blue")
+    del draw
+
+    # Assert
+    assert_image_equal(im, Image.open("Tests/images/imagedraw_polygon.png"))
+
+
+def test_polygon1():
+    helper_polygon(points1)
+
+
+def test_polygon2():
+    helper_polygon(points2)
+
+
+def helper_rectangle(bbox):
+    # Arrange
+    im = Image.new("RGB", (w, h))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.rectangle(bbox, fill="black", outline="green")
+    del draw
+
+    # Assert
+    assert_image_equal(im, Image.open("Tests/images/imagedraw_rectangle.png"))
+
+
+def test_rectangle1():
+    helper_rectangle(bbox1)
+
+
+def test_rectangle2():
+    helper_rectangle(bbox2)
+
+
 # End of file