PickwickSoft · garlontas · Dec 30, 2023 · Dec 30, 2023
diff --git a/tests/_conditions/__init__.py b/tests/_conditions/__init__.py
diff --git a/tests/date_test.py → tests/_conditions/date_test.py b/tests/date_test.py → tests/_conditions/date_test.py
diff --git a/tests/test_combiners_conditions.py → .../_conditions/test_combiners_conditions.py b/tests/test_combiners_conditions.py → .../_conditions/test_combiners_conditions.py
diff --git a/tests/test_date_conditions.py → tests/_conditions/test_date_conditions.py b/tests/test_date_conditions.py → 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 → ...ditions/test_date_conditions_type_date.py b/tests/test_date_conditions_type_date.py → ...ditions/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 → tests/_conditions/test_numeric_conditions.py b/tests/test_numeric_conditions.py → tests/_conditions/test_numeric_conditions.py
diff --git a/tests/test_string_conditions.py → tests/_conditions/test_string_conditions.py b/tests/test_string_conditions.py → tests/_conditions/test_string_conditions.py
diff --git a/tests/test_type_conditions.py → tests/_conditions/test_type_conditions.py b/tests/test_type_conditions.py → tests/_conditions/test_type_conditions.py
diff --git a/tests/_itertools/__init__.py b/tests/_itertools/__init__.py
diff --git a/tests/test_itertools.py → tests/_itertools/test_itertools.py b/tests/test_itertools.py → tests/_itertools/test_itertools.py
diff --git a/tests/_lazy/__init__.py b/tests/_lazy/__init__.py
diff --git a/tests/helper.py → tests/_lazy/helper.py b/tests/helper.py → tests/_lazy/helper.py
diff --git a/tests/test_process.py → tests/_lazy/test_process.py b/tests/test_process.py → 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 → tests/_lazy/test_queue.py b/tests/test_queue.py → 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
diff --git a/tests/file_test.py → tests/_loaders/file_test.py b/tests/file_test.py → tests/_loaders/file_test.py
diff --git a/tests/test_csv_loader.py → tests/_loaders/test_csv_loader.py b/tests/test_csv_loader.py → 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 → tests/_loaders/test_json_loader.py b/tests/test_json_loader.py → 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 → tests/_loaders/test_xml_loader.py b/tests/test_xml_loader.py → 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
diff --git a/tests/test_fork_and_join.py → tests/_parallel/test_fork_and_join.py b/tests/test_fork_and_join.py → tests/_parallel/test_fork_and_join.py
diff --git a/tests/_streams/__init__.py b/tests/_streams/__init__.py
diff --git a/tests/_streams/error/__init__.py b/tests/_streams/error/__init__.py
diff --git a/tests/test_error_handler.py → tests/_streams/error/test_error_handler.py b/tests/test_error_handler.py → tests/_streams/error/test_error_handler.py
diff --git a/tests/test_error_handler_streams.py → ...reams/error/test_error_handler_streams.py b/tests/test_error_handler_streams.py → ...reams/error/test_error_handler_streams.py
diff --git a/tests/_streams/numeric/__init__.py b/tests/_streams/numeric/__init__.py
diff --git a/tests/test_numeric_base_stream.py → ...reams/numeric/test_numeric_base_stream.py b/tests/test_numeric_base_stream.py → ...reams/numeric/test_numeric_base_stream.py
diff --git a/tests/test_numeric_stream_implementation.py → ...ric/test_numeric_stream_implementation.py b/tests/test_numeric_stream_implementation.py → ...ric/test_numeric_stream_implementation.py
diff --git a/tests/test_base_stream.py → tests/_streams/test_base_stream.py b/tests/test_base_stream.py → tests/_streams/test_base_stream.py
diff --git a/tests/test_stream_closed.py → tests/_streams/test_stream_closed.py b/tests/test_stream_closed.py → tests/_streams/test_stream_closed.py
diff --git a/tests/test_stream_converter.py → tests/_streams/test_stream_converter.py b/tests/test_stream_converter.py → tests/_streams/test_stream_converter.py
diff --git a/tests/test_stream_implementation.py → tests/_streams/test_stream_implementation.py b/tests/test_stream_implementation.py → tests/_streams/test_stream_implementation.py