Author: janne.t.harkonen
Date: Mon Apr 6 04:32:11 2009
New Revision: 1686
Added:
trunk/utest/output/NewStyleJavaListener.class
- copied, changed from r1685,
/trunk/atest/testresources/listeners/NewStyleJavaListener.class
trunk/utest/output/NewStyleJavaListener.java
- copied, changed from r1685,
/trunk/atest/testresources/listeners/NewStyleJavaListener.java
Removed:
trunk/atest/testresources/listeners/NewStyleJavaListener.class
trunk/atest/testresources/listeners/NewStyleJavaListener.java
Modified:
trunk/src/robot/output/listeners.py
trunk/utest/output/test_listeners.py
Log:
ROBOT_LISTENER_API_VERSION is now converted to integer.
Moved listener used only in unit tests under utest.
Modified: trunk/src/robot/output/listeners.py
==============================================================================
--- trunk/src/robot/output/listeners.py (original)
+++ trunk/src/robot/output/listeners.py Mon Apr 6 04:32:11 2009
@@ -127,7 +127,7 @@
listener = self._import_listener(name, args)
AbstractLoggerProxy.__init__(self, listener)
self.name = name
- self.version = getattr(listener, 'ROBOT_LISTENER_API_VERSION', 1)
+ self.version = self._get_version(listener)
self.is_java = utils.is_jython and isinstance(listener, Object)
def _import_listener(self, name, args):
@@ -139,6 +139,12 @@
LOGGER.info("Imported listener '%s' with arguments %s (source %s)"
% (name, utils.seq2str2(args), source))
return listener
+
+ def _get_version(self, listener):
+ try:
+ return int(getattr(listener, 'ROBOT_LISTENER_API_VERSION', 1))
+ except ValueError:
+ return 1
def call_method(self, method, *args):
if self.is_java and len(args) == 2 and isinstance(args[1], dict):
Copied: trunk/utest/output/NewStyleJavaListener.class (from r1685,
/trunk/atest/testresources/listeners/NewStyleJavaListener.class)
==============================================================================
Copied: trunk/utest/output/NewStyleJavaListener.java (from r1685,
/trunk/atest/testresources/listeners/NewStyleJavaListener.java)
==============================================================================
Modified: trunk/utest/output/test_listeners.py
==============================================================================
--- trunk/utest/output/test_listeners.py (original)
+++ trunk/utest/output/test_listeners.py Mon Apr 6 04:32:11 2009
@@ -187,7 +187,7 @@
listener_name = 'test_listeners.ListenAllNewStyle'
def test_importing(self):
- assert_equals(self.listener.version, '2')
+ assert_equals(self.listener.version, 2)
assert_false(self.listener.is_java)
@@ -219,7 +219,7 @@
listener_name = 'NewStyleJavaListener'
def test_importing(self):
- assert_equals(self.listener.version, '2')
+ assert_equals(self.listener.version, 2)
assert_true(self.listener.is_java)
