Aquarius.py now uses AddBookInteractor.

jeroanan · Apr 7, 2014 · 83eb6f6 · 83eb6f6
1 parent 893261d
commit 83eb6f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/aquarius/Aquarius.py b/aquarius/Aquarius.py
@@ -2,6 +2,7 @@
 import os.path
 
 from aquarius.bookharvesting.HarvesterFactory import HarvesterFactory
+from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.persistence.PersistenceFactory import PersistenceFactory
 from aquarius.output.OutputFactory import OutputFactory
 from Config import Config
@@ -23,6 +24,7 @@ def __init__(self, persistence_type, output_type, harvester_type):
             OutputFactory(self, self.__config).get_output(output_type)
         self.__harvester = \
             HarvesterFactory(self, self.__config).get_harvester(harvester_type)
+        self.__add_book_interactor = AddBookInteractor(self.__persistence)
 
     def main(self):
         self.__output.main()
@@ -40,7 +42,7 @@ def get_book_type(self, format_code):
         return self.__persistence.get_book_type(format_code)
 
     def add_book(self, book):
-        self.__persistence.add_book(book)
+        self.__add_book_interactor.execute(book)
 
     def harvest_books(self):
         if not self.is_harvesting:
@@ -62,3 +64,6 @@ def set_output(self, output):
 
     def set_harvester(self, harvester):
         self.__harvester = harvester
+
+    def set_add_book_interactor(self, interactor):
+        self.__add_book_interactor = interactor
diff --git a/tests/bookformats/TestAquarius.py → tests/TestAquarius.py b/tests/bookformats/TestAquarius.py → tests/TestAquarius.py
@@ -3,6 +3,7 @@
 
 from aquarius.Aquarius import Aquarius
 from aquarius.bookharvesting.HardcodedHarvester import HardcodedHarvester
+from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.output.web.Web import Web
 from aquarius.persistence.hardcodedpersistence.HardcodedPersistence import HardcodedPersistence
 
@@ -14,6 +15,8 @@ def setUp(self):
         self.__setup_harvester_mock()
         self.__setup_persistence_mock()
         self.__gotCallback = False
+        self.__add_book_interactor = Mock(AddBookInteractor)
+        self.__app.set_add_book_interactor(self.__add_book_interactor)
 
     def __setup_harvester_mock(self):
         self.__harvester = harvester = HardcodedHarvester(self.__app, None)
@@ -26,7 +29,6 @@ def __setup_persistence_mock(self):
         self.__persistence.list_books_by_first_letter = Mock()
         self.__persistence.get_book_details = Mock()
         self.__persistence.get_book_type = Mock()
-        self.__persistence.add_book = Mock()
         self.__app.set_persistence(self.__persistence)
 
     def test_search_books_calls_persistence(self):
@@ -45,11 +47,11 @@ def test_get_book_type_calls_persistence(self):
         self.__app.get_book_type("EPUB")
         self.assertTrue(self.__persistence.get_book_type.called)
 
-    def test_add_book_calls_persistence(self):
+    def test_add_book_calls_interactor(self):
         self.__app.add_book(None)
-        self.assertTrue(self.__persistence.add_book.called)
+        self.assertTrue(self.__add_book_interactor.execute.called)
 
-    def testCallMain(self):
+    def test_call_main(self):
         output = Web(self.__app, None)
         output.main = Mock()
         self.__app.set_output(output)