Refactor tests

Author: martialblog

.travis.yml

@@ -3,16 +3,14 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
-  - "3.5-dev" # 3.5 development branch
-  - "nightly" # currently points to 3.6-dev
-# command to run tests
+  - "3.6"
 install:
   - pip install coveralls
   - pip install coverage
   - pip install pylint
 script:
-  - python -m unittest discover
   - pylint cheat
+  - python -m unittest discover
   - coverage run -m unittest discover
   - coverage report -m
 after_success:

pylintrc

@@ -1,3 +1,3 @@
 # pylint config
 [MESSAGES CONTROL]
-disable=too-few-public-methods, line-too-long, no-name-in-module
+disable=too-few-public-methods, line-too-long, no-name-in-module, import-error

tests/test_main.py

@@ -57,7 +57,7 @@ def test_main_failure_no_cheatsheet(self):
         command = '/usr/bin/env python3 cheat/cheat.py not_available > /dev/null 2>&1'
         result = os.system(command)
 
-        self.assertEqual(result, self.exit_1)
+        self.assertEqual(result, self.exit_2)
 
     def test_main_failure_no_argument(self):
         """

tests/test_printer.py tests/test_print.py

@@ -10,6 +10,7 @@
 import cheat.printer as cp
 import cheat.utils as u
 
+
 class PrinterTest(unittest.TestCase):
     """
     Some basic tests to check the Printer classes.
@@ -22,7 +23,7 @@ def setUp(self):
         """
 
         directory = os.path.dirname(os.path.realpath(__file__))
-        testfile = os.path.join(directory, "test.ini")
+        testfile = os.path.join(directory, "testsheets", "test.ini")
         self.cparser = ConfigParser()
         self.cparser.read(testfile)
 
@@ -67,7 +68,7 @@ def test_InlinePrinter_colored(self):
 
         expected_output = lines[0] + lines[1] + lines[2]
 
-        printer = cp.InlinePrinter(self.cparser, u.colors, print_colored=True)
+        printer = cp.InlinePrinter(self.cparser, u.Colors, print_colored=True)
 
         with patch('sys.stdout', new=StringIO()) as fake_out:
             printer.printsheet()
@@ -86,7 +87,7 @@ def test_InlinePrinter(self):
 
         expected_output = lines[0] + lines[1] + lines[2]
 
-        printer = cp.InlinePrinter(self.cparser, u.colors, print_colored=False)
+        printer = cp.InlinePrinter(self.cparser, u.Colors, print_colored=False)
 
         with patch('sys.stdout', new=StringIO()) as fake_out:
             printer.printsheet()
@@ -97,7 +98,7 @@ def test_InlinePrinter_width(self):
         Test to see if the calculated width is correct.
         """
 
-        printer = cp.InlinePrinter(self.cparser, u.colors, print_colored=False)
+        printer = cp.InlinePrinter(self.cparser, u.Colors, print_colored=False)
 
         expected_length = str(len('Test Cheat A'))
         self.assertEqual(printer.width, expected_length)
@@ -114,7 +115,7 @@ def test_BreaklinePrinter(self):
 
         expected_output = lines[0] + lines[1] + lines[2]
 
-        printer = cp.BreaklinePrinter(self.cparser, u.colors, print_colored=False)
+        printer = cp.BreaklinePrinter(self.cparser, u.Colors, print_colored=False)
 
         with patch('sys.stdout', new=StringIO()) as fake_out:
             printer.printsheet()
@@ -132,9 +133,9 @@ def test_Printer_printsheet(self):
 
         expected_output = lines[0] + lines[1] + lines[2]
 
-        printer = cp.Printer(self.cparser, u.colors)
+        printer = cp.Printer(self.cparser, u.Colors)
         template = "{0}"
 
         with patch('sys.stdout', new=StringIO()) as fake_out:
-            printer.printsheet(template)
+            printer.printcheats(template)
             self.assertEqual(fake_out.getvalue(), expected_output)

tests/test_utils.py

@@ -28,10 +28,10 @@ def test_print_available_sheets(self):
         Test of the print all cheatsheets function
         """
 
-        expected_output = " unittest\n"
+        expected_output = "unittest\n"
 
         with patch('sys.stdout', new=StringIO()) as fake_out:
-            u.print_available_sheets(self.directory)
+            u.print_available_sheets(os.path.join(self.directory, "testsheets"))
             self.assertEqual(fake_out.getvalue(), expected_output)
 
 
@@ -41,6 +41,6 @@ def test_colors(self):
         """
 
         expected_output = "\033[94m"
-        output = u.colors.DEFAULT
+        output = u.Colors.DEFAULT
 
         self.assertEqual(output, expected_output)