From f5ede7e7a1dfb79c1b0610ab598a10be93659bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Ko=C5=9Bci=C3=B3w?= <kosci1@gmail.com>
Date: Tue, 30 May 2017 19:05:06 +0200
Subject: [PATCH] test area draw circle & arc

---
 gfxlcd/tests/test_area_drawing.py | 56 ++++++++++++++++++++++++++-----
 gfxlcd/tests/test_page_drawing.py |  6 ----
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/gfxlcd/tests/test_area_drawing.py b/gfxlcd/tests/test_area_drawing.py
index f042f07..8b37f5b 100644
--- a/gfxlcd/tests/test_area_drawing.py
+++ b/gfxlcd/tests/test_area_drawing.py
@@ -46,7 +46,6 @@ class TestPageDrawing(object):
         buffer[6][1] = 1
         buffer[7][1] = 1
         buffer[8][1] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_vertical_line(self):
@@ -66,7 +65,6 @@ class TestPageDrawing(object):
         buffer[1][12] = 1
         buffer[1][13] = 1
         buffer[1][14] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_overlapping_lines(self):
@@ -110,7 +108,6 @@ class TestPageDrawing(object):
         buffer[7][1] = 1
         buffer[8][1] = 1
         buffer[9][1] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_diagonal_line_even_steps(self):
@@ -132,7 +129,6 @@ class TestPageDrawing(object):
         buffer[7][13] = 1
         buffer[8][14] = 1
         buffer[9][15] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_diagonal_line_even_steps_even_rest(self):
@@ -148,7 +144,6 @@ class TestPageDrawing(object):
         buffer[7][4] = 1
         buffer[8][4] = 1
         buffer[9][5] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_diagonal_line_odd_steps_even_rest(self):
@@ -164,7 +159,6 @@ class TestPageDrawing(object):
         buffer[7][4] = 1
         buffer[8][5] = 1
         buffer[9][6] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_diagonal_line_even_steps_odd_rest(self):
@@ -179,7 +173,6 @@ class TestPageDrawing(object):
         buffer[6][4] = 1
         buffer[7][5] = 1
         buffer[8][6] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_draw_rect(self):
@@ -214,7 +207,6 @@ class TestPageDrawing(object):
         buffer[4][11] = 1
         buffer[5][11] = 1
         buffer[6][11] = 1
-        self.draw_buffer(self.drv.buffer)
         assert_equal(self.drv.buffer, buffer)
 
     def test_fill_rect(self):
@@ -223,7 +215,53 @@ class TestPageDrawing(object):
         for x in range(6):
             for y in range(10):
                 buffer[2+x][2+y] = 2
-        self.draw_buffer(self.drv.buffer)
+        assert_equal(self.drv.buffer, buffer)
+
+    def test_draw_circle(self):
+        self.lcd.draw_circle(5, 8, 3)
+        buffer = self.get_buffer()
+        buffer[2][7] = 1
+        buffer[2][8] = 1
+        buffer[2][9] = 1
+        buffer[3][6] = 1
+        buffer[3][7] = 1
+        buffer[3][9] = 1
+        buffer[3][10] = 1
+        buffer[4][5] = 1
+        buffer[4][6] = 1
+        buffer[4][10] = 1
+        buffer[4][11] = 1
+        buffer[5][5] = 1
+        buffer[5][11] = 1
+        buffer[6][5] = 1
+        buffer[6][6] = 1
+        buffer[7][6] = 1
+        buffer[7][7] = 1
+        buffer[8][7] = 1
+        buffer[8][8] = 1
+        buffer[8][9] = 1
+        buffer[7][9] = 1
+        buffer[7][10] = 1
+        buffer[6][10] = 1
+        buffer[6][11] = 1
+        assert_equal(self.drv.buffer, buffer)
+
+    def test_draw_arc(self):
+        self.lcd.draw_arc(5, 8, 3, 90, 270)
+        buffer = self.get_buffer()
+        buffer[2][7] = 1
+        buffer[2][8] = 1
+        buffer[2][9] = 1
+        buffer[3][6] = 1
+        buffer[3][7] = 1
+        buffer[3][9] = 1
+        buffer[3][10] = 1
+        buffer[4][5] = 1
+        buffer[4][6] = 1
+        buffer[4][10] = 1
+        buffer[4][11] = 1
+        buffer[5][5] = 1
+        buffer[5][11] = 1
         assert_equal(self.drv.buffer, buffer)
 
     def draw_buffer(self, buffer):
diff --git a/gfxlcd/tests/test_page_drawing.py b/gfxlcd/tests/test_page_drawing.py
index 87aabfd..98abfe1 100644
--- a/gfxlcd/tests/test_page_drawing.py
+++ b/gfxlcd/tests/test_page_drawing.py
@@ -103,7 +103,6 @@ class TestPageDrawing(object):
         buffer[7][1] = 16+32
         buffer[8][1] = 64
         buffer[9][1] = 128
-        self.draw_buffer(self.lcd.buffer)
         assert_equal(self.lcd.buffer, buffer)
 
     def test_draw_diagonal_line_even_steps_even_rest(self):
@@ -119,7 +118,6 @@ class TestPageDrawing(object):
         buffer[7][0] = 16
         buffer[8][0] = 16
         buffer[9][0] = 32
-
         assert_equal(self.lcd.buffer, buffer)
 
     def test_draw_diagonal_line_odd_steps_even_rest(self):
@@ -135,7 +133,6 @@ class TestPageDrawing(object):
         buffer[7][0] = 16
         buffer[8][0] = 32
         buffer[9][0] = 64
-
         assert_equal(self.lcd.buffer, buffer)
 
     def test_draw_diagonal_line_even_steps_odd_rest(self):
@@ -150,7 +147,6 @@ class TestPageDrawing(object):
         buffer[6][0] = 16
         buffer[7][0] = 32
         buffer[8][0] = 64
-        self.draw_buffer(self.lcd.buffer)
         assert_equal(self.lcd.buffer, buffer)
 
     def test_draw_rect(self):
@@ -169,7 +165,6 @@ class TestPageDrawing(object):
         buffer[5][1] = 8
         buffer[6][1] = 8
         buffer[7][1] = 1+2+4+8
-        self.draw_buffer(self.lcd.buffer)
         assert_equal(self.lcd.buffer, buffer)
 
     def test_fill_rect(self):
@@ -219,7 +214,6 @@ class TestPageDrawing(object):
         buffer[3][1] = 2+4
         buffer[4][1] = 4+8
         buffer[5][1] = 8
-        self.draw_buffer(self.lcd.buffer)
         assert_equal(self.lcd.buffer, buffer)
 
     def draw_buffer(self, buffer):