Revision: 3812
Author: pekka.klarck
Date: Thu Jul 15 02:30:50 2010
Log: unit test fixes after renaming library earlier
http://code.google.com/p/robotframework/source/detail?r=3812
Modified:
/trunk/atest/testresources/testlibs/extendingjava.py
/trunk/utest/running/test_testlibrary.py
=======================================
--- /trunk/atest/testresources/testlibs/extendingjava.py Mon Jan 12
12:52:29 2009
+++ /trunk/atest/testresources/testlibs/extendingjava.py Thu Jul 15
02:30:50 2010
@@ -1,39 +1,37 @@
import ExampleJavaLibrary
-import JavaVarArgsConstructor
+import DefaultArgs
class ExtendJavaLib(ExampleJavaLibrary):
-
+
def kw_in_java_extender(self, arg):
return arg*2
-
+
def javaSleep(self, secs):
raise Exception('Overridden kw executed!')
-
+
def using_method_from_java_parent(self):
self.divByZero()
-
-
-class ExtendJavaLibWithConstructor(JavaVarArgsConstructor):
-
+
+
+class ExtendJavaLibWithConstructor(DefaultArgs):
+
def keyword(self):
return None
class ExtendJavaLibWithInit(ExampleJavaLibrary):
-
+
def __init__(self, *args):
self.args = args
-
+
def get_args(self):
return self.args
-
-
-class ExtendJavaLibWithInitAndConstructor(JavaVarArgsConstructor):
-
+
+
+class ExtendJavaLibWithInitAndConstructor(DefaultArgs):
+
def __init__(self, *args):
if len(args) == 1:
- JavaVarArgsConstructor.__init__(self, args[0])
+ DefaultArgs.__init__(self, args[0])
self.kw = lambda self: "Hello, world!"
-
-
=======================================
--- /trunk/utest/running/test_testlibrary.py Thu May 27 23:16:05 2010
+++ /trunk/utest/running/test_testlibrary.py Thu Jul 15 02:30:50 2010
@@ -195,7 +195,7 @@
self._test_init_handler('ExampleJavaLibrary', None, 0, 0)
def test_java_library_with_constructor(self):
- self._test_init_handler('JavaVarArgsConstructor',
['arg1', 'arg2'], 1, 3)
+ self._test_init_handler('DefaultArgs', ['arg1', 'arg2'], 1, 3)
def test_extended_java_lib_with_no_init_and_no_constructor(self):
self._test_init_handler('extendingjava.ExtendJavaLib', None,
0, 0)
