Revision: 2993
Author: janne.t.harkonen
Date: Thu Apr 15 04:56:53 2010
Log: Removed unnecessary tests, fixed other after API changed
http://code.google.com/p/robotframework/source/detail?r=2993
Modified:
/trunk/utest/running/test_handlers.py
/trunk/utest/running/test_testlibrary.py
/trunk/utest/running/test_userhandlers.py
=======================================
--- /trunk/utest/running/test_handlers.py Thu Apr 15 01:05:46 2010
+++ /trunk/utest/running/test_handlers.py Thu Apr 15 04:56:53 2010
@@ -56,8 +56,8 @@
for method in _get_handler_methods(ArgumentsPython()):
handler = _PythonHandler(LibraryMock(), method.__name__,
method)
exp_mina, exp_maxa = eval(method.__doc__)
- assert_equals(handler.arguments.minargs, exp_mina)
- assert_equals(handler.arguments.maxargs, exp_maxa)
+ assert_equals(handler.arguments._arg_limit_checker.minargs,
exp_mina)
+ assert_equals(handler.arguments._arg_limit_checker.maxargs,
exp_maxa)
def test_getarginfo_getattr(self):
testlib = TestLibrary('classes.GetattrLibrary')
@@ -65,8 +65,8 @@
assert_equals(len(handlers), 3)
for handler in handlers:
assert_true(handler.name in ['Foo','Bar','Zap'])
- assert_equals(handler.arguments.minargs, 0)
- assert_equals(handler.arguments.maxargs, sys.maxint)
+ assert_equals(handler.arguments._arg_limit_checker.minargs, 0)
+ assert_equals(handler.arguments._arg_limit_checker.maxargs,
sys.maxint)
class TestDynamicHandlerCreation(unittest.TestCase):
@@ -142,8 +142,8 @@
doc, argspec)
def _assert_arg_specs(self, handler, minargs, maxargs, names=[],
defaults=[], vararg=None):
- assert_equals(handler.arguments.minargs, minargs)
- assert_equals(handler.arguments.maxargs, maxargs)
+ assert_equals(handler.arguments._arg_limit_checker.minargs,
minargs)
+ assert_equals(handler.arguments._arg_limit_checker.maxargs,
maxargs)
assert_equals(handler.arguments.names, names)
assert_equals(handler.arguments.defaults, defaults)
assert_equals(handler.arguments.varargs, vararg)
=======================================
--- /trunk/utest/running/test_testlibrary.py Thu Apr 15 01:05:46 2010
+++ /trunk/utest/running/test_testlibrary.py Thu Apr 15 04:56:53 2010
@@ -185,8 +185,8 @@
def _test_init_handler(self, libname, args=None, min=0, max=0):
lib = TestLibrary(libname, args)
- assert_equals(lib.init.arguments.minargs, min)
- assert_equals(lib.init.arguments.maxargs, max)
+ assert_equals(lib.init.arguments._arg_limit_checker.minargs, min)
+ assert_equals(lib.init.arguments._arg_limit_checker.maxargs, max)
return lib
if utils.is_jython:
@@ -444,8 +444,8 @@
self._assert_handler_args(lib.handlers[name], *exp)
def _assert_handler_args(self, handler, minargs=0, maxargs=0):
- assert_equals(handler.arguments.minargs, minargs)
- assert_equals(handler.arguments.maxargs, maxargs)
+ assert_equals(handler.arguments._arg_limit_checker.minargs,
minargs)
+ assert_equals(handler.arguments._arg_limit_checker.maxargs,
maxargs)
if utils.is_jython:
def test_dynamic_java_handlers(self):
=======================================
--- /trunk/utest/running/test_userhandlers.py Tue Apr 13 08:13:02 2010
+++ /trunk/utest/running/test_userhandlers.py Thu Apr 15 04:56:53 2010
@@ -99,81 +99,5 @@
assert_true(hasattr(embedded, attr), "'%s' missing" % attr)
-class _FakeVariables(dict):
- replace_scalar = replace_list = lambda self, args: args
-
-class _FakeOutput(object):
- trace = lambda self, msg: None
-
-
-class TestSettingUserKeywordArguments(unittest.TestCase):
-
- def setUp(self):
- self.variables = _FakeVariables()
-
- def test_noargs(self):
- ukargs = UserKeywordArguments(argnames=[], defaults=[],
vararg=None,
- minargs=0, maxargs=0, name='my name')
- ukargs.set_to(_FakeOutput(), self.variables, [])
- self._assert_variables({})
-
- def test_single_scalar(self):
- self._arguments_for(['${foo}']).set_to(_FakeOutput(),
self.variables, ['bar'])
- self._assert_variables({'${foo}': 'bar'})
-
- def test_multiple_scalars(self):
- self._arguments_for(['${foo}', '${bar}']).set_to(_FakeOutput(),
- self.variables,
- ['bar', 'quux'])
- self._assert_variables({'${foo}': 'bar', '${bar}': 'quux'})
- self._arguments_for(['${foo}', '${bar}']).set_to(_FakeOutput(),
- self.variables,
-
['hevonen', 'foox'])
- self._assert_variables({'${foo}': 'hevonen', '${bar}': 'foox'})
-
- def test_default_values(self):
- self._arguments_for(['${foo}', '${bar}'],
- ('bar', 'quux')).set_to(_FakeOutput(),
- self.variables, [])
- self._assert_variables({'${foo}': 'bar', '${bar}': 'quux'})
- self._arguments_for(['${foo}', '${bar}'],
('bar',)).set_to(_FakeOutput(),
-
self.variables,
-
['kameli'])
- self._assert_variables({'${foo}': 'kameli', '${bar}': 'bar'})
-
- def test_varargs(self):
- self._arguments_for([], vararg='@{helmet}').set_to(_FakeOutput(),
- self.variables,
[])
- self._assert_variables({'@{helmet}': []})
- self._arguments_for([], vararg='@{helmet}').set_to(_FakeOutput(),
- self.variables,
-
['kameli', 'hevonen'])
- self._assert_variables({'@{helmet}': ['kameli', 'hevonen']})
-
- def test_scalar_and_vararg(self):
- self._arguments_for(['${mand}'],
vararg='@{varg}').set_to(_FakeOutput(),
-
self.variables,
-
['muuli'])
- self._assert_variables({'${mand}': 'muuli', '@{varg}': []})
-
- def test_kwargs(self):
- self._arguments_for(['${a}', '${b}'],
('foo', 'b')).set_to(_FakeOutput(),
-
self.variables,
-
['b=bar'])
- self._assert_variables({'${a}': 'foo', '${b}': 'bar'})
- args = self._arguments_for(['${a}', '${b}', '${c}'],
('a', 'b', 'c'))
- args.set_to(_FakeOutput(), self.variables,
['a=foo', 'd', 'c=quux'])
-
self._assert_variables({'${a}': 'a=foo', '${b}': 'd', '${c}': 'quux'})
-
- def _arguments_for(self, argnames, defaults=(), vararg=None):
- minargs = len(argnames)-len(defaults)
- maxargs = sys.maxint if vararg else len(argnames)
- return UserKeywordArguments(argnames, defaults, vararg, minargs,
- maxargs, 'myname')
-
- def _assert_variables(self, expected):
- assert_equals(self.variables, expected)
-
-
if __name__ == '__main__':
unittest.main()
--
To unsubscribe, reply using "remove me" as the subject.
