diff --git a/inkycal/tests/inkycal_feeds_test.py b/inkycal/tests/inkycal_feeds_test.py index 1d84e2a..c5274f5 100644 --- a/inkycal/tests/inkycal_feeds_test.py +++ b/inkycal/tests/inkycal_feeds_test.py @@ -27,8 +27,8 @@ tests = [ { "name": "Feeds", "config": { - "size": [400, 100], - "feed_urls": "http://feeds.bbci.co.uk/news/world/rss.xml#", + "size": [400, 800], + "feed_urls": "https://www.foodandco.fi/modules/MenuRss/MenuRss/CurrentDay?costNumber=3003&language=en", "shuffle_feeds": False, "padding_x": 10, "padding_y": 10, "fontsize": 14, "language": "en" } @@ -57,8 +57,10 @@ class module_test(unittest.TestCase): module = Module(test) im_black, im_colour = module.generate_image() print('OK') - if use_preview == True and environment == 'Raspberry': + if use_preview and environment == 'Raspberry': preview(merge(im_black, im_colour)) + im = merge(im_black, im_colour) + im.show() if __name__ == '__main__': diff --git a/inkycal/tests/inkycal_weather_test.py b/inkycal/tests/inkycal_weather_test.py index ecea43d..60f423d 100644 --- a/inkycal/tests/inkycal_weather_test.py +++ b/inkycal/tests/inkycal_weather_test.py @@ -1,195 +1,195 @@ #!python3 - +import os import unittest from inkycal.modules import Weather as Module from helper_functions import * -environment = get_environment() +environment = get_environment() # Set to True to preview images. Only works on Raspberry Pi OS with Desktop use_preview = False -secret_key = "" +secret_key = os.environ["OPENWEATHERMAP_API_KEY"] or "" location = 'Stuttgart, DE' - tests = [ -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 100], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 150], - "api_key": secret_key, - "location": "2643123", - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 200], - "api_key": secret_key, - "location": location, - "round_temperature": False, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 100], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": False, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 150], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "hourly", - "units": "metric", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 150], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "imperial", - "hour_format": "12", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 100], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "24", - "use_beaufort": True, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, -{ - "position": 1, - "name": "Weather", - "config": { - "size": [500, 100], - "api_key": secret_key, - "location": location, - "round_temperature": True, - "round_windspeed": True, - "forecast_interval": "daily", - "units": "metric", - "hour_format": "12", - "use_beaufort": False, - "padding_x": 10, - "padding_y": 10, - "fontsize": 12, - "language": "en" - } -}, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 100], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 150], + "api_key": secret_key, + "location": "2643123", + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 200], + "api_key": secret_key, + "location": location, + "round_temperature": False, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 100], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": False, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 150], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "hourly", + "units": "metric", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 150], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "imperial", + "hour_format": "12", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 100], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "24", + "use_beaufort": True, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, + { + "position": 1, + "name": "Weather", + "config": { + "size": [500, 100], + "api_key": secret_key, + "location": location, + "round_temperature": True, + "round_windspeed": True, + "forecast_interval": "daily", + "units": "metric", + "hour_format": "12", + "use_beaufort": False, + "padding_x": 10, + "padding_y": 10, + "fontsize": 12, + "language": "en" + } + }, ] -class module_test(unittest.TestCase): - def test_get_config(self): - print('getting data for web-ui...', end = "") - Module.get_config() - print('OK') - def test_generate_image(self): - if secret_key: - for test in tests: - print(f'test {tests.index(test)+1} generating image..') - module = Module(test) - im_black, im_colour = module.generate_image() +class module_test(unittest.TestCase): + def test_get_config(self): + print('getting data for web-ui...', end="") + Module.get_config() print('OK') - if use_preview == True and environment == 'Raspberry': - preview(merge(im_black, im_colour)) - else: - print('No key given, omitted testing') + + def test_generate_image(self): + if secret_key: + for test in tests: + print(f'test {tests.index(test) + 1} generating image..') + module = Module(test) + im_black, im_colour = module.generate_image() + print('OK') + if use_preview == True and environment == 'Raspberry': + preview(merge(im_black, im_colour)) + else: + print('No key given, omitted testing') + if __name__ == '__main__': - - logger = logging.getLogger() - logger.level = logging.DEBUG - logger.addHandler(logging.StreamHandler(sys.stdout)) + logger = logging.getLogger() + logger.level = logging.DEBUG + logger.addHandler(logging.StreamHandler(sys.stdout)) - unittest.main() + unittest.main()