Revision: 51f5609306a5
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Wed May 28 12:28:07 2014 UTC
Log: Update issue 811
Cleanup and more tests
http://code.google.com/p/robotframework/source/detail?r=51f5609306a5
Added:
/atest/robot/test_libraries/as_listener_in_java.txt
Modified:
/atest/robot/test_libraries/as_listener.txt
/atest/testdata/test_libraries/as_listener/listenerlibrary.py
/atest/testdata/test_libraries/as_listener/suite_scope.txt
/atest/testdata/test_libraries/as_listener/suite_scope_java.txt
/src/robot/output/librarylisteners.py
/src/robot/output/loggerhelper.py
=======================================
--- /dev/null
+++ /atest/robot/test_libraries/as_listener_in_java.txt Wed May 28 12:28:07
2014 UTC
@@ -0,0 +1,14 @@
+*** Settings ***
+Suite Setup Run Tests ${EMPTY}
test_libraries/as_listener/suite_scope_java.txt
+Force Tags regression jybot
+Resource atest_resource.txt
+
+*** Test Cases ***
+Java suite scope library gets events
+ Check Test Case ${TESTNAME}
+New java test gets previous suite scope events
+ Check Test Case ${TESTNAME}
+Listener methods in library are keywords
+ Check Test Case ${TESTNAME}
+Listener methods starting with underscore are not keywords
+ Check Test Case ${TESTNAME}
=======================================
--- /atest/robot/test_libraries/as_listener.txt Wed May 28 11:08:10 2014 UTC
+++ /atest/robot/test_libraries/as_listener.txt Wed May 28 12:28:07 2014 UTC
@@ -1,8 +1,6 @@
*** Settings ***
-Documentation Tests for libraries using getKeywordNames and runKeyword
with **kwargs functionality. In these tests libraries are implemented with
Java.
-Suite Setup Run Tests ${EMPTY} test_libraries/as_listener/
-Force Tags regression
-Default tags jybot pybot
+Suite Setup Run Tests ${EMPTY}
test_libraries/as_listener/suite_scope.txt
test_libraries/as_listener/test_scope.txt
+Force Tags regression jybot pybot
Resource atest_resource.txt
*** Test Cases ***
@@ -14,9 +12,7 @@
Check Test Case ${TESTNAME}
New test gets previous suite scope events
Check Test Case ${TESTNAME}
-Java suite scope library gets events
- [tags] jybot
+Listener methods in library are keywords
Check Test Case ${TESTNAME}
-New java test gets previous suite scope events
- [tags] jybot
+Listener methods starting with underscore are not keywords
Check Test Case ${TESTNAME}
=======================================
--- /atest/testdata/test_libraries/as_listener/listenerlibrary.py Wed May
28 10:09:35 2014 UTC
+++ /atest/testdata/test_libraries/as_listener/listenerlibrary.py Wed May
28 12:28:07 2014 UTC
@@ -22,7 +22,7 @@
def _start_keyword(self, name, attrs):
self.events.append('start kw %s' % name)
- def end_keyword(self, name, attrs):
+ def _end_keyword(self, name, attrs):
self.events.append('end kw %s' % name)
def events_should_be(self, *expected):
=======================================
--- /atest/testdata/test_libraries/as_listener/suite_scope.txt Wed May 28
10:09:35 2014 UTC
+++ /atest/testdata/test_libraries/as_listener/suite_scope.txt Wed May 28
12:28:07 2014 UTC
@@ -15,3 +15,10 @@
... end test Suite scope library gets events
... start test New test gets previous suite scope
events
... start kw suite_listenerlibrary.Events Should Be
+
+Listener methods in library are keywords
+ end_test foo zap
+
+Listener methods starting with underscore are not keywords
+ [Documentation] FAIL No keyword with name '_end_keyword' found.
+ _end_keyword bar zap
=======================================
--- /atest/testdata/test_libraries/as_listener/suite_scope_java.txt Wed May
28 11:08:10 2014 UTC
+++ /atest/testdata/test_libraries/as_listener/suite_scope_java.txt Wed May
28 12:28:07 2014 UTC
@@ -15,3 +15,11 @@
... end test Java suite scope library gets events
... start test New java test gets previous suite scope
events
... start kw JavaListenerLibrary.Events Should Be
+
+Listener methods in library are keywords
+ endTest foo
+ endTest foo zip=zap
+
+Listener methods starting with underscore are not keywords
+ [Documentation] FAIL No keyword with name '_endKeyword' found.
+ _endKeyword bar
=======================================
--- /src/robot/output/librarylisteners.py Wed May 28 11:38:32 2014 UTC
+++ /src/robot/output/librarylisteners.py Wed May 28 12:28:07 2014 UTC
@@ -33,6 +33,7 @@
return [_LibraryListenerProxy(listener) for listener in
EXECUTION_CONTEXTS.current.namespace.library_listeners]
+
class _LibraryListenerProxy(_ListenerProxy):
def __init__(self, listener):
@@ -42,7 +43,6 @@
self.is_java = self._is_java(listener)
def _get_method_names(self, name):
- return self._add_underscores(name, self._toCamelCase(name))
+ names = _ListenerProxy._get_method_names(self, name)
+ return names + ['_' + name for name in names]
- def _add_underscores(self, *names):
- return list(names) + ['_%s' % name for name in names]
=======================================
--- /src/robot/output/loggerhelper.py Tue May 27 14:43:45 2014 UTC
+++ /src/robot/output/loggerhelper.py Wed May 28 12:28:07 2014 UTC
@@ -139,7 +139,7 @@
return self._no_method
def _get_method_names(self, name):
- return (name, self._toCamelCase(name))
+ return [name, self._toCamelCase(name)]
def _toCamelCase(self, name):
parts = name.split('_')
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
