Added constants for testing. Refactored folder locations to run tests from root. Moved pytest.ini back to root.

Author: jezs00

pycasso/constants.py

@@ -133,3 +133,16 @@ class DisplayShapeConst(Enum):
     CROSS = 1
     TRIANGLE = 2
     CIRCLE = 3
+
+
+class TestConst(Enum):
+    TEST_FOLDER = "tests/"
+    FILE_OPERATIONS_FOLDER = "test_file_operations_content"
+    CONFIG_FILE = ".testconfig"
+    CONFIG_FOLDER = "test_config_wrapper_content"
+    TEMP_FOLDER = "test_temp"
+    PYCASSO_FOLDER = "test_pycasso_content"
+    ARTISTS_FILE = "artists.txt"
+    SUBJECTS_FILE = "subjects.txt"
+    PROMPTS_FILE = "prompts.txt"
+    FONT_FILE = "Font.ttc"

tests/pytest.ini renamed to pytest.ini

@@ -4,16 +4,21 @@
 
 import os
 from pycasso.config_wrapper import Configs
+from pycasso.constants import TestConst
 
 
 def test_init():
-    config_path = os.path.join(os.getcwd(), 'test_config_wrapper_content/.testconfig')
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.CONFIG_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     config = Configs(config_path)
+
+    assert config.add_text is False
     assert config.infill is False
 
 
 def test_read_config():
-    config_path = os.path.join(os.getcwd(), 'test_config_wrapper_content/.testconfig')
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.CONFIG_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     config = Configs(config_path)
     config.read_config()
 

tests/test_config_wrapper.py

@@ -5,10 +5,11 @@
 import os
 import collections
 from pycasso.file_operations import FileOperations
+from pycasso.constants import TestConst
 
 
 def test_get_all_files():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     test_file = FileOperations(directory)
     result = test_file.get_all_files()
     expected = [os.path.join(directory, "lines.txt"),
@@ -19,7 +20,7 @@ def test_get_all_files():
 
 
 def test_get_all_files_of_type():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     test_file = FileOperations(directory)
     result = test_file.get_all_files_of_type("png")
     expected = os.path.join(directory, "test.png")
@@ -28,7 +29,7 @@ def test_get_all_files_of_type():
 
 
 def test_get_random_file():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     test_file = FileOperations(directory)
     result = test_file.get_random_file()
     expected = [os.path.join(directory, "lines.txt"),
@@ -38,7 +39,7 @@ def test_get_random_file():
 
 
 def test_get_random_file_of_type():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     test_file = FileOperations(directory)
     result = test_file.get_random_file_of_type("txt")
     expected = [os.path.join(directory, "lines.txt"),
@@ -73,23 +74,23 @@ def test_remove_text():
 
 
 def test_get_lines():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     path = os.path.join(directory, "lines.txt")
     result = FileOperations.get_lines(path)
     expected = ["first_line", "second_line", "third_line"]
     assert result == expected
 
 
 def test_get_random_line():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     path = os.path.join(directory, "lines.txt")
     result = FileOperations.get_random_line(path)
     expected = ["first_line", "second_line", "third_line"]
     assert result in expected
 
 
 def test_backup_file_both_exist():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     primary_path = os.path.join(directory, "lines.txt")
     backup_path = os.path.join(directory, "lines.txt")
     result = FileOperations.backup_file(primary_path, backup_path)
@@ -98,8 +99,8 @@ def test_backup_file_both_exist():
 
 
 def test_backup_file_no_primary():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
-    temp_directory = os.path.join(os.getcwd(), "test_temp")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
+    temp_directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.TEMP_FOLDER.value)
     primary_path = os.path.join(temp_directory, "new_file.txt")
     backup_path = os.path.join(directory, "lines.txt")
 
@@ -118,7 +119,7 @@ def test_backup_file_no_primary():
 
 
 def test_backup_file_fail():
-    temp_directory = os.path.join(os.getcwd(), "test_temp")
+    temp_directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.TEMP_FOLDER.value)
     primary_path = os.path.join(temp_directory, "new_file.txt")
     backup_path = os.path.join(temp_directory, "non_existent.txt")
 
@@ -140,7 +141,7 @@ def test_backup_file_fail():
 
 
 def test_get_full_path():
-    directory = os.path.join(os.getcwd(), "test_file_operations_content")
+    directory = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.FILE_OPERATIONS_FOLDER.value)
     test_file = FileOperations(directory)
     result = test_file.get_full_path("test.png")
     expected = os.path.join(directory, "test.png")

tests/test_file_operations.py

@@ -5,23 +5,24 @@
 import os.path
 
 from omni_epd import displayfactory
-from pycasso.constants import PromptModeConst, PropertiesConst, ConfigConst, ProvidersConst
+from pycasso.constants import PromptModeConst, PropertiesConst, ConfigConst, ProvidersConst, TestConst
 from pycasso.pycasso import Pycasso
 from PIL import Image, PngImagePlugin, ImageDraw
 
 
 def test_parse_args():
-    config_path = os.path.join(os.getcwd(), "test_pycasso_content", ".testconfig")
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     instance = Pycasso(config_path)
     expected = 0
     assert instance.args.savekeys == expected
 
 
 def test_load_config():
-    config_path = os.path.join(os.getcwd(), "test_pycasso_content", ".testconfig")
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     instance = Pycasso(config_path)
-    path = os.path.join(os.getcwd(), "test_pycasso_content", ".testconfig")
-    config = instance.load_config(path)
+    config = instance.load_config(config_path)
     expected = 160
     assert config.opacity == expected
 
@@ -48,7 +49,7 @@ def test_display_image_on_epd():
 
 
 def test_load_external_image():
-    path = os.path.join(os.getcwd(), "test_pycasso_content")
+    path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value)
     tup = Pycasso.load_external_image(path, 400, 400)
     pixel = tup[0].getpixel((200, 200))
     expected = (158, 142, 138)
@@ -57,7 +58,7 @@ def test_load_external_image():
 
 
 def test_load_historic_image_load_image():
-    path = os.path.join(os.getcwd(), "test_pycasso_content")
+    path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value)
     tup = Pycasso.load_historic_image(path)
     pixel = tup[0].getpixel((200, 200))
     expected = (158, 142, 138)
@@ -66,7 +67,7 @@ def test_load_historic_image_load_image():
 
 
 def test_load_historic_image_load_metadata():
-    path = os.path.join(os.getcwd(), "test_pycasso_content")
+    path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value)
     tup = Pycasso.load_historic_image(path)
     title = tup[1]
     artist = tup[2]
@@ -78,7 +79,8 @@ def test_load_historic_image_load_metadata():
 
 
 def test_prep_prompt_text():
-    config_path = os.path.join(os.getcwd(), "test_pycasso_content", ".testconfig")
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     instance = Pycasso(config_path)
     tup = instance.prep_prompt_text(PromptModeConst.PROMPT.value)
     expected_prompt = "PreambleTest PromptPostscript"
@@ -96,8 +98,10 @@ def test_prep_subject_artist_prompt():
     preamble = "Preamble"
     connector = "Connector"
     postscript = "Postscript"
-    artist_path = os.path.join(os.getcwd(), "test_pycasso_content", "artists.txt")
-    subject_path = os.path.join(os.getcwd(), "test_pycasso_content", "subjects.txt")
+    artist_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.ARTISTS_FILE.value)
+    subject_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                                TestConst.SUBJECTS_FILE.value)
     prompt, artist_text, title_text = Pycasso.prep_subject_artist_prompt(artist_path, subject_path, preamble, connector,
                                                                          postscript)
     expected_prompt = "PreambleTest SubjectConnectorTest ArtistPostscript"
@@ -111,7 +115,8 @@ def test_prep_subject_artist_prompt():
 def test_prep_normal_prompt():
     preamble = "Preamble"
     postscript = "Postscript"
-    prompt_path = os.path.join(os.getcwd(), "test_pycasso_content", "prompts.txt")
+    prompt_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.PROMPTS_FILE.value)
     prompt, title_text = Pycasso.prep_normal_prompt(prompt_path, preamble, postscript)
     expected_prompt = "PreambleTest PromptPostscript"
     expected_title = "Test Prompt"
@@ -121,7 +126,7 @@ def test_prep_normal_prompt():
 
 
 def test_save_image():
-    dir_path = os.path.join(os.getcwd(), "test_temp")
+    dir_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.TEMP_FOLDER.value)
     save_path = os.path.join(dir_path,
                              PropertiesConst.FILE_PREAMBLE.value + "TestPrompt." + ConfigConst.FILE_IMAGE_FORMAT.value)
     img = Image.new(mode="RGBA", size=(600, 400))
@@ -143,7 +148,8 @@ def test_save_image():
 
 
 def test_get_random_provider_mode():
-    config_path = os.path.join(os.getcwd(), "test_pycasso_content", ".testconfig")
+    config_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                               TestConst.CONFIG_FILE.value)
     instance = Pycasso(config_path)
     provider = instance.get_random_provider_mode()
     expected = [ProvidersConst.EXTERNAL.value, ProvidersConst.HISTORIC.value]
@@ -153,7 +159,8 @@ def test_get_random_provider_mode():
 def test_add_text_to_image():
     title_text = "TITLE"
     artist_text = "ARTIST"
-    font_path = os.path.join(os.getcwd(), "test_pycasso_content", "Font.ttc")
+    font_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                             TestConst.FONT_FILE.value)
     img = Image.new(mode="RGBA", size=(600, 400))
     draw = ImageDraw.Draw(img, "RGBA")
 
@@ -168,7 +175,8 @@ def test_add_text_to_image():
 def test_add_text_to_image_blank():
     title_text = ""
     artist_text = ""
-    font_path = os.path.join(os.getcwd(), "test_pycasso_content", "Font.ttc")
+    font_path = os.path.join(os.getcwd(), TestConst.TEST_FOLDER.value, TestConst.PYCASSO_FOLDER.value,
+                             TestConst.FONT_FILE.value)
     img = Image.new(mode="RGBA", size=(600, 400))
     draw = ImageDraw.Draw(img, "RGBA")
 
@@ -178,5 +186,3 @@ def test_add_text_to_image_blank():
     expected = (0, 0, 0, 0)
 
     assert pixel == expected
-
-

tests/test_pycasso.py

@@ -2,9 +2,9 @@
 
 save_image=False
 image_format=jpg
-subjects_file=test_pycasso_content/subjects.txt
-artists_file=test_pycasso_content/artists.txt
-prompts_file=test_pycasso_content/prompts.txt
+subjects_file=tests/test_pycasso_content/subjects.txt
+artists_file=tests/test_pycasso_content/artists.txt
+prompts_file=tests/test_pycasso_content/prompts.txt
 
 [Prompt]