Code cleanup, adapting modules for new web-ui

inkycal/tests/inkycal_calendar_test.py

@@ -1,26 +1,34 @@
 import unittest
-from inkycal.modules import Calendar
+from inkycal.modules import Calendar as Module
 
-calendar = Calendar(
-  #size
-  (400,400),
+test = {
+  "position": 2,
+  "name": "Calendar",
+  "config": {
+    "size": [880,343],
+    "week_starts_on": "Monday",
+    "show_events": "True",
+    "ical_urls": "https://www.officeholidays.com/ics-fed/usa",
+    "ical_files": "",
+    "date_format": "D MMM",
+    "time_format": "HH:mm",
+    "padding_x": 10,
+    "padding_y": 10,
+    "fontsize": 12,
+    "language": "en"
+    }
+}
 
-  # common config
-  {
-  'language': 'en',
-  'units': 'metric',
-  'hours': 24,
-  # module-specific config
-  'week_starts_on': 'Monday',
-  'ical_urls': ['https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics']
-  }
-  )
+module = Module(test)
+
+class module_test(unittest.TestCase):
+  def test_get_config(self):
+    print('getting data for web-ui')
+    module.get_config()
 
-class inkycal_calendar_test(unittest.TestCase):
   def test_generate_image(self):
     print('testing image generation')
-    calendar.generate_image()
-
+    module.generate_image()
 
 if __name__ == '__main__':
   unittest.main()