1 files changed, 73 insertions, 83 deletions

diff --git a/test/test_config/test_sections.py b/test/test_config/test_sections.py
index 39b41a7..2ca7e4f 100644
--- a/test/test_config/test_sections.py
+++ b/test/test_config/test_sections.py
@@ -17,101 +17,91 @@
 
 import sys
 import os
-import ConfigParser
 import unittest
 path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
 sys.path.append(path)
+from dodai.config.sections import ConfigSections
 from dodai.tools.himo import Himo
 from dodai.tools.himo import String2Himo
-from dodai.config.sections import ConfigSections
+from dodai.tools.odict import OrderedDict
+from dodai.tools import Section
+
+class Parser(object):
+
+    DATA = OrderedDict()
+    DATA['sec_a'] = OrderedDict()
+    DATA['sec_a']['opt_a'] = 'foo'
+    DATA['sec_a']['opt_b'] = 'bar'
+    DATA['sec_a']['opt_c'] = '1'
+    DATA['sec_a']['opt_d'] = '22'
+
+    DATA['sec_b'] = OrderedDict()
+    DATA['sec_b']['opt_a'] = 'lt'
+    DATA['sec_b']['opt_b'] = 'el'
+    DATA['sec_b']['opt_c'] = 'mg'
+    DATA['sec_b']['opt_d'] = 'ds'
+
+    def sections(self):
+        return self.DATA.keys()
+
+    def options(self, section):
+        return self.DATA[section].keys()
+
+    def get(self, section, option):
+        return self.DATA[section][option]
 
 
 class TestSections(unittest.TestCase):
 
     def setUp(self):
-        path = os.path.dirname(__file__)
-        filepath = os.path.join(path, 'config.cfg')
-        self.parser = ConfigParser.ConfigParser()
-        self.parser.readfp(open(filepath))
-        self.sections = ConfigSections(String2Himo())
+        s2h = String2Himo()
+        self.obj = ConfigSections(OrderedDict, Section, s2h)
+        self.parser = Parser()
 
     def test_call(self):
-        self.sections(self.parser)
-        count = len(self.parser.sections())
-        self.assertEqual(count, len(self.sections))
-
-    def test_iterator(self):
-        result = True
-        for section in self.sections:
-            if not section.get_title() in self.parser.sections():
-                result = False
-        self.assertTrue(result==True)
-
-    def test_get_section(self):
-        self.sections(self.parser)
-        self.sections(self.parser)
-        check = self.sections.get_section('test_db')
-        self.assertEqual(check.get_title(), 'test_db')
-
-    def test_build_string_object(self):
-        sections = ConfigSections()
-        sections(self.parser)
-        count = len(self.parser.sections())
-        self.assertEqual(count, len(sections))
-
-    def test_getitem(self):
-        self.sections(self.parser)
-        title = self.sections['test_db'].get_title()
-        self.assertEqual(title, 'test_db')
-
-    def test_getattr(self):
-        self.sections(self.parser)
-        title = self.sections.test_db.get_title()
-        self.assertEqual(title, 'test_db')
-
-    def test_get_keys(self):
-        self.sections(self.parser)
-        keys = self.sections.keys()
-        self.assertTrue(len(keys))
-
-    def test_section_object_one(self):
-        self.sections(self.parser)
-        keys = self.sections.test_db.keys()
-        self.assertTrue(len(keys))
-
-    def test_section_object_two(self):
-        self.sections(self.parser)
-        keys = self.sections.test_db.___options___.keys()
-        self.assertTrue(len(keys))
-
-    def test_section_object_three(self):
-        self.sections(self.parser)
-        self.sections.test_db.___blah___ = 'test'
-        val = self.sections.test_db.__getattr__('___blah___')
-        self.assertTrue(val == 'test')
-
-    def test_section_object_four(self):
-        self.sections(self.parser)
-        self.sections.test_db.foo = 'bar'
-        val = self.sections.test_db.__getattr__('foo')
-        self.assertTrue(val == 'bar')
-
-    def test_section_object_five(self):
-        self.sections(self.parser)
-        keys = []
-        for key in self.sections.test_db:
-            keys.append(key)
-        self.assertTrue(keys)
-
-    def test_section_object_six(self):
-        self.sections(self.parser)
-        self.sections.test_db.foo = 'bar'
-        val = self.sections.test_db['foo']
-        self.assertTrue(val == 'bar')
-
-    def test_section_object_seven(self):
-        self.sections(self.parser, 'unicode_escape')
-        self.assertEqual(self.sections.extra.name, u'\u8c61')
+        self.obj(self.parser)
+
+    def test_two(self):
+        self.obj(self.parser)
+        key = String2Himo('sec_a')
+        self.obj.__getitem__('sec_a')
+        self.obj.sec_a
+
+    def test_results_one(self):
+        self.obj(self.parser)
+        for section in self.obj.keys():
+            self.assertTrue(section in self.parser.sections())
+
+    def test_results_two(self):
+        self.obj(self.parser)
+        for section, data in self.obj.items():
+            for key in data.keys():
+                self.assertTrue(key in self.parser.options(section))
+
+    def test_results_three(self):
+        self.obj(self.parser)
+        for section, data in self.obj.items():
+            for option, val in data.items():
+                self.assertTrue(val, self.parser.get(section, option))
+
+    def test_results_four(self):
+        self.obj(self.parser)
+        for section in self.parser.sections():
+            self.assertTrue(section in self.obj)
+
+    def test_results_five(self):
+        self.obj(self.parser)
+        for section in self.parser.sections():
+            for option in self.parser.options(section):
+                self.assertTrue(option in self.obj[section])
+
+    def test_results_six(self):
+        self.obj(self.parser)
+        for section in self.parser.sections():
+            for option in self.parser.options(section):
+                val = self.parser.get(section, option)
+                self.assertEquals(val, self.obj[section][option])
+
 
 
 if __name__ == '__main__':