Merge pull request #451 from afuetterer/test_utils

test: remove obsolete test `utils.py`

Author: chrismattmann

tika/tests/memory_benchmark.py

@@ -19,14 +19,11 @@
 # python tika/tests/memory_benchmark.py
 import os
 import zlib
-
+import gzip
 
 import tika.parser
-import tika.tika
 from memory_profiler import profile
 
-from tika.tests.utils import gzip_compress
-
 
 @profile
 def test_parser_binary():
@@ -62,7 +59,7 @@ def test_parser_gzip():
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
 
     with open(file, 'rb') as file_obj:
-        response = tika.parser.from_buffer(gzip_compress(file_obj.read()), headers={'Accept-Encoding': 'gzip, deflate'})
+        response = tika.parser.from_buffer(gzip.compress(file_obj.read()), headers={'Accept-Encoding': 'gzip, deflate'})
 
 if __name__ == '__main__':
     test_parser_buffer()

tika/tests/test_benchmark.py

@@ -20,26 +20,26 @@
 import os
 import unittest
 import zlib
+import gzip
+from http import HTTPStatus
 
 import tika.parser
-import tika.tika
-from tika.tests.utils import HTTPStatusOk, gzip_compress
 
 
 def test_local_binary(benchmark):
     """parse file binary"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_binary, file)
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer(benchmark):
     """example how to send gzip file"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_buffer, file)
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer_zlib_input(benchmark):
@@ -48,31 +48,31 @@ def test_parser_buffer_zlib_input(benchmark):
 
     response = benchmark(tika_from_buffer_zlib, file)
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer_gzip_input(benchmark):
     """parse file binary"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_buffer_gzip, file)
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_local_binary_with_gzip_output(benchmark):
     """parse file binary"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_binary, file, headers={'Accept-Encoding': 'gzip, deflate'})
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer_with_gzip_output(benchmark):
     """example how to send gzip file"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_buffer, file, headers={'Accept-Encoding': 'gzip, deflate'})
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer_zlib_input_and_gzip_output(benchmark):
@@ -81,15 +81,15 @@ def test_parser_buffer_zlib_input_and_gzip_output(benchmark):
 
     response = benchmark(tika_from_buffer_zlib, file, headers={'Accept-Encoding': 'gzip, deflate'})
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def test_parser_buffer_gzip_input_and_gzip_output(benchmark):
     """parse file binary"""
     file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
     response = benchmark(tika_from_buffer_gzip, file, headers={'Accept-Encoding': 'gzip, deflate'})
 
-    assert response['status'] == HTTPStatusOk
+    assert response['status'] == HTTPStatus.OK
 
 
 def tika_from_buffer_zlib(file, headers=None):
@@ -99,7 +99,7 @@ def tika_from_buffer_zlib(file, headers=None):
 
 def tika_from_buffer_gzip(file, headers=None):
     with open(file, 'rb') as file_obj:
-        return tika.parser.from_buffer(gzip_compress(file_obj.read()), headers=headers)
+        return tika.parser.from_buffer(gzip.compress(file_obj.read()), headers=headers)
 
 
 def tika_from_buffer(file, headers=None):

tika/tests/test_tika.py

@@ -17,10 +17,10 @@
 
 import os
 import unittest
+from http import HTTPStatus
 
 import tika.parser
 import tika.tika
-from tika.tests.utils import HTTPStatusOk
 
 
 class CreateTest(unittest.TestCase):
@@ -53,7 +53,7 @@ def test_local_binary(self):
 
     def test_local_buffer(self):
         response = tika.parser.from_buffer('Good evening, Dave')
-        self.assertEqual(response['status'], HTTPStatusOk)
+        self.assertEqual(response['status'], HTTPStatus.OK)
 
     def test_local_path(self):
         """parse file path"""