Merge "add more realistic unit tests for importutils"

2 files changed, 45 insertions, 0 deletions

diff --git a/tests/unit/fake/__init__.py b/tests/unit/fake/__init__.py
new file mode 100644
index 0000000..4941366
--- /dev/null
+++ b/tests/unit/fake/__init__.py
@@ -0,0 +1,25 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+class FakeDriver():
+    def __init__(self, first_arg=True):
+        self.first_arg = first_arg
+
+
+class FakeDriver2():
+    def __init__(self, first_arg):
+        self.first_arg = first_arg
diff --git a/tests/unit/test_importutils.py b/tests/unit/test_importutils.py
index e9b5b2e..acdb217 100644
--- a/tests/unit/test_importutils.py
+++ b/tests/unit/test_importutils.py
@@ -23,6 +23,7 @@ from openstack.common import importutils
 
 
 class ImportUtilsTest(unittest.TestCase):
+
     # NOTE(jkoelker) There has GOT to be a way to test this. But mocking
     #                __import__ is the devil. Right now we just make
     #               sure we can import something from the stdlib
@@ -38,6 +39,25 @@ class ImportUtilsTest(unittest.TestCase):
         dt = importutils.import_module('datetime')
         self.assertEqual(sys.modules['datetime'], dt)
 
+    def test_import_object_optional_arg_not_present(self):
+        obj = importutils.import_object('tests.unit.fake.FakeDriver')
+        self.assertTrue(obj.__class__.__name__, 'FakeDriver')
+
+    def test_import_object_optional_arg_present(self):
+        obj = importutils.import_object('tests.unit.fake.FakeDriver',
+                                        first_arg=False)
+        self.assertTrue(obj.__class__.__name__, 'FakeDriver')
+
+    def test_import_object_required_arg_not_present(self):
+        # arg 1 isn't optional here
+        self.assertRaises(TypeError, importutils.import_object,
+                          'tests.unit.fake.FakeDriver2')
+
+    def test_import_object_required_arg_present(self):
+        obj = importutils.import_object('tests.unit.fake.FakeDriver2',
+                                        first_arg=False)
+        self.assertTrue(obj.__class__.__name__, 'FakeDriver2')
+
     def test_import_object(self):
         dt = importutils.import_object('datetime.time')
         self.assertTrue(isinstance(dt, sys.modules['datetime'].time))