Author: janne.t.harkonen
Date: Mon Apr 6 04:14:51 2009
New Revision: 1685
Added:
trunk/atest/testresources/listeners/OldJavaListener.class
- copied, changed from r1684,
/trunk/atest/testresources/listeners/JavaListener.class
trunk/atest/testresources/listeners/OldJavaListener.java
- copied, changed from r1684,
/trunk/atest/testresources/listeners/JavaListener.java
trunk/atest/testresources/listeners/OldJavaListenerWithArgs.class
trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java
Modified:
trunk/atest/robot/output/listener_interface/old_importing_listeners.html
trunk/atest/robot/output/listener_interface/old_listener_methods.html
trunk/atest/testresources/listeners/JavaListener.class
trunk/atest/testresources/listeners/JavaListener.java
trunk/atest/testresources/listeners/ListenAll.py
trunk/atest/testresources/listeners/listeners.py
Log:
Acceptance tests for new and old listener interface.
Modified:
trunk/atest/robot/output/listener_interface/old_importing_listeners.html
==============================================================================
---
trunk/atest/robot/output/listener_interface/old_importing_listeners.html
(original)
+++
trunk/atest/robot/output/listener_interface/old_importing_listeners.html
Mon Apr 6 04:14:51 2009
@@ -84,7 +84,7 @@
<tr>
<td>Suite Setup</td>
<td>Run Tests</td><td>--listener OldListenAll <br>--listener
-old_listeners.ListenSome <br>--listener old_module_listener<br>--listener
old_listeners.WithArgs:value<br>--listener old_listeners.WithArgs:a1:a2
<br>--listener
${LISTENERS}${/}OldListenAll.py:${TEMPDIR}${/}${ALL_FILE2}<br>--listener
old_listeners.WithArgs<br>--listener old_listeners.WithArgs:1:2:3
<br>--listener JavaListener <br>--listener
JavaListenerWithArgs:Hello:world!<br>--listener
JavaListenerWithArgs<br>--listener JavaListenerWithArgs:b:a:r<br>--listener
+old_listeners.ListenSome <br>--listener old_module_listener<br>--listener
old_listeners.WithArgs:value<br>--listener old_listeners.WithArgs:a1:a2
<br>--listener
${LISTENERS}${/}OldListenAll.py:${TEMPDIR}${/}${ALL_FILE2}<br>--listener
old_listeners.WithArgs<br>--listener old_listeners.WithArgs:1:2:3
<br>--listener OldJavaListener <br>--listener
OldJavaListenerWithArgs:Hello:world!<br>--listener
OldJavaListenerWithArgs<br>--listener
OldJavaListenerWithArgs:b:a:r<br>--listener
NonExistingListener </td><td>misc${/}pass_and_fail.html</td>
@@ -175,7 +175,7 @@
<td></td>
<td></td>
</tr>
-<tr><td></td><td>Listener Import Message Should Be In
Syslog</td><td>JavaListener<br></td><td> [ ]</td><td></td></tr><tr>
+<tr><td></td><td>Listener Import Message Should Be In
Syslog</td><td>OldJavaListener<br></td><td> [ ]</td><td></td></tr><tr>
<td></td>
<td></td>
<td></td>
@@ -188,7 +188,7 @@
<td></td>
<td></td>
-</tr><tr><td></td><td>Listener Import Message Should Be In
Syslog</td><td>JavaListenerWithArgs<br></td><td> [ Hello | world!
]</td><td></td></tr><tr><td></td><td>Check Listener
File</td><td>${JAVA_ARGS_FILE}</td><td>I got arguments 'Hello'
and 'world!'</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Java
Listener With Wrong Number Of Arguments</td><td>[ Tags
]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check Syslog
contains</td><td>Taking listener 'JavaListenerWithArgs' into use failed:
TypeError: JavaListenerWithArgs(): expected 2 args; got
0</td><td></td><td></td></tr><tr><td></td><td>Check Syslog
contains</td><td>Taking listener 'JavaListenerWithArgs:b:a:r' into use
failed: TypeError: JavaListenerWithArgs(): expected 2 args; got
3</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
+</tr><tr><td></td><td>Listener Import Message Should Be In
Syslog</td><td>OldJavaListenerWithArgs<br></td><td> [ Hello | world!
]</td><td></td></tr><tr><td></td><td>Check Listener
File</td><td>${JAVA_ARGS_FILE}</td><td>I got arguments 'Hello'
and 'world!'</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Java
Listener With Wrong Number Of Arguments</td><td>[ Tags
]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check Syslog
contains</td><td>Taking listener 'OldJavaListenerWithArgs' into use failed:
TypeError: OldJavaListenerWithArgs(): expected 2 args; got
0</td><td></td><td></td></tr><tr><td></td><td>Check Syslog
contains</td><td>Taking listener 'OldJavaListenerWithArgs:b:a:r' into use
failed: TypeError: OldJavaListenerWithArgs(): expected 2 args; got
3</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
Modified:
trunk/atest/robot/output/listener_interface/old_listener_methods.html
==============================================================================
--- trunk/atest/robot/output/listener_interface/old_listener_methods.html
(original)
+++ trunk/atest/robot/output/listener_interface/old_listener_methods.html
Mon Apr 6 04:14:51 2009
@@ -85,7 +85,7 @@
<td>--listener OldListenAll<br>--listener
OldListenAll:${TEMPDIR}${/}${ALL_FILE2}<br>--listener
old_module_listener<br>
--listener
old_listeners.ListenSome <br>
---listener JavaListener<br>
+--listener OldJavaListener<br>
--listener old_listeners.InvalidMethods</td>
<td>misc${/}pass_and_fail.html</td>
<td></td>
Modified: trunk/atest/testresources/listeners/JavaListener.class
==============================================================================
Binary files. No diff available.
Modified: trunk/atest/testresources/listeners/JavaListener.java
==============================================================================
--- trunk/atest/testresources/listeners/JavaListener.java (original)
+++ trunk/atest/testresources/listeners/JavaListener.java Mon Apr 6
04:14:51 2009
@@ -1,7 +1,11 @@
import java.io.*;
+import java.util.Map;
+import java.util.List;
public class JavaListener {
+
+ public static final String ROBOT_LISTENER_API_VERSION = "2";
BufferedWriter outfile = null;
@@ -12,37 +16,40 @@
this.outfile = new BufferedWriter(new FileWriter(outpath ));
}
- public void startSuite(String name, String doc) throws IOException {
- this.outfile.write("START SUITE: " + name + " '" + doc + "'\n");
+ public void startSuite(String name, Map attrs) throws IOException {
+ this.outfile.write("START SUITE: " + name + " '" + attrs.get("doc")
+ "'\n");
}
- public void startTest(String name, String doc, String[] tags) throws
IOException {
- this.outfile.write("START TEST: " + name + " '" + doc + "' [");
- for (int i=0; i < tags.length; i++) {
- this.outfile.write(tags[i]);
+ public void startTest(String name, Map attrs) throws IOException {
+ this.outfile.write("START TEST: " + name + " '" + attrs.get("doc") + "'
[");
+ List tags = (List)attrs.get("tags");
+ for (int i=0; i < tags.size(); i++) {
+ this.outfile.write(tags.get(i).toString());
}
this.outfile.write("]\n");
}
- public void startKeyword(String name, String[] args) throws IOException
{
+ public void startKeyword(String name, Map attrs) throws IOException {
this.outfile.write("START KW: " + name + " [");
- for (int i=0; i < args.length; i++) {
- this.outfile.write(args[i]);
+ List args = (List)attrs.get("args");
+ for (int i=0; i < args.size(); i++) {
+ this.outfile.write(args.get(i).toString());
}
this.outfile.write("]\n");
}
- public void endTest(String status, String message) throws IOException {
+ public void endTest(String name, Map attrs) throws IOException {
+ String status = attrs.get("status").toString();
if (status.equals("PASS")) {
this.outfile.write("END TEST: " + status + "\n");
}
else {
- this.outfile.write("END TEST: " + status + ": " + message +
"\n");
+ this.outfile.write("END TEST: " + status + ": " + attrs.get("message")
+ "\n");
}
}
- public void endSuite(String stat, String msg) throws IOException {
- this.outfile.write("END SUITE: " + stat + ": " + msg + "\n");
+ public void endSuite(String name, Map attrs) throws IOException {
+ this.outfile.write("END SUITE: " + attrs.get("status") + ": " +
attrs.get("message") + "\n");
}
public void outputFile(String path) throws IOException {
Modified: trunk/atest/testresources/listeners/ListenAll.py
==============================================================================
--- trunk/atest/testresources/listeners/ListenAll.py (original)
+++ trunk/atest/testresources/listeners/ListenAll.py Mon Apr 6 04:14:51
2009
@@ -3,6 +3,8 @@
class ListenAll:
+
+ ROBOT_LISTENER_API_VERSION = '2'
def __init__(self, *path):
if not path:
@@ -11,28 +13,30 @@
path = ':'.join(path)
self.outfile = open(path, 'w')
- def start_suite(self, name, doc):
- self.outfile.write("SUITE START: %s '%s'\n" % (name, doc))
+ def start_suite(self, name, attrs):
+ self.outfile.write("SUITE START: %s '%s'\n" % (name, attrs['doc']))
- def start_test(self, name, doc, tags):
- tags = [ str(tag) for tag in tags ]
- self.outfile.write("TEST START: %s '%s' %s\n" % (name, doc, tags))
+ def start_test(self, name, attrs):
+ tags = [ str(tag) for tag in attrs['tags'] ]
+ self.outfile.write("TEST START: %s '%s' %s\n" % (name,
attrs['doc'], tags))
- def start_keyword(self, name, args):
- args = [ str(arg) for arg in args ]
+ def start_keyword(self, name, attrs):
+ args = [ str(arg) for arg in attrs['args'] ]
self.outfile.write("KW START: %s %s\n" % (name, args))
- def end_keyword(self, status):
- self.outfile.write("KW END: %s\n" % (status))
+ def end_keyword(self, name, attrs):
+ self.outfile.write("KW END: %s\n" % (attrs['status']))
- def end_test(self, status, message):
- if status == 'PASS':
+ def end_test(self, name, attrs):
+ if attrs['status'] == 'PASS':
self.outfile.write('TEST END: PASS\n')
else:
- self.outfile.write("TEST END: %s %s\n" % (status, message))
+ self.outfile.write("TEST END: %s %s\n"
+ % (attrs['status'], attrs['message']))
- def end_suite(self, status, message):
- self.outfile.write('SUITE END: %s %s\n' % (status, message))
+ def end_suite(self, name, attrs):
+ self.outfile.write('SUITE END: %s %s\n'
+ % (attrs['status'], attrs['message']))
def output_file(self, path):
self._out_file('Output', path)
Copied: trunk/atest/testresources/listeners/OldJavaListener.class (from
r1684, /trunk/atest/testresources/listeners/JavaListener.class)
==============================================================================
Binary files. No diff available.
Copied: trunk/atest/testresources/listeners/OldJavaListener.java (from
r1684, /trunk/atest/testresources/listeners/JavaListener.java)
==============================================================================
--- /trunk/atest/testresources/listeners/JavaListener.java (original)
+++ trunk/atest/testresources/listeners/OldJavaListener.java Mon Apr 6
04:14:51 2009
@@ -1,11 +1,11 @@
import java.io.*;
-public class JavaListener {
+public class OldJavaListener {
BufferedWriter outfile = null;
- public JavaListener() throws IOException {
+ public OldJavaListener() throws IOException {
String tmpdir = System.getProperty("java.io.tmpdir");
String sep = System.getProperty("file.separator");
String outpath = tmpdir + sep + "listen_java.txt";
Added: trunk/atest/testresources/listeners/OldJavaListenerWithArgs.class
==============================================================================
Binary files
/export/hda3/borgletdata/dirs/4.workflow.polling_workers.svn-email.codesite.1153606072/logs.4.workflow.polling_workers.svn-email.codesite.1153606072/tmp/tmpf92feU
and
/export/hda3/borgletdata/dirs/4.workflow.polling_workers.svn-email.codesite.1153606072/logs.4.workflow.polling_workers.svn-email.codesite.1153606072/tmp/tmp7RxNfb
differ
Added: trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java
==============================================================================
--- (empty file)
+++ trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java Mon
Apr 6 04:14:51 2009
@@ -0,0 +1,14 @@
+import java.io.*;
+
+
+public class OldJavaListenerWithArgs {
+
+ public OldJavaListenerWithArgs(String arg1, String arg2) throws
IOException {
+ String tmpdir = System.getProperty("java.io.tmpdir");
+ String sep = System.getProperty("file.separator");
+ String outpath = tmpdir + sep + "java_listener_with_args.txt";
+ BufferedWriter outfile = new BufferedWriter(new
FileWriter(outpath));
+ outfile.write("I got arguments '" + arg1 + "' and '" + arg2 +
"'\n");
+ outfile.close();
+ }
+}
Modified: trunk/atest/testresources/listeners/listeners.py
==============================================================================
--- trunk/atest/testresources/listeners/listeners.py (original)
+++ trunk/atest/testresources/listeners/listeners.py Mon Apr 6 04:14:51
2009
@@ -4,21 +4,25 @@
class ListenSome:
+ ROBOT_LISTENER_API_VERSION = '2'
+
def __init__(self):
outpath = os.path.join(tempfile.gettempdir(), 'listen_some.txt')
self.outfile = open(outpath, 'w')
- def startTest(self, name, doc, tags):
+ def startTest(self, name, attrs):
self.outfile.write(name + '\n')
- def endSuite(self, stat, msg):
- self.outfile.write(msg + '\n')
+ def endSuite(self, name, attrs):
+ self.outfile.write(attrs['message'] + '\n')
def close(self):
self.outfile.close()
class WithArgs(object):
+
+ ROBOT_LISTENER_API_VERSION = '2'
def __init__(self, arg1, arg2='default'):
outpath =
os.path.join(tempfile.gettempdir(), 'listener_with_args.txt')
@@ -28,6 +32,8 @@
class InvalidMethods:
+
+ ROBOT_LISTENER_API_VERSION = '2'
def start_suite(self, wrong, number, of, args, here):
pass
