prepared for next release.

4 files changed, 314 insertions, 87 deletions

diff --git a/test/test_config/test_files.py b/test/test_config/test_files.py
new file mode 100644
index 0000000..7d32a07
--- /dev/null
+++ b/test/test_config/test_files.py
@@ -0,0 +1,135 @@
+# Copyright (C) 2010  Leonard Thomas
+#
+# This file is part of Dodai.
+#
+# Dodai is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Dodai is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+import unittest
+path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
+sys.path.append(path)
+from ConfigParser import ConfigParser
+from ConfigParser import MissingSectionHeaderError
+from dodai.config.files import ConfigFiles
+from dodai.tools.odict import OrderedDict
+from dodai.tools.himo import String2Himo
+from dodai.tools import Section
+from dodai.exception import InvalidConfigParser
+from dodai.exception import FileDoesNotExist
+from dodai.exception import FileIsDirectory
+
+
+class GoodParser(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]
+
+    def read(self, filename):
+        return [filename]
+
+class BadParser(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 get(self, section, option):
+        return self.DATA[section][option]
+
+    def read(self, filename):
+        return [filename]
+
+class TestFiles(unittest.TestCase):
+
+    def setUp(self):
+        s2h = String2Himo()
+        self.obj = ConfigFiles(OrderedDict, Section, s2h)
+
+    def test_good_parser(self):
+        self.obj.register_parser_object(GoodParser)
+
+    def test_bad_parser(self):
+        self.failUnlessRaises(InvalidConfigParser,
+                              self.obj.register_parser_object,
+                              BadParser)
+
+    def test_add(self):
+        filename = os.path.realpath(__file__)
+        self.obj.add(filename)
+        self.assertTrue(filename in self.obj.files)
+
+    def test_add_bad_file(self):
+        filename = os.path.dirname(os.path.realpath(__file__))
+        filename = os.path.join(filename, 'no_way_jose.234dasf2345')
+        self.failUnlessRaises(FileDoesNotExist,
+                              self.obj.add,
+                              filename)
+
+    def test_add_directory(self):
+        filename = os.path.dirname(os.path.realpath(__file__))
+        self.failUnlessRaises(FileIsDirectory,
+                              self.obj.add,
+                              filename)
+
+    def file_test_read(self):
+        filename = os.path.realpath(__file__)
+        self.obj.register_parser_object(GoodParser)
+        self.obj.add(filename)
+        sec = self.obj.load()
+
+    def test_bad_read(self):
+        self.obj.register_parser_object(ConfigParser)
+        filename = os.path.realpath(__file__)
+        self.obj.add(filename)
+        self.failUnlessRaises(MissingSectionHeaderError, self.obj.load)
+
+    def test_good_read_with_multiple_parsers(self):
+        self.obj.register_parser_object(ConfigParser)
+        self.obj.register_parser_object(GoodParser)
+        filename = os.path.realpath(__file__)
+        self.obj.add(filename)
+        sec = self.obj.load()
+
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__':
diff --git a/test/test_dodai.py b/test/test_dodai.py
index b95f71f..fbd4667 100644
--- a/test/test_dodai.py
+++ b/test/test_dodai.py
@@ -15,8 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
+import sys
 import os
+import unittest
+path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
+sys.path.append(path)
 from dodai import Configure
 
 class TestConfigure(unittest.TestCase):
@@ -29,11 +32,13 @@ class TestConfigure(unittest.TestCase):
         self.obj = Configure('test472j02ju-sfgj', config_files=[filename])
 
     def test_results(self):
-        files = self.obj.files._files
-        print files
+        files = self.obj.files.files
         self.assertTrue(len(files) == 1)
 
     def test_add_files(self):
         self.obj._add_files(self.filename)
-        files = self.obj.files._files
+        files = self.obj.files.files
         self.assertTrue(len(files) == 1)
+
+
+
diff --git a/test/test_tools/test_init.py b/test/test_tools/test_init.py
new file mode 100644
index 0000000..16d7dda
--- /dev/null
+++ b/test/test_tools/test_init.py
@@ -0,0 +1,97 @@
+# Copyright (C) 2010  Leonard Thomas
+#
+# This file is part of Dodai.
+#
+# Dodai is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Dodai is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+import unittest
+path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
+sys.path.append(path)
+from dodai.tools import home_directory
+from dodai.tools import config_directory_system
+from dodai.tools import config_directory_user
+from dodai.tools import config_directory_project
+from dodai.tools import config_directories
+from dodai.tools import list_to_english
+from dodai.tools import Section
+from dodai.tools import normalize_unicode
+from dodai.tools import quote_list
+
+class TestTools(unittest.TestCase):
+
+    def setUp(self):
+        self.project_name = 'foo'
+
+    def test_home_directory(self):
+        try:
+            from win32com.shell import shellcon, shell
+        except ImportError:
+            dir = os.path.expanduser("~")
+        else:
+            dir = shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0)
+        self.assertEquals(dir, home_directory())
+
+    def test_config_directory_system(self):
+        config_directory_system()
+
+    def test_config_directory_user(self):
+        project_dir = '.{0}'.format(self.project_name)
+        project_dir = os.path.join(home_directory(), project_dir)
+        data = config_directory_user(self.project_name)
+        self.assertEquals(data, project_dir)
+
+    def test_config_directory_project(self):
+        config_directory_project()
+
+    def test_config_directories(self):
+        config_directories(self.project_name)
+
+    def test_list_to_english_one(self):
+        data = [1, 2, 3, 4, 5]
+        result = "1, 2, 3, 4 and 5"
+        self.assertEquals(result, list_to_english(data))
+
+    def test_list_to_english_two(self):
+        data = [1, 2]
+        result = "1 and 2"
+        self.assertEquals(result, list_to_english(data))
+
+    def test_section_one(self):
+        title = 'bar'
+        sec = Section(title)
+        self.assertEquals(title, sec.get_section_title())
+
+    def test_section_two(self):
+        title = 'bar'
+        sec = Section(title)
+        sec['el'] = 'hey'
+        self.assertEquals('hey', sec['el'])
+
+    def test_normalize_unicode(self):
+        a = u'\u212b'
+        b = u'\xc5'
+        a = normalize_unicode(a)
+        self.assertEquals(a, b)
+
+    def test_quote_list_one(self):
+        a = ['a', 'b', 'c']
+        b = ['"a"', '"b"', '"c"']
+        self.assertEquals(b, quote_list(a, True))
+
+    def test_quote_list_two(self):
+        a = ['a', 'b', 'c']
+        b = ["'a'", "'b'", "'c'"]
+        self.assertEquals(b, quote_list(a))