From 9b7b1cc9f3cca32888f5984bb4fe01e54fdbcb82 Mon Sep 17 00:00:00 2001
From: Paul Schweizer <paulschweizer@gmx.net>
Date: Mon, 23 Jul 2018 21:49:26 +0100
Subject: [PATCH] Test moved to pytest

---
 .travis.yml          |  2 +-
 ascii_canvas/item.py |  2 +-
 tests/test_canvas.py | 82 ++++++++++++++++++++------------------------
 3 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d08d331..aea72e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,4 @@ install:
     - python setup.py install
 
 script:
-    - nosetests --with-coverage --cover-erase --cover-package=ascii_canvas
+    - coverage run --source ascii_canvas -m pytest ./tests --cov=ascii_canvas --cov-report=xml --cov-report=term
diff --git a/ascii_canvas/item.py b/ascii_canvas/item.py
index d87193e..81fda17 100644
--- a/ascii_canvas/item.py
+++ b/ascii_canvas/item.py
@@ -114,7 +114,7 @@ def text(self):
 
         text += self._horizontal()
 
-        for row in range(self.height - 2):
+        for _ in range(self.height - 2):
             for column in range(self.width):
                 if column == 0:
                     text += self.vertical_border
diff --git a/tests/test_canvas.py b/tests/test_canvas.py
index 634361e..eab5d8f 100644
--- a/tests/test_canvas.py
+++ b/tests/test_canvas.py
@@ -1,64 +1,56 @@
-import unittest
-
 from ascii_canvas.canvas import Canvas
 from ascii_canvas.item import Item
 from ascii_canvas.item import Line
 from ascii_canvas.item import Rectangle
 
 
-class TestCanvas(unittest.TestCase):
-    """Test the Canvas."""
-
-    def __test_render_items_on_canvas(self):
-        """Render the added items correctly."""
-        canvas = Canvas()
-
-        rect_a = Item('+-----+\n|Hello|\n+-----+', position=[0, 0])
-        rect_b = Item('+-----+\n|World|\n+-----+', position=[16, 5])
-        rect_c = Item('+-+\n|!|\n+-+', position=[32, 0])
-        line_a = Line(start=[7, 1], end=[15, 6])
-        line_b = Line(start=[23, 6], end=[31, 1])
+def test_render_items_on_canvas():
+    """Render the added items correctly."""
+    canvas = Canvas()
 
-        canvas.add_item(rect_a)
-        canvas.add_item(rect_b)
-        canvas.add_item(rect_c)
-        canvas.add_item(line_a)
-        canvas.add_item(line_b)
+    rect_a = Item('+-----+\n|Hello|\n+-----+', position=[0, 0])
+    rect_b = Item('+-----+\n|World|\n+-----+', position=[16, 5])
+    rect_c = Item('+-+\n|!|\n+-+', position=[32, 0])
+    line_a = Line(start=[7, 1], end=[15, 6])
+    line_b = Line(start=[23, 6], end=[31, 1])
 
-        rendered = canvas.render(line_numbers=False)
-        print(rendered)
+    canvas.add_item(rect_a)
+    canvas.add_item(rect_b)
+    canvas.add_item(rect_c)
+    canvas.add_item(line_a)
+    canvas.add_item(line_b)
 
-        rendered = canvas.render(line_numbers=True)
-        print(rendered)
+    rendered = canvas.render(line_numbers=False)
+    print(rendered)
 
-    def test_rectangle(self):
-        """Render a bunch of rectangles."""
-        canvas = Canvas()
+    rendered = canvas.render(line_numbers=True)
+    print(rendered)
 
-        null_rect = Rectangle(width=0, height=0)
-        canvas.add_item(null_rect)
 
-        null_hor_rect = Rectangle(width=0, height=1, position=[5, 0])
-        canvas.add_item(null_hor_rect)
+def test_rectangle():
+    """Render a bunch of rectangles."""
+    canvas = Canvas()
 
-        null_ver_rect = Rectangle(width=1, height=0, position=[10, 0])
-        canvas.add_item(null_ver_rect)
+    null_rect = Rectangle(width=0, height=0)
+    canvas.add_item(null_rect)
 
-        three_by_three_quad = Rectangle(width=3, height=3, position=[15, 0])
-        canvas.add_item(three_by_three_quad)
+    null_hor_rect = Rectangle(width=0, height=1, position=[5, 0])
+    canvas.add_item(null_hor_rect)
 
-        rect = Rectangle(width=4, height=9, position=[0, 5],
-                         horizontal_border='H', vertical_border='V',
-                         corner='C', fill='F')
-        canvas.add_item(rect)
+    null_ver_rect = Rectangle(width=1, height=0, position=[10, 0])
+    canvas.add_item(null_ver_rect)
 
-        rect = Rectangle(width=4, height=5, position=[10, 5],
-                         horizontal_border='.', vertical_border='.',
-                         corner='.', fill=' ')
-        canvas.add_item(rect)
+    three_by_three_quad = Rectangle(width=3, height=3, position=[15, 0])
+    canvas.add_item(three_by_three_quad)
 
-        print(canvas.render(line_numbers=False))
+    rect = Rectangle(width=4, height=9, position=[0, 5],
+                     horizontal_border='H', vertical_border='V',
+                     corner='C', fill='F')
+    canvas.add_item(rect)
 
+    rect = Rectangle(width=4, height=5, position=[10, 5],
+                     horizontal_border='.', vertical_border='.',
+                     corner='.', fill=' ')
+    canvas.add_item(rect)
 
-if __name__ == '__main__':
-    unittest.main(exit=False)
+    print(canvas.render(line_numbers=False))