Merged revisions 1826-1882 via svnmerge from

[scons.git] / test / Java / JAVAC.py

diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index 7c063245d084def18ebe03df6cfab4483a0170f1..09639ea674c5e0f34aa71f9857f69ae946bd6b87 100644 (file)
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -24,6 +24,10 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+"""
+Test setting the JAVAC variable.
+"""
+
 import os
 import os.path
 import string
@@ -93,223 +97,4 @@ line 3
 
 
 
-ENV = test.java_ENV()
-
-if test.detect_tool('javac', ENV=ENV):
-    where_javac = test.detect('JAVAC', 'javac', ENV=ENV)
-else:
-    where_javac = test.where_is('javac')
-if not where_javac:
-    test.skip_test("Could not find Java javac, skipping test(s).\n")
-
-
-
-test.write("wrapper.py", """\
-import os
-import string
-import sys
-open('%s', 'ab').write("wrapper.py %%s\\n" %% string.join(sys.argv[1:]))
-os.system(string.join(sys.argv[1:], " "))
-""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
-
-test.write('SConstruct', """
-foo = Environment(tools = ['javac'],
-                  JAVAC = r'%(where_javac)s')
-javac = foo.Dictionary('JAVAC')
-bar = foo.Clone(JAVAC = r'%(_python_)s wrapper.py ' + javac)
-foo.Java(target = 'class1', source = 'com/sub/foo')
-bar.Java(target = 'class2', source = 'com/sub/bar')
-foo.Java(target = 'class3', source = ['src1', 'src2'])
-""" % locals())
-
-test.subdir('com',
-            ['com', 'sub'],
-            ['com', 'sub', 'foo'],
-            ['com', 'sub', 'bar'],
-            'src1',
-            'src2')
-
-test.write(['com', 'sub', 'foo', 'Example1.java'], """\
-package com.sub.foo;
-
-public class Example1
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['com', 'sub', 'foo', 'Example2.java'], """\
-package com.other;
-
-public class Example2
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['com', 'sub', 'foo', 'Example3.java'], """\
-package com.sub.foo;
-
-public class Example3
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['com', 'sub', 'bar', 'Example4.java'], """\
-package com.sub.bar;
-
-public class Example4
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['com', 'sub', 'bar', 'Example5.java'], """\
-package com.other;
-
-public class Example5
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['com', 'sub', 'bar', 'Example6.java'], """\
-package com.sub.bar;
-
-public class Example6
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-test.write(['src1', 'Example7.java'], """\
-public class Example7
-{
-
-     public static void main(String[] args)
-     {
-
-     }
-
-}
-""")
-
-# Acid-test file for parsing inner Java classes, courtesy Chad Austin.
-test.write(['src2', 'Test.java'], """\
-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() {
-      }
-    };
-  }
-}
-""")
-
-test.run(arguments = '.')
-
-expected_wrapper_out = "wrapper.py %s -d class2 -sourcepath com/sub/bar com/sub/bar/Example4.java com/sub/bar/Example5.java com/sub/bar/Example6.java\n"
-expected_wrapper_out = string.replace(expected_wrapper_out, '/', os.sep)
-test.must_match('wrapper.out', expected_wrapper_out % where_javac)
-
-test.must_exist(test.workpath('class1', 'com', 'sub', 'foo', 'Example1.class'))
-test.must_exist(test.workpath('class1', 'com', 'other', 'Example2.class'))
-test.must_exist(test.workpath('class1', 'com', 'sub', 'foo', 'Example3.class'))
-
-test.must_exist(test.workpath('class2', 'com', 'sub', 'bar', 'Example4.class'))
-test.must_exist(test.workpath('class2', 'com', 'other', 'Example5.class'))
-test.must_exist(test.workpath('class2', 'com', 'sub', 'bar', 'Example6.class'))
-
-test.must_exist(test.workpath('class3', 'Example7.class'))
-
-test.must_exist(test.workpath('class3', 'Empty.class'))
-test.must_exist(test.workpath('class3', 'Listener.class'))
-test.must_exist(test.workpath('class3', 'Private.class'))
-test.must_exist(test.workpath('class3', 'Private$1.class'))
-test.must_exist(test.workpath('class3', 'Test.class'))
-test.must_exist(test.workpath('class3', 'Test$1.class'))
-test.must_exist(test.workpath('class3', 'Test$2.class'))
-test.must_exist(test.workpath('class3', 'Test$3.class'))
-test.must_exist(test.workpath('class3', 'Test$Inner.class'))
-
-test.up_to_date(arguments = '.')
-
 test.pass_test()