Merge pull request #3206 from bdbaddog/fix_java_tests_path_with_spaces

Revamp Java tools to search in reasonable paths.

13 files changed, 216 insertions, 0 deletions

diff --git a/test/Java/java_version_image/SConstruct b/test/Java/java_version_image/SConstruct
new file mode 100644
index 0000000..945c864
--- /dev/null
+++ b/test/Java/java_version_image/SConstruct
@@ -0,0 +1,35 @@
+
+AddOption('--javac_path',
+          dest='javac_path',
+          action='store',
+          default='/usr/bin',
+          type='string')
+
+AddOption('--java_version',
+          dest='java_version',
+          action='store',
+          default='1.6',
+          type='string')
+
+path=GetOption('javac_path')
+if path[0] == "'":
+    path = path[1:-1]
+
+version = GetOption('java_version')
+
+env = Environment(tools = ['javac'],
+                  JAVAVERSION = version,
+                  )
+
+
+env.AppendENVPath('PATH',path)
+
+# print('PATH:%s'%env['ENV']['PATH'])
+
+
+env.Java(target = 'class1', source = 'com/sub/foo')
+env.Java(target = 'class2', source = 'com/sub/bar')
+env.Java(target = 'class3', source = ['src1', 'src2'])
+env.Java(target = 'class4', source = ['src4'])
+env.Java(target = 'class5', source = ['src5'])
+env.Java(target = 'class6', source = ['src6'])
diff --git a/test/Java/java_version_image/class6/test$1.class b/test/Java/java_version_image/class6/test$1.class
new file mode 100644
index 0000000..dd58d98
--- /dev/null
+++ b/test/Java/java_version_image/class6/test$1.class
diff --git a/test/Java/java_version_image/com/sub/bar/Example4.java b/test/Java/java_version_image/com/sub/bar/Example4.java
new file mode 100644
index 0000000..0748d54
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/bar/Example4.java
@@ -0,0 +1,11 @@
+package com.sub.bar;
+
+public class Example4
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/com/sub/bar/Example5.java b/test/Java/java_version_image/com/sub/bar/Example5.java
new file mode 100644
index 0000000..69d2937
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/bar/Example5.java
@@ -0,0 +1,11 @@
+package com.other;
+
+public class Example5
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/com/sub/bar/Example6.java b/test/Java/java_version_image/com/sub/bar/Example6.java
new file mode 100644
index 0000000..1811b80
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/bar/Example6.java
@@ -0,0 +1,11 @@
+package com.sub.bar;
+
+public class Example6
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/com/sub/foo/Example1.java b/test/Java/java_version_image/com/sub/foo/Example1.java
new file mode 100644
index 0000000..82aac2e
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/foo/Example1.java
@@ -0,0 +1,11 @@
+package com.sub.foo;
+
+public class Example1
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/com/sub/foo/Example2.java b/test/Java/java_version_image/com/sub/foo/Example2.java
new file mode 100644
index 0000000..6349ac9
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/foo/Example2.java
@@ -0,0 +1,11 @@
+package com.other;
+
+public class Example2
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/com/sub/foo/Example3.java b/test/Java/java_version_image/com/sub/foo/Example3.java
new file mode 100644
index 0000000..092f0cd
--- /dev/null
+++ b/test/Java/java_version_image/com/sub/foo/Example3.java
@@ -0,0 +1,11 @@
+package com.sub.foo;
+
+public class Example3
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/src1/Example7.java b/test/Java/java_version_image/src1/Example7.java
new file mode 100644
index 0000000..80d94f2
--- /dev/null
+++ b/test/Java/java_version_image/src1/Example7.java
@@ -0,0 +1,9 @@
+public class Example7
+{
+
+     public static void main(String[] args)
+     {
+
+     }
+
+}
diff --git a/test/Java/java_version_image/src2/Test.java b/test/Java/java_version_image/src2/Test.java
new file mode 100644
index 0000000..6f224b0
--- /dev/null
+++ b/test/Java/java_version_image/src2/Test.java
@@ -0,0 +1,55 @@
+class Empty {
+}
+
+interface Listener {
+  public void execute();
+}
+
+public
+class
+Test {
+  class Inner {
+    void go() {
+      use(new Listener() {
+        public void execute() {
+          System.out.println("In Inner");
+        }
+      });
+    }
+    String s1 = "class A";
+    String s2 = "new Listener() { }";
+    /* class B */
+    /* new Listener() { } */
+  }
+
+  public static void main(String[] args) {
+    new Test().run();
+  }
+
+  void run() {
+    use(new Listener() {
+      public void execute() {
+        use(new Listener( ) {
+          public void execute() {
+            System.out.println("Inside execute()");
+          }
+        });
+      }
+    });
+
+    new Inner().go();
+  }
+
+  void use(Listener l) {
+    l.execute();
+  }
+}
+
+class Private {
+  void run() {
+    new Listener() {
+      public void execute() {
+      }
+    };
+  }
+}
diff --git a/test/Java/java_version_image/src4/NestedExample.java b/test/Java/java_version_image/src4/NestedExample.java
new file mode 100644
index 0000000..531f2e9
--- /dev/null
+++ b/test/Java/java_version_image/src4/NestedExample.java
@@ -0,0 +1,31 @@
+// import java.util.*;
+
+public class NestedExample
+{
+        public NestedExample()
+        {
+                new Thread() {
+                        public void start()
+                        {
+                                new Thread() {
+                                        public void start()
+                                        {
+                                                try {Thread.sleep(200);}
+                                                catch (Exception e) {}
+                                        }
+                                };
+                                while (true)
+                                {
+                                        try {Thread.sleep(200);}
+                                        catch (Exception e) {}
+                                }
+                        }
+                };
+        }
+
+
+        public static void main(String argv[])
+        {
+                new NestedExample();
+        }
+}
diff --git a/test/Java/java_version_image/src5/TestSCons.java b/test/Java/java_version_image/src5/TestSCons.java
new file mode 100644
index 0000000..46572c4
--- /dev/null
+++ b/test/Java/java_version_image/src5/TestSCons.java
@@ -0,0 +1,7 @@
+class TestSCons {
+    public static void main(String[] args) {
+        Foo[] fooArray = new Foo[] { new Foo() };
+    }
+}
+
+class Foo { }
diff --git a/test/Java/java_version_image/src6/TestSCons.java b/test/Java/java_version_image/src6/TestSCons.java
new file mode 100644
index 0000000..1aeed2f
--- /dev/null
+++ b/test/Java/java_version_image/src6/TestSCons.java
@@ -0,0 +1,13 @@
+class test
+{
+    test()
+    {
+        super();
+        new inner();
+    }
+
+    static class inner
+    {
+        private inner() {}
+    }
+}