[robotframework] r3948 committed - Java temp dir taken from env variable TEMP if possible. Also cleanup.

Thu, 26 Aug 2010 23:43:31 -0700 

Revision: 3948
Author: jussi.ao.malinen
Date: Thu Aug 26 23:39:48 2010
Log: Java temp dir taken from env variable TEMP if possible. Also cleanup.
http://code.google.com/p/robotframework/source/detail?r=3948

Added:
 /trunk/atest/testresources/listeners/JavaTempDir.class
 /trunk/atest/testresources/listeners/JavaTempDir.java
Modified:
 /trunk/atest/testresources/compile_java.sh
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class
 /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java
 /trunk/atest/testresources/listeners/JavaListener.class
 /trunk/atest/testresources/listeners/JavaListener.java
 /trunk/atest/testresources/listeners/JavaListenerWithArgs.class
 /trunk/atest/testresources/listeners/JavaListenerWithArgs.java
 /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener$1.class
 /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class
 /trunk/atest/testresources/listeners/OldJavaListener.class
 /trunk/atest/testresources/listeners/OldJavaListener.java
 /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.class
 /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java
 /trunk/atest/testresources/testlibs/ExampleJavaLibrary.class

=======================================
--- /dev/null
+++ /trunk/atest/testresources/listeners/JavaTempDir.class Thu Aug 26 23:39:48 2010 
@@ -0,0 +1,12 @@
+Êþº¾1
+
+
+
+<init>()VCodeLineNumberTable
+getTempDir()Ljava/lang/String;
+SourceFileJavaTempDir.java  TEMP java.io.tmpdir  JavaTempDirjava/lang/Objectjava/lang/Systemgetenv&(Ljava/lang/String;)Ljava/lang/String; getProperty!  
+
+*·± 
+
+6¸K*Ç  ¸K*°
+
=======================================
--- /dev/null
+++ /trunk/atest/testresources/listeners/JavaTempDir.java Thu Aug 26 23:39:48 2010 
@@ -0,0 +1,8 @@
+public class JavaTempDir {
+    public static String getTempDir() {
+        String tmp = System.getenv("TEMP");
+        if (tmp == null)
+            tmp = System.getProperty("java.io.tmpdir");
+        return tmp;
+    }
+}
=======================================
--- /trunk/atest/testresources/compile_java.sh  Wed Aug 25 05:08:32 2010
+++ /trunk/atest/testresources/compile_java.sh  Thu Aug 26 23:39:48 2010
@@ -1,2 +1,3 @@
 #!/bin/sh
 javac -target 1.5 -source 1.5 testlibs/*.java
+javac -cp $JYTHON_HOME/jython.jar -target 1.5 -source 1.5 listeners/*.java
=======================================
--- /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class Mon Mar 29 01:17:03 2010 +++ /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener$1.class Thu Aug 26 23:39:48 2010 
@@ -1,8 +1,6 @@
 Êþº¾13     

 
-
-
 !"#$%&'()*-this$0 LJavaAttributeVerifyingListener;<init>#(LJavaAttributeVerifyingListener;)VCodeLineNumberTable SourceFile#JavaAttributeVerifyingListener.javaEnclosingMethod. /0  0 elapsedtimejava/math/BigInteger 12tagsorg/python/core/PyListargsmetadata 
 org/python/core/PyDictionarytestssuites
@@ -15,3 +13,5 @@
 ;
 EO ,
 
+.
+
=======================================
--- /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class Mon Mar 29 01:17:03 2010 +++ /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.class Thu Aug 26 23:39:48 2010 
Binary file, no diff available.
=======================================
--- /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java Mon Mar 29 01:17:03 2010 +++ /trunk/atest/testresources/listeners/JavaAttributeVerifyingListener.java Thu Aug 26 23:39:48 2010 
@@ -15,13 +15,13 @@
        }

        public void createOutputFile() throws IOException {
-               String tmpdir = System.getProperty("java.io.tmpdir");
+               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() {{
+               expectedTypes = new HashMap<String, Class>() {{
                    put("elapsedtime", BigInteger.class);
                    put("tags", PyList.class);
                    put("args", PyList.class);
=======================================
--- /trunk/atest/testresources/listeners/JavaListener.class Fri Mar 26 23:47:09 2010 +++ /trunk/atest/testresources/listeners/JavaListener.class Thu Aug 26 23:39:48 2010 
@@ -7,7 +7,8 @@
 €
 ‚ƒ„
 P
-†‡ˆ
+
+P†‡ˆ‰
 ‰Š‹
 ŒŽ‘’‘“”—˜™š›œž'Ÿ' 
 Q}¡¢£¤f¥¦§¨©
@@ -33,12 +34,14 @@
 END TEST: END SUITE: 
 statisticsOutputpqSummaryReportLogDebugThe End
oY java/io/File (java): çÎ JavaListenerjava/lang/Object2java/io/IOExceptionjava/lang/System getProperty&(Ljava/lang/String;)Ljava/lang/String;append-(Ljava/lang/String;)Ljava/lang/StringBuilder;toString()Ljava/lang/String;(Ljava/io/Writer;)Vget&(Ljava/lang/Object;)Ljava/lang/Object;-(Ljava/lang/Object;)Ljava/lang/StringBuilder;writeentrySet()Ljava/util/Set; 
+getTempDir()Ljava/lang/String;java/lang/SystemgetProperty&(Ljava/lang/String;)Ljava/lang/String;append-(Ljava/lang/String;)Ljava/lang/StringBuilder;toString(Ljava/io/Writer;)Vget&(Ljava/lang/Object;)Ljava/lang/Object;-(Ljava/lang/Object;)Ljava/lang/StringBuilder;writeentrySet()Ljava/util/Set;
java/util/Setiterator()Ljava/util/Iterator;java/util/IteratorhasNext()Znext()Ljava/lang/Object;getKeygetValuesize()I(I)Ljava/lang/Object;equals(Ljava/lang/Object;)ZindexOf(Ljava/lang/String;)IgetName!PQRSTUVWXYZqA*·*µ¸L¸M»Y·+¶,¶ ¶¶ 
 N*»Y»Y-·
 ·µ±[
 
-...@\]^_zqm,¹ÀN*-·:*´»Y·¶+¶¶,¹¶¶¶¶¶ 
++>\]^_ZqM,¹ÀN*-·:*´»Y·¶+¶¶,¹¶¶¶¶¶
 ¶±[L\]`aZ˜hM+¹¹
 N-¹
 ™=-¹
=======================================
--- /trunk/atest/testresources/listeners/JavaListener.java Fri Mar 26 23:47:09 2010 +++ /trunk/atest/testresources/listeners/JavaListener.java Thu Aug 26 23:39:48 2010 
@@ -10,7 +10,7 @@
        BufferedWriter outfile = null;

        public JavaListener() throws IOException {
-               String tmpdir = System.getProperty("java.io.tmpdir");
+               String tmpdir = JavaTempDir.getTempDir();
                String sep = System.getProperty("file.separator");
                String outpath = tmpdir + sep + "listen_java.txt";
                this.outfile = new BufferedWriter(new FileWriter(outpath ));
=======================================
--- /trunk/atest/testresources/listeners/JavaListenerWithArgs.class Tue Sep 16 00:47:56 2008 +++ /trunk/atest/testresources/listeners/JavaListenerWithArgs.class Thu Aug 26 23:39:48 2010 
@@ -1,6 +1,7 @@
 Êþº¾0>
 
-
+
+

  !"
 
@@ -17,8 +18,8 @@
 Exceptions1
SourceFileJavaListenerWithArgs.java 2java.io.tmpdir3 45file.separatorjava/lang/StringBuffer 67java_listener_with_args.txt 89java/io/BufferedWriterjava/io/FileWriter : ;I got arguments '' and '' <: =2JavaListenerWithArgsjava/lang/Objectjava/io/IOException()Vjava/lang/System getProperty&(Ljava/lang/String;)Ljava/lang/String;append,(Ljava/lang/String;)Ljava/lang/StringBuffer;toString()Ljava/lang/String;(Ljava/lang/String;)V(Ljava/io/Writer;)Vwriteclose!i*·¸N¸:»Y·-¶¶¶¶ :» 
+getTempDir()Ljava/lang/String;java/lang/SystemgetProperty&(Ljava/lang/String;)Ljava/lang/String;append-(Ljava/lang/String;)Ljava/lang/StringBuilder;toString(Ljava/lang/String;)V(Ljava/io/Writer;)Vwriteclose!›g*·¸N¸:»Y·-¶¶¶¶
      :»
 Y»Y··
 :»Y·¶+¶¶,¶¶¶   ¶¶±"
   +
 =ch
-
=======================================
--- /trunk/atest/testresources/listeners/JavaListenerWithArgs.java Tue Sep 16 00:47:56 2008 +++ /trunk/atest/testresources/listeners/JavaListenerWithArgs.java Thu Aug 26 23:39:48 2010 
@@ -4,7 +4,7 @@
 public class JavaListenerWithArgs {

        public JavaListenerWithArgs(String arg1, String arg2) throws 
IOException {
-               String tmpdir = System.getProperty("java.io.tmpdir");
+               String tmpdir = JavaTempDir.getTempDir();
                String sep = System.getProperty("file.separator");
                String outpath = tmpdir + sep + "java_listener_with_args.txt";
                BufferedWriter outfile = new BufferedWriter(new 
FileWriter(outpath));
=======================================
--- /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class Thu May 27 03:51:27 2010 +++ /trunk/atest/testresources/listeners/JavaSuiteAndTestCountListener.class Thu Aug 26 23:39:48 2010 
@@ -8,7 +8,6 @@
 EFGROBOT_LISTENER_API_VERSIONLjava/lang/String;
ConstantValueHdataLjava/util/Map; Signature%Ljava/util/Map<Ljava/lang/String;[I>;<init>()VCodeLineNumberTable startSuite$(Ljava/lang/String;Ljava/util/Map;)V getActual$(Ljava/util/Map;Ljava/lang/String;)I 
-stackmaptablefij...@
 checkCount(II)V
 SourceFile"JavaSuiteAndTestCountListener.java
 JavaSuiteAndTestCountListener$1InnerClasses
=======================================
--- /trunk/atest/testresources/listeners/OldJavaListener.class Mon Apr 6 04:14:51 2009 +++ /trunk/atest/testresources/listeners/OldJavaListener.class Thu Aug 26 23:39:48 2010 
@@ -12,6 +12,7 @@
 kl
 &Rm
&nopoutfileLjava/io/BufferedWriter;<init>()VCodeLineNumberTable 
+&opqoutfileLjava/io/BufferedWriter;<init>()VCodeLineNumberTable
 Exceptionsq
startSuite'(Ljava/lang/String;Ljava/lang/String;)V startTest:(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V startKeyword((Ljava/lang/String;[Ljava/lang/String;)VendTestendSuite 
 outputFile(Ljava/lang/String;)VsummaryFile
@@ -24,12 +25,14 @@
 END TEST: 
:  END SUITE: Output C5SummaryReportLogDebugThe End B/ java/io/File (java): ~xOldJavaListenerjava/lang/Objectjava/io/IOExceptionjava/lang/System getProperty&(Ljava/lang/String;)Ljava/lang/String;append,(Ljava/lang/String;)Ljava/lang/StringBuffer;toString()Ljava/lang/String;(Ljava/io/Writer;)Vwritejava/lang/Stringequals(Ljava/lang/Object;)ZgetName!*+,- 
+getTempDir()Ljava/lang/String;java/lang/SystemgetProperty&(Ljava/lang/String;)Ljava/lang/String;append-(Ljava/lang/String;)Ljava/lang/StringBuilder;toString(Ljava/io/Writer;)Vwritejava/lang/Stringequals(Ljava/lang/Object;)ZgetName!*+,-
 ./0qA*·*µ¸L¸M»Y·+¶,¶    ¶¶
 N*»Y»Y-·
 ·µ±1
            
 -...@
 23450E)*´»Y·¶+¶¶,¶¶¶
+23450E)*´»Y·¶+¶¶,¶¶¶
 ¶±1
(23670yM*´»Y·¶+¶¶,¶¶¶ ¶6-¾¢*´-2¶„§ÿë*´¶±1(2=CL23890mA*´»Y·¶+¶¶¶ 
=======================================
--- /trunk/atest/testresources/listeners/OldJavaListener.java Mon Apr 6 04:14:51 2009 +++ /trunk/atest/testresources/listeners/OldJavaListener.java Thu Aug 26 23:39:48 2010 
@@ -6,7 +6,7 @@
        BufferedWriter outfile = null;

        public OldJavaListener() throws IOException {
-               String tmpdir = System.getProperty("java.io.tmpdir");
+               String tmpdir = JavaTempDir.getTempDir();
                String sep = System.getProperty("file.separator");
                String outpath = tmpdir + sep + "listen_java.txt";
                this.outfile = new BufferedWriter(new FileWriter(outpath ));
=======================================
--- /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.class Mon Apr 6 04:14:51 2009 +++ /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.class Thu Aug 26 23:39:48 2010 
@@ -1,6 +1,7 @@
 Êþº¾0>
 
-
+
+

  !"
 
@@ -18,8 +19,8 @@
 SourceFile
OldJavaListenerWithArgs.java 2java.io.tmpdir3 45file.separatorjava/lang/StringBuffer 67java_listener_with_args.txt 89java/io/BufferedWriterjava/io/FileWriter : ;I got arguments '' and '' <: =2OldJavaListenerWithArgsjava/lang/Objectjava/io/IOException()Vjava/lang/System getProperty&(Ljava/lang/String;)Ljava/lang/String;append,(Ljava/lang/String;)Ljava/lang/StringBuffer;toString()Ljava/lang/String;(Ljava/lang/String;)V(Ljava/io/Writer;)Vwriteclose!i*·¸N¸:»Y·-¶¶¶¶ :» 
+getTempDir()Ljava/lang/String;java/lang/SystemgetProperty&(Ljava/lang/String;)Ljava/lang/String;append-(Ljava/lang/String;)Ljava/lang/StringBuilder;toString(Ljava/lang/String;)V(Ljava/io/Writer;)Vwriteclose!›g*·¸N¸:»Y·-¶¶¶¶
      :»
 Y»Y··
 :»Y·¶+¶¶,¶¶¶   ¶¶±"
   +
 =ch
-
=======================================
--- /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java Mon Apr 6 04:14:51 2009 +++ /trunk/atest/testresources/listeners/OldJavaListenerWithArgs.java Thu Aug 26 23:39:48 2010 
@@ -4,7 +4,7 @@
 public class OldJavaListenerWithArgs {
public OldJavaListenerWithArgs(String arg1, String arg2) throws IOException { 
-               String tmpdir = System.getProperty("java.io.tmpdir");
+               String tmpdir = JavaTempDir.getTempDir();
                String sep = System.getProperty("file.separator");
                String outpath = tmpdir + sep + "java_listener_with_args.txt";
                BufferedWriter outfile = new BufferedWriter(new 
FileWriter(outpath));
=======================================
--- /trunk/atest/testresources/testlibs/ExampleJavaLibrary.class Wed Aug 25 05:10:48 2010 +++ /trunk/atest/testresources/testlibs/ExampleJavaLibrary.class Thu Aug 26 23:39:48 2010 
Binary file, no diff available.

Reply via email to