Merge pull request #134 from tubone24/create_sqllite

fix test

ebook_homebrew/rest.py

@@ -48,6 +48,8 @@
     license={"name": "MIT", "url": "https://opensource.org/licenses/MIT"},
 )
 
+upload_file = UploadedFile()
+
 _logger = get_logger("RestAPI")
 
 
@@ -133,7 +135,6 @@ def list_upload_files(_, resp):
                             $ref: "#/components/schemas/ListUploadFiles"
     """
     _logger.debug("List File")
-    upload_file = UploadedFile()
     file_list = upload_file.get_all_uploaded_file()
     resp.media = ListUploadFilesSchema().dump(ListUploadFiles(file_list)).data
 
@@ -204,7 +205,6 @@ def write_image(images_b64, content_type, tmp_dir):
         with open(file_name, "wb") as image_file:
             image_file.write(image)
             last_index = i
-    upload_file = UploadedFile()
     upload_file.add_uploaded_file(
         name=file_name,
         file_path=str(tmp_dir),

tests/ut/test_rest.py

@@ -3,13 +3,15 @@
 import logging
 import base64
 import json
+import types
 from unittest.mock import patch
 from unittest.mock import MagicMock
 
 import pytest
 
 import ebook_homebrew.rest as target
 
+_logger = logging.getLogger(name=__name__)
 
 @pytest.fixture
 def api():
@@ -48,26 +50,6 @@ def test_status(api):
     assert actual == expect
 
 
-def test_list_upload_files(api):
-    file_list = {"id": 1,
-                 "name": "test",
-                 "file_path": "/tmp/test",
-                 "file_type": "image/png",
-                 "last_index": 0,
-                 "created_at": "2019-07-28 16:21:14",
-                 "updated_at": "2019-07-28 16:21:14"}
-    mock_uploadedfile = MagicMock()
-    mock_get_all_uploaded_file = MagicMock(return_value=[file_list])
-    mock_uploadedfile.get_all_uploaded_file = mock_get_all_uploaded_file
-    with patch.object(target, "UploadedFile", return_value=mock_uploadedfile):
-        r = api.requests.get("/data/upload/list")
-        json_response = json.loads(r.text)
-        assert "fileList" in json_response
-        actual = json_response["fileList"]
-        expect = [file_list]
-        assert actual == expect
-
-
 def test_upload_image_file(api, image_b64, tmpdir):
     event = json.dumps({"fileName": "test.pdf",
                         "contentType": "image/png",
@@ -101,19 +83,16 @@ def test_upload_image_file_data_uri_schema(api, image_b64, tmpdir):
 
 
 def test_write_image(image_b64, tmpdir):
-    mock_uploadedfile = MagicMock()
-    mock_add_uploaded_file = MagicMock()
-    mock_uploadedfile.add_uploaded_file = mock_add_uploaded_file
     file_name = os.path.join(tmpdir, "0.png")
-    with patch.object(target, "UploadedFile", return_value=mock_uploadedfile):
+    with patch.object(target, "upload_file") as mock_uploadedfile:
         future = target.write_image([image_b64], "image/png", tmpdir)
         actual = future.result()
         expected = True
         assert actual == expected
-        mock_add_uploaded_file.assert_called_once_with(name=file_name,
-                                                       file_path=str(tmpdir),
-                                                       file_type="image/png",
-                                                       last_index=0)
+        mock_uploadedfile.add_uploaded_file.assert_called_once_with(name=file_name,
+                                                                    file_path=str(tmpdir),
+                                                                    file_type="image/png",
+                                                                    last_index=0)
 
 
 def test_write_image_data_uri_schema(image_b64, tmpdir):