overhaul to configParser. Parsing config works now.

test/test_settings.py

@@ -3,32 +3,81 @@ import unittest
 from overviewer_core import configParser
 from overviewer_core.settingsValidators import ValidationException
 
+from overviewer_core import world
+from overviewer_core import rendermodes
+
 class SettingsTest(unittest.TestCase):
     
+    def setUp(self):
+        self.s = configParser.MultiWorldParser()
+    
     def test_missing(self):
         "Validates that a non-existant settings.py causes an exception"
-        self.assertRaises(ValueError, configParser.MultiWorldParser, "doesnotexist.py")
+        self.assertRaises(ValueError, self.s.parse, "doesnotexist.py")
+
     def test_existing_file(self):
-        s = configParser.MultiWorldParser("test/data/settings/settings_test_1.py")
-        s.parse()
-        s.validate()
-        things = s.get_render_things()
-        # no exceptions so far.  that's good
-        self.assertEquals(things['world']['bgcolor'], (26,26,26,0))
-        self.assertEquals(things['otherworld']['bgcolor'], (255,255,255,0))
+        self.s.parse("test/data/settings/settings_test_1.py")
+        things = self.s.get_validated_config()
+        # no exceptions so far.  that's a good thing
+
+        # Test the default
+        self.assertEquals(things['render']['myworld']['bgcolor'], (26,26,26,0))
+
+        # Test a non-default
+        self.assertEquals(things['render']['otherworld']['bgcolor'], (255,255,255,0))
+
+        self.assertEquals(things['render']['myworld']['northdirection'],
+               world.UPPER_LEFT) 
 
     def test_rendermode_validation(self):
-        s = configParser.MultiWorldParser("test/data/settings/settings_test_rendermode.py")
-        s.parse()
+        self.s.parse("test/data/settings/settings_test_rendermode.py")
 
-        self.assertRaises(ValidationException,s.validate)
+        self.assertRaises(ValidationException,self.s.get_validated_config)
 
-    def test_bgcolor_validation(self):
-        s = configParser.MultiWorldParser("test/data/settings/settings_test_bgcolor.py")
-        s.parse()
+    def test_manual(self):
+        """Tests that manually setting the config parser works, you don't have
+        to do it from a file
+        
+        """
+        fromfile = configParser.MultiWorldParser()
+        fromfile.parse("test/data/settings/settings_test_1.py")
 
-        self.assertRaises(ValidationException, s.validate)
+        self.s.set_config_item("world", {
+            'test': "test/data/settings/test_world",
+            })
+        self.s.set_config_item("render", {
+                "myworld": { 
+                    "title": "myworld title",
+                    "worldname": "test",
+                    "rendermode": rendermodes.normal,
+                    "northdirection": "upper-left",
+                },
 
+                "otherworld": {
+                    "title": "otherworld title",
+                    "worldname": "test",
+                    "rendermode": rendermodes.normal,
+                    "bgcolor": "#ffffff"
+                },
+            })
+        self.s.set_config_item("outputdir", "/tmp/fictional/outputdir")
+        self.assertEquals(fromfile.get_validated_config(), self.s.get_validated_config())
+
+    def test_rendermode_string(self):
+        self.s.set_config_item("world", {
+            'test': "test/data/settings/test_world",
+            })
+        self.s.set_config_item("outputdir", "/tmp/fictional/outputdir")
+        self.s.set_config_item("render", {
+                "myworld": { 
+                    "title": "myworld title",
+                    "worldname": "test",
+                    "rendermode": "normal",
+                    "northdirection": "upper-left",
+                },
+                })
+        p = self.s.get_validated_config()
+        self.assertEquals(p['render']['myworld']['rendermode'], rendermodes.normal)
 
 if __name__ == "__main__":
     unittest.main()