Merge branch 'test_folders' into sea_tests

lcnetdev · Dec 11, 2024 · 81182e4 · 81182e4
2 parents aeb13fc + 03c0fcd
commit 81182e4
Show file tree

Hide file tree

Showing 31 changed files with 11 additions and 7 deletions.
diff --git a/sscli b/sscli
@@ -10,7 +10,7 @@ from os import path
 
 from scriptshifter import DB_PATH
 from scriptshifter.tables import init_db as _init_db
-from tests.integration_tests import test_sample
+from test.integration import test_sample
 
 
 @click.group()

diff --git a/test/__init__.py b/test/__init__.py
@@ -0,0 +1,5 @@
+from os import path
+
+
+TEST_DIR = path.dirname(path.realpath(__file__))
+TEST_DATA_DIR = path.join(TEST_DIR, "data")
diff --git a/test/data/log/.keep b/test/data/log/.keep
diff --git a/tests/data/script_samples/arabic.csv → test/data/script_samples/arabic.csv b/tests/data/script_samples/arabic.csv → test/data/script_samples/arabic.csv
diff --git a/tests/data/script_samples/arabic2.csv → test/data/script_samples/arabic2.csv b/tests/data/script_samples/arabic2.csv → test/data/script_samples/arabic2.csv
diff --git a/tests/data/script_samples/chinese.csv → test/data/script_samples/chinese.csv b/tests/data/script_samples/chinese.csv → test/data/script_samples/chinese.csv
diff --git a/tests/data/script_samples/cyrillic.csv → test/data/script_samples/cyrillic.csv b/tests/data/script_samples/cyrillic.csv → test/data/script_samples/cyrillic.csv
diff --git a/tests/data/script_samples/greek.csv → test/data/script_samples/greek.csv b/tests/data/script_samples/greek.csv → test/data/script_samples/greek.csv
diff --git a/tests/data/script_samples/hebrew.csv → test/data/script_samples/hebrew.csv b/tests/data/script_samples/hebrew.csv → test/data/script_samples/hebrew.csv
diff --git a/tests/data/script_samples/korean.csv → test/data/script_samples/korean.csv b/tests/data/script_samples/korean.csv → test/data/script_samples/korean.csv
diff --git a/tests/data/script_samples/sea.csv → test/data/script_samples/sea.csv b/tests/data/script_samples/sea.csv → test/data/script_samples/sea.csv
diff --git a/tests/data/script_samples/tibetan.csv → test/data/script_samples/tibetan.csv b/tests/data/script_samples/tibetan.csv → test/data/script_samples/tibetan.csv
diff --git a/tests/data/script_samples/unclassified.csv → test/data/script_samples/unclassified.csv b/tests/data/script_samples/unclassified.csv → test/data/script_samples/unclassified.csv
diff --git a/tests/data/script_samples/unittest.csv → test/data/script_samples/unittest.csv b/tests/data/script_samples/unittest.csv → test/data/script_samples/unittest.csv
diff --git a/tests/integration_tests.py → test/integration.py b/tests/integration_tests.py → test/integration.py
@@ -5,7 +5,7 @@
 from os import path
 
 from scriptshifter.trans import transliterate
-from tests import TEST_DATA_DIR
+from test import TEST_DATA_DIR
 
 logger = getLogger(__name__)
 

diff --git a/tests/__init__.py → test/unittest/__init__.py b/tests/__init__.py → test/unittest/__init__.py
@@ -6,12 +6,11 @@
 from scriptshifter import tables
 
 
-TEST_DIR = path.dirname(path.realpath(__file__))
-TEST_DATA_DIR = path.join(TEST_DIR, "data")
-TEST_CONFIG_DIR = path.join(TEST_DIR, "tables", "data")
+UNITTEST_CONFIG_DIR = path.join(
+        path.dirname(path.realpath(__file__)), "tables", "data")
 
 # Reload main SS modules after changing environment variables.
 environ["TXL_DB_PATH"] = path.join(gettempdir(), "scriptshifter_unittest.db")
 reload(scriptshifter)
-environ["TXL_CONFIG_TABLE_DIR"] = TEST_CONFIG_DIR
+environ["TXL_CONFIG_TABLE_DIR"] = UNITTEST_CONFIG_DIR
 reload(tables)
diff --git a/tests/tables/data/_base1.yml → test/unittest/tables/data/_base1.yml b/tests/tables/data/_base1.yml → test/unittest/tables/data/_base1.yml
diff --git a/tests/tables/data/_base2.yml → test/unittest/tables/data/_base2.yml b/tests/tables/data/_base2.yml → test/unittest/tables/data/_base2.yml
diff --git a/tests/tables/data/_base3.yml → test/unittest/tables/data/_base3.yml b/tests/tables/data/_base3.yml → test/unittest/tables/data/_base3.yml
diff --git a/tests/tables/data/cap_base1.yml → test/unittest/tables/data/cap_base1.yml b/tests/tables/data/cap_base1.yml → test/unittest/tables/data/cap_base1.yml
diff --git a/tests/tables/data/cap_base2.yml → test/unittest/tables/data/cap_base2.yml b/tests/tables/data/cap_base2.yml → test/unittest/tables/data/cap_base2.yml
diff --git a/tests/tables/data/cap_inherited.yml → test/unittest/tables/data/cap_inherited.yml b/tests/tables/data/cap_inherited.yml → test/unittest/tables/data/cap_inherited.yml
diff --git a/tests/tables/data/inherited.yml → test/unittest/tables/data/inherited.yml b/tests/tables/data/inherited.yml → test/unittest/tables/data/inherited.yml
diff --git a/tests/tables/data/ordering.yml → test/unittest/tables/data/ordering.yml b/tests/tables/data/ordering.yml → test/unittest/tables/data/ordering.yml
diff --git a/tests/tables/data/regex.yml → test/unittest/tables/data/regex.yml b/tests/tables/data/regex.yml → test/unittest/tables/data/regex.yml
diff --git a/tests/tables/data/rot3.yml → test/unittest/tables/data/rot3.yml b/tests/tables/data/rot3.yml → test/unittest/tables/data/rot3.yml
diff --git a/tests/tables/index.yml → test/unittest/tables/index.yml b/tests/tables/index.yml → test/unittest/tables/index.yml
diff --git a/tests/test01_cfg.py → test/unittest/test01_cfg.py b/tests/test01_cfg.py → test/unittest/test01_cfg.py
diff --git a/tests/test02_transliteration.py → test/unittest/test02_transliteration.py b/tests/test02_transliteration.py → test/unittest/test02_transliteration.py
@@ -7,7 +7,7 @@
 
 from scriptshifter.trans import transliterate
 from scriptshifter.tables import get_language, init_db
-from tests import TEST_DATA_DIR
+from test import TEST_DATA_DIR
 
 
 logger = logging.getLogger(__name__)

diff --git a/tests/test03_capitalization.py → test/unittest/test03_capitalization.py b/tests/test03_capitalization.py → test/unittest/test03_capitalization.py
diff --git a/tests/test04_rest_api.py → test/unittest/test04_rest_api.py b/tests/test04_rest_api.py → test/unittest/test04_rest_api.py