Revision: 2758
Author: janne.t.harkonen
Date: Mon Mar 29 01:17:03 2010
Log: updated listeners to expect test and suite names instead of counts
http://code.google.com/p/robotframework/source/detail?r=2758
Modified:
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener$1.class
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.java
/trunk/atest/testresources/listeners/attributeverifyinglistener.py
/trunk/atest/testresources/listeners/listeners.py
=======================================
---
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class
Sun Mar 28 23:49:40 2010
+++
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class
Mon Mar 29 01:17:03 2010
@@ -6,7 +6,6 @@
! " # $ % & ' ( ) * - this$0
LJavaAttributeVerifyingListener; <init> #(LJavaAttributeVerifyingListener;)V Code LineNumberTable
SourceFile #JavaAttributeVerifyingListener.java EnclosingMethod . / 0 0 elapsedtime java/math/BigInteger 1 2 tags org/python/core/PyList args metadata
org/python/core/PyDictionary testcount java/lang/Integer
-suitecount
totaltests
JavaAttributeVerifyingListener$1 InnerClasses java/util/HashMap
JavaAttributeVerifyingListener createExcpectedTypes ()V put 8(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
ˆ P*+µ *· * ¶ W* ¶ W* ¶ W*
¶ W* ¶ W*
=======================================
---
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class
Sun Mar 28 23:49:26 2010
+++
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class
Mon Mar 29 01:17:03 2010
Binary file, no diff available.
=======================================
---
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java
Sun Mar 28 23:49:26 2010
+++
/trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java
Mon Mar 29 01:17:03 2010
@@ -26,15 +26,15 @@
put("tags", PyList.class);
put("args", PyList.class);
put("metadata", PyDictionary.class);
- put("testcount", Integer.class);
- put("suitecount", Integer.class);
+ put("tests", PyList.class);
+ put("suites", PyList.class);
put("totaltests", Integer.class);
}};
}
public void startSuite(String name, Map attrs) {
verifyAttributes("START SUITE", attrs,
- new String[]
{"doc", "starttime", "longname", "metadata", "testcount", "suitecount", "totaltests"});
+ new String[]
{"doc", "starttime", "longname", "metadata", "tests", "suites", "totaltests"});
}
public void endSuite(String name, Map attrs) {
=======================================
---
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener$1.class
Sun Mar 28 23:49:40 2010
+++
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener$1.class
Mon Mar 29 01:17:03 2010
@@ -21,3 +21,4 @@
w #
+
=======================================
---
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class
Sun Mar 28 23:49:33 2010
+++
/trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class
Mon Mar 29 01:17:03 2010
@@ -5,30 +5,26 @@
2 3 4 5
6 7 8
9 : ; ROBOT_LISTENER_API_VERSION Ljava/lang/String;
+ ? @ A ROBOT_LISTENER_API_VERSION Ljava/lang/String;
ConstantValue < data Ljava/util/Map;
Signature %Ljava/util/Map<Ljava/lang/String;[I>; <init> ()V Code LineNumberTable
startSuite $(Ljava/lang/String;Ljava/util/Map;)V
getActual $(Ljava/util/Map;Ljava/lang/String;)I
checkCount (II)V
SourceFile "JavaSuiteAndTestCountListener.java
- JavaSuiteAndTestCountListener$1 InnerClasses = > ? @ [I
testcount ! " # $
-suitecount
+ JavaSuiteAndTestCountListener$1 InnerClasses
+ C D E F [I tests $ % & ' suites
totaltests java/lang/Integer A B java/lang/RuntimeException
+java/lang/ClassCastException java/lang/Integer I H java/lang/RuntimeException
Counts differ C
+ J
JavaSuiteAndTestCountListener java/lang/Object 2 "(LJavaSuiteAndTestCountListener;)V
java/util/Map get &(Ljava/lang/Object;)Ljava/lang/Object; intValue ()I (Ljava/lang/String;)V !
- *· *» Y*· µ ±
- a 9*´ +¹ À N*- .*, · · *- .*,
· · *- .*, · · ±
- * 8 ! "
- & +,¹ À ¶
-¬
- # $
- 0
+¬: +,¹ À ¶ ¬ ! & ' 0
Ÿ
» Y · ¿±
- % & *
-
=======================================
--- /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.java
Sun Mar 28 23:49:33 2010
+++ /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.java
Mon Mar 29 01:17:03 2010
@@ -1,4 +1,5 @@
import java.util.*;
+import org.python.core.PyList;
public class JavaSuiteAndTestCountListener {
public static final String ROBOT_LISTENER_API_VERSION = "2";
@@ -13,13 +14,18 @@
public void startSuite(String name, Map attrs) {
int[] expCounts = data.get(name);
- checkCount(expCounts[0], getActual(attrs, "testcount"));
- checkCount(expCounts[1], getActual(attrs, "suitecount"));
+ checkCount(expCounts[0], getActual(attrs, "tests"));
+ checkCount(expCounts[1], getActual(attrs, "suites"));
checkCount(expCounts[2], getActual(attrs, "totaltests"));
}
private int getActual(Map attrs, String key) {
- return ((Integer) attrs.get(key)).intValue();
+ Object item = attrs.get(key);
+ try {
+ return ((PyList) item).size();
+ } catch (ClassCastException e) {
+ return ((Integer) attrs.get(key)).intValue();
+ }
}
private void checkCount(int expected, int actual) {
=======================================
--- /trunk/atest/testresources/listeners/attributeverifyinglistener.py Sun
Mar 28 23:49:13 2010
+++ /trunk/atest/testresources/listeners/attributeverifyinglistener.py Mon
Mar 29 01:17:03 2010
@@ -8,14 +8,14 @@
START_ATTRIBUTES = ['doc', 'starttime']
END_ATTRIBUTES = START_ATTRIBUTES + ['endtime', 'elapsedtime', 'status']
EXPECTED_TYPES = {'elapsedtime': long, 'tags': list, 'args': list,
- 'metadata': dict, 'testcount': int, 'suitecount':int,
+ 'metadata': dict, 'tests': list, 'suites': list,
'totaltests': int}
def start_suite(name, attrs):
_verify_attributes('START SUITE', attrs,
-
START_ATTRIBUTES+['longname', 'metadata', 'testcount',
- 'suitecount', 'totaltests'])
+ START_ATTRIBUTES+['longname', 'metadata', 'tests',
+ 'suites', 'totaltests'])
def end_suite(name, attrs):
_verify_attributes('END SUITE', attrs,
END_ATTRIBUTES+['longname', 'statistics', 'message'])
=======================================
--- /trunk/atest/testresources/listeners/listeners.py Sun Mar 28 23:49:06
2010
+++ /trunk/atest/testresources/listeners/listeners.py Mon Mar 29 01:17:03
2010
@@ -41,17 +41,17 @@
class SuiteAndTestCounts(object):
ROBOT_LISTENER_API_VERSION = '2'
- exp_counts = {
- 'Subsuites & Subsuites 2': (0,2,4),
- 'Subsuites': (0,2,2),
- 'Sub 1': (1,0,1),
- 'Sub 2': (1,0,1),
- 'Subsuites 2': (0,1,2),
- 'Subsuite 3': (2,0,2),
- }
+ exp_data = {
+ 'Subsuites & Subsuites 2': ([], ['Subsuites', 'Subsuites 2'], 4),
+ 'Subsuites': ([], ['Sub 1', 'Sub 2'], 2),
+ 'Sub 1': (['SubSuite1 First'], [], 1),
+ 'Sub 2': (['SubSuite2 First'], [], 1),
+ 'Subsuites 2': ([], ['Subsuite 3'], 2),
+ 'Subsuite 3': (['SubSuite3 First', 'SubSuite3
Second'], [], 2),
+ }
def start_suite(self, name, attrs):
- counts = attrs['testcount'], attrs['suitecount'],
attrs['totaltests']
- if not counts == self.exp_counts[name]:
- raise RuntimeError('Wrong number of tests or suites
in %s, %s != %s' %
- (name, self.exp_counts[name]), counts)
+ data = attrs['tests'], attrs['suites'], attrs['totaltests']
+ if not data == self.exp_data[name]:
+ raise RuntimeError('Wrong tests or suites in %s, %s != %s' %
+ (name, self.exp_data[name], data))
To unsubscribe from this group, send email to
robotframework-commit+unsubscribegooglegroups.com or reply to this email with the words
"REMOVE ME" as the subject.
