[robotframework] r4067 committed - 1) elapsed time is nowadays int, not long, in Python code so it's Inte...

Thu, 16 Sep 2010 13:21:26 -0700 

Revision: 4067
Author: pekka.klarck
Date: Thu Sep 16 13:17:56 2010
Log: 1) elapsed time is nowadays int, not long, in Python code so it's Integer, not BigInteger, in Java. This fixes the failing test on Jython. 2) Tabs to spaces and other whitespace cleanup. 
http://code.google.com/p/robotframework/source/detail?r=4067

Modified:
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java

=======================================
--- /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class Thu Aug 26 23:39:48 2010 +++ /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class Thu Sep 16 13:17:56 2010 
@@ -1,6 +1,7 @@
 Êþº¾15     

  !
+
"#$%&'()*+,/this$0 LJavaAttributeVerifyingListener;<init>#(LJavaAttributeVerifyingListener;)VCodeLineNumberTable Signature8Ljava/util/HashMap<Ljava/lang/String;Ljava/lang/Class;>; SourceFile#JavaAttributeVerifyingListener.javaEnclosingMethod0 12  2 elapsedtimejava/math/BigInteger 34tagsorg/python/core/PyListargsmetadata 
 org/python/core/PyDictionarytestssuites
@@ -14,4 +15,3 @@
 EO 
 
 .
-
=======================================
--- /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java Thu Aug 26 23:39:48 2010 +++ /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java Thu Sep 16 13:17:56 2010 
@@ -1,94 +1,93 @@
 import java.io.*;
 import java.util.*;
-import java.math.BigInteger;
 import org.python.core.PyList;
 import org.python.core.PyDictionary;

 public class JavaAttributeVerifyingListener {
     public static final String ROBOT_LISTENER_API_VERSION = "2";
-       private BufferedWriter outfile;
-       private Map expectedTypes;
-
-       public JavaAttributeVerifyingListener() throws IOException {
-               createOutputFile();
-               createExcpectedTypes();
-       }
-
-       public void createOutputFile() throws IOException {
-               String tmpdir = JavaTempDir.getTempDir();
-               String sep = System.getProperty("file.separator");
-               String outpath = tmpdir + sep + "listener_attrs_java.txt";
-               outfile = new BufferedWriter(new FileWriter(outpath));
-       }
-       public void createExcpectedTypes() {
-               expectedTypes = new HashMap<String, Class>() {{
-                   put("elapsedtime", BigInteger.class);
-                   put("tags", PyList.class);
-                   put("args", PyList.class);
-                   put("metadata", PyDictionary.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", "tests", "suites", "totaltests"}); 
-       }
-
-       public void endSuite(String name, Map attrs) {
-               verifyAttributes("END SUITE", attrs,
- new String[] {"doc", "starttime", "longname", "endtime", "elapsedtime", "status", "message", "statistics"}); 
-       }
-
-       public void startTest(String name, Map attrs) {
-               verifyAttributes("START TEST", attrs,
-                new String[] {"doc", "starttime", "longname", "tags"});
-       }
-
-       public void endTest(String name, Map attrs) {
-               verifyAttributes("END TEST", attrs,
- new String[] {"doc", "starttime", "longname", "tags", "endtime", "elapsedtime", "status", "message"}); 
-       }
-
-       public void startKeyword(String name, Map attrs) {
-               verifyAttributes("START KEYWORD", attrs,
-                new String[] {"doc", "starttime", "args"});
-       }
-
-       public void endKeyword(String name, Map attrs) {
-               verifyAttributes("END KEYWORD", attrs,
- new String[] {"doc", "starttime", "args", "endtime", "elapsedtime", "status"}); 
-       }
-
-       public void close() throws IOException {
-               outfile.close();
-       }
-
- private void verifyAttributes(String methodName, Map attrs, String[] names) { 
-               try {
-                       outfile.write(methodName + "\n");
-                       if (attrs.size() != names.length) {
-                       outfile.write("FAILED: wrong number of attributes\n");
- outfile.write("Expected: " + names + "\n" + "Actual: " + attrs.keySet() + "\n"); 
-                       }
-                       else {
-                               for (String name: names) {
-                                       Object attr = attrs.get(name);
-                                       String status = "PASSED";
-                                       Class expectedClass = 
Class.forName("java.lang.String");
-                                       if (expectedTypes.containsKey(name))
-                                               expectedClass = 
(Class)expectedTypes.get(name);
-                                       if 
(!(attr.getClass()).equals(expectedClass)) {
-                                               status = "FAILED";
-                                       }
-                                       outfile.write(status + " | " + name + ": " + 
attr.getClass() + "\n");
-                               }
-                       }
-               } catch (Exception e) {
-                       throw new RuntimeException(e);
-               }
-
-       }
-}
+    private BufferedWriter outfile;
+    private Map expectedTypes;
+
+    public JavaAttributeVerifyingListener() throws IOException {
+       createOutputFile();
+       createExcpectedTypes();
+    }
+
+    public void createOutputFile() throws IOException {
+        String tmpdir = JavaTempDir.getTempDir();
+        String sep = System.getProperty("file.separator");
+        String outpath = tmpdir + sep + "listener_attrs_java.txt";
+        outfile = new BufferedWriter(new FileWriter(outpath));
+    }
+
+    public void createExcpectedTypes() {
+        expectedTypes = new HashMap<String, Class>() {{
+               put("elapsedtime", Integer.class);
+               put("tags", PyList.class);
+               put("args", PyList.class);
+               put("metadata", PyDictionary.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", "tests", "suites", "totaltests"}); 
+    }
+
+    public void endSuite(String name, Map attrs) {
+        verifyAttributes("END SUITE", attrs,
+ new String[] {"doc", "starttime", "longname", "endtime", "elapsedtime", "status", "message", "statistics"}); 
+    }
+
+    public void startTest(String name, Map attrs) {
+        verifyAttributes("START TEST", attrs,
+                        new String[] {"doc", "starttime", "longname", "tags"});
+    }
+
+    public void endTest(String name, Map attrs) {
+        verifyAttributes("END TEST", attrs,
+ new String[] {"doc", "starttime", "longname", "tags", "endtime", "elapsedtime", "status", "message"}); 
+    }
+
+    public void startKeyword(String name, Map attrs) {
+        verifyAttributes("START KEYWORD", attrs,
+                        new String[] {"doc", "starttime", "args"});
+    }
+
+    public void endKeyword(String name, Map attrs) {
+        verifyAttributes("END KEYWORD", attrs,
+ new String[] {"doc", "starttime", "args", "endtime", "elapsedtime", "status"}); 
+    }
+
+    public void close() throws IOException {
+        outfile.close();
+    }
+
+ private void verifyAttributes(String methodName, Map attrs, String[] names) { 
+        try {
+            outfile.write(methodName + "\n");
+            if (attrs.size() != names.length) {
+                outfile.write("FAILED: wrong number of attributes\n");
+ outfile.write("Expected: " + names + "\n" + "Actual: " + attrs.keySet() + "\n"); 
+            }
+            else {
+                for (String name: names) {
+                    Object attr = attrs.get(name);
+                    String status = "PASSED";
+ Class expectedClass = Class.forName("java.lang.String"); 
+                    if (expectedTypes.containsKey(name))
+                        expectedClass = (Class)expectedTypes.get(name);
+                    if (!(attr.getClass()).equals(expectedClass)) {
+                        status = "FAILED";
+                    }
+ outfile.write(status + " | " + name + ": " + attr.getClass() + "\n"); 
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

Reply via email to