Get rid of HardcodedHarvester

aquarius/Harvester.py

@@ -0,0 +1,7 @@
+class Harvester(object):
+
+    def do_harvest(self):
+        raise NotImplementedError
+
+    def harvesting_finished(self):
+        raise NotImplementedError

aquarius/bookharvesting/FileSystemHarvester.py

@@ -1,20 +1,21 @@
 import os
 import threading
 from PyPDF2.utils import PdfReadError
+from aquarius.Harvester import Harvester
 from aquarius.bookformats.BookFactory import BookFactory
 
 
-class FileSystemHarvester(object):
+class FileSystemHarvester(Harvester):
 
     def __init__(self, app, config):
         self.__app = app
         self.__config = config
 
     def do_harvest(self):
         self.__app.is_harvesting = True
-        self.begin_harvest_thread()
+        self.__begin_harvest_thread()
 
-    def begin_harvest_thread(self):
+    def __begin_harvest_thread(self):
         threading.Thread(target=self.__harvest_config_targets).start()
 
     def __harvest_config_targets(self):

tests/TestAquarius.py

@@ -2,9 +2,9 @@
 from unittest.mock import Mock
 
 from aquarius.Aquarius import Aquarius
+from aquarius.Harvester import Harvester
 from aquarius.Interactor import Interactor
 from aquarius.InteractorFactory import InteractorFactory
-from aquarius.bookharvesting.HardcodedHarvester import HardcodedHarvester
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
 from aquarius.interactors.GetBookTypeInteractor import GetBookTypeInteractor
@@ -35,7 +35,7 @@ def setup_interactors(self):
         self.__interactor_factory.get_book_type_interactor = Mock(return_value=self.__get_book_type_interactor)
 
     def __setup_harvester_mock(self):
-        self.__harvester = harvester = HardcodedHarvester(self.__app, None)
+        self.__harvester = harvester = Harvester()
         harvester.do_harvest = Mock()
         self.__app.set_harvester(harvester)
 

tests/TestHarvester.py

@@ -0,0 +1,18 @@
+import unittest
+from aquarius.Harvester import Harvester
+
+
+class TestHarvester(unittest.TestCase):
+
+    def setUp(self):
+        self.__target = Harvester()
+
+    def test_do_harvest(self):
+        self.__assert_not_implemented(self.__target.do_harvest)
+
+    def test_harvesting_finished(self):
+        self.__assert_not_implemented(self.__target.harvesting_finished)
+
+    def __assert_not_implemented(self, method):
+        with self.assertRaises(NotImplementedError):
+            method()

tests/TestPersistence.py

@@ -1,5 +1,4 @@
 import unittest
-from unittest.mock import _get_target
 from aquarius.Persistence import Persistence
 
 

tests/bookharvesting/TestFileSystemHarvester.py

@@ -1,6 +1,7 @@
 import unittest
 
 from aquarius.Aquarius import Aquarius
+from aquarius.Harvester import Harvester
 from aquarius.bookharvesting.FileSystemHarvester import FileSystemHarvester
 from Config import Config
 
@@ -13,9 +14,8 @@ def setUp(self):
         config.harvest_paths = ["aquarius/bookformats/tests/data"]
         self.__h = MyFileSystemHarvester(self.__app, config)
 
-    def test_do_harvest_sets_harvest_flag_true_at_start_of_harvest(self):
-        self.__h.do_harvest()
-        self.assertTrue(self.__app.is_harvesting)
+    def test_implements_harvester(self):
+        self.assertIsInstance(self.__h, Harvester)
 
 
 class MyFileSystemHarvester(FileSystemHarvester):