diff --git a/tests/_conditions/__init__.py b/tests/_conditions/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/date_test.py b/tests/_conditions/date_test.py similarity index 100% rename from tests/date_test.py rename to tests/_conditions/date_test.py diff --git a/tests/test_combiners_conditions.py b/tests/_conditions/test_combiners_conditions.py similarity index 100% rename from tests/test_combiners_conditions.py rename to tests/_conditions/test_combiners_conditions.py diff --git a/tests/test_date_conditions.py b/tests/_conditions/test_date_conditions.py similarity index 99% rename from tests/test_date_conditions.py rename to tests/_conditions/test_date_conditions.py index 6167b94..480d839 100644 --- a/tests/test_date_conditions.py +++ b/tests/_conditions/test_date_conditions.py @@ -1,6 +1,6 @@ # pylint: disable=wildcard-import,too-many-instance-attributes,unused-wildcard-import -from date_test import DateTest +from _conditions.date_test import DateTest from pystreamapi.conditions import equal_to, not_equal_to, between, not_between from pystreamapi.conditions.date import * diff --git a/tests/test_date_conditions_type_date.py b/tests/_conditions/test_date_conditions_type_date.py similarity index 99% rename from tests/test_date_conditions_type_date.py rename to tests/_conditions/test_date_conditions_type_date.py index e6b9901..2baad2a 100644 --- a/tests/test_date_conditions_type_date.py +++ b/tests/_conditions/test_date_conditions_type_date.py @@ -1,6 +1,6 @@ # pylint: disable=wildcard-import,too-many-instance-attributes,unused-wildcard-import -from date_test import DateTest +from _conditions.date_test import DateTest from pystreamapi.conditions import equal_to, not_equal_to, between, not_between from pystreamapi.conditions.date import * diff --git a/tests/test_numeric_conditions.py b/tests/_conditions/test_numeric_conditions.py similarity index 100% rename from tests/test_numeric_conditions.py rename to tests/_conditions/test_numeric_conditions.py diff --git a/tests/test_string_conditions.py b/tests/_conditions/test_string_conditions.py similarity index 100% rename from tests/test_string_conditions.py rename to tests/_conditions/test_string_conditions.py diff --git a/tests/test_type_conditions.py b/tests/_conditions/test_type_conditions.py similarity index 100% rename from tests/test_type_conditions.py rename to tests/_conditions/test_type_conditions.py diff --git a/tests/_itertools/__init__.py b/tests/_itertools/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_itertools.py b/tests/_itertools/test_itertools.py similarity index 100% rename from tests/test_itertools.py rename to tests/_itertools/test_itertools.py diff --git a/tests/_lazy/__init__.py b/tests/_lazy/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/helper.py b/tests/_lazy/helper.py similarity index 100% rename from tests/helper.py rename to tests/_lazy/helper.py diff --git a/tests/test_process.py b/tests/_lazy/test_process.py similarity index 93% rename from tests/test_process.py rename to tests/_lazy/test_process.py index 5dc4d0c..ad10917 100644 --- a/tests/test_process.py +++ b/tests/_lazy/test_process.py @@ -1,6 +1,6 @@ import unittest -from helper import TestHelper +from _lazy.helper import TestHelper from pystreamapi._lazy.process import Process diff --git a/tests/test_queue.py b/tests/_lazy/test_queue.py similarity index 96% rename from tests/test_queue.py rename to tests/_lazy/test_queue.py index 4523f32..5315387 100644 --- a/tests/test_queue.py +++ b/tests/_lazy/test_queue.py @@ -1,6 +1,6 @@ from unittest import TestCase -from helper import TestHelper +from _lazy.helper import TestHelper from pystreamapi._lazy.process import Process from pystreamapi._lazy.queue import ProcessQueue diff --git a/tests/_loaders/__init__.py b/tests/_loaders/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/file_test.py b/tests/_loaders/file_test.py similarity index 100% rename from tests/file_test.py rename to tests/_loaders/file_test.py diff --git a/tests/test_csv_loader.py b/tests/_loaders/test_csv_loader.py similarity index 96% rename from tests/test_csv_loader.py rename to tests/_loaders/test_csv_loader.py index ebdd5fb..c8d6a71 100644 --- a/tests/test_csv_loader.py +++ b/tests/_loaders/test_csv_loader.py @@ -2,7 +2,7 @@ from unittest import TestCase from unittest.mock import patch, mock_open -from file_test import OPEN, PATH_EXISTS, PATH_ISFILE +from _loaders.file_test import OPEN, PATH_EXISTS, PATH_ISFILE from pystreamapi.loaders import csv file_content = """ @@ -70,4 +70,4 @@ def test_csv_loader_with_invalid_path(self): def test_csv_loader_with_no_file(self): with self.assertRaises(ValueError): - csv('./') + csv('../') diff --git a/tests/test_json_loader.py b/tests/_loaders/test_json_loader.py similarity index 96% rename from tests/test_json_loader.py rename to tests/_loaders/test_json_loader.py index 2051843..44404b5 100644 --- a/tests/test_json_loader.py +++ b/tests/_loaders/test_json_loader.py @@ -3,7 +3,7 @@ from unittest import TestCase from unittest.mock import patch, mock_open -from file_test import OPEN, PATH_EXISTS, PATH_ISFILE +from _loaders.file_test import OPEN, PATH_EXISTS, PATH_ISFILE from pystreamapi.loaders import json file_content = """ @@ -55,7 +55,7 @@ def test_json_loader_with_invalid_path(self): def test_json_loader_with_no_file(self): with self.assertRaises(ValueError): - json('./') + json('../') def test_json_loader_from_string(self): data = json(file_content, read_from_src=True) diff --git a/tests/test_xml_loader.py b/tests/_loaders/test_xml_loader.py similarity index 97% rename from tests/test_xml_loader.py rename to tests/_loaders/test_xml_loader.py index d339c4a..84d32b2 100644 --- a/tests/test_xml_loader.py +++ b/tests/_loaders/test_xml_loader.py @@ -3,7 +3,7 @@ from unittest.mock import patch, mock_open from xml.etree.ElementTree import ParseError -from file_test import OPEN, PATH_EXISTS, PATH_ISFILE +from _loaders.file_test import OPEN, PATH_EXISTS, PATH_ISFILE from pystreamapi.loaders import xml file_content = """ @@ -90,7 +90,7 @@ def test_xml_loader_with_invalid_path(self): def test_xml_loader_with_no_file(self): with self.assertRaises(ValueError): - xml('./') + xml('../') def test_xml_loader_from_string(self): data = xml(file_content, read_from_src=True) diff --git a/tests/_parallel/__init__.py b/tests/_parallel/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_fork_and_join.py b/tests/_parallel/test_fork_and_join.py similarity index 100% rename from tests/test_fork_and_join.py rename to tests/_parallel/test_fork_and_join.py diff --git a/tests/_streams/__init__.py b/tests/_streams/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/_streams/error/__init__.py b/tests/_streams/error/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_error_handler.py b/tests/_streams/error/test_error_handler.py similarity index 100% rename from tests/test_error_handler.py rename to tests/_streams/error/test_error_handler.py diff --git a/tests/test_error_handler_streams.py b/tests/_streams/error/test_error_handler_streams.py similarity index 100% rename from tests/test_error_handler_streams.py rename to tests/_streams/error/test_error_handler_streams.py diff --git a/tests/_streams/numeric/__init__.py b/tests/_streams/numeric/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_numeric_base_stream.py b/tests/_streams/numeric/test_numeric_base_stream.py similarity index 100% rename from tests/test_numeric_base_stream.py rename to tests/_streams/numeric/test_numeric_base_stream.py diff --git a/tests/test_numeric_stream_implementation.py b/tests/_streams/numeric/test_numeric_stream_implementation.py similarity index 100% rename from tests/test_numeric_stream_implementation.py rename to tests/_streams/numeric/test_numeric_stream_implementation.py diff --git a/tests/test_base_stream.py b/tests/_streams/test_base_stream.py similarity index 100% rename from tests/test_base_stream.py rename to tests/_streams/test_base_stream.py diff --git a/tests/test_stream_closed.py b/tests/_streams/test_stream_closed.py similarity index 100% rename from tests/test_stream_closed.py rename to tests/_streams/test_stream_closed.py diff --git a/tests/test_stream_converter.py b/tests/_streams/test_stream_converter.py similarity index 100% rename from tests/test_stream_converter.py rename to tests/_streams/test_stream_converter.py diff --git a/tests/test_stream_implementation.py b/tests/_streams/test_stream_implementation.py similarity index 100% rename from tests/test_stream_implementation.py rename to tests/_streams/test_stream_implementation.py