diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:16:27 (GMT) |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-05-29 01:16:27 (GMT) |
commit | e37968dcdb65b228ec5bf0f738ca9121dd9282f2 (patch) | |
tree | 63665c6846af12f3677bada7e512b7a6e6b9b8d6 /src/engine/SCons/Tool/JavaCommonTests.py | |
parent | fe651b112c2182a058312b8803b86b99db59f8ff (diff) | |
download | SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.zip SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.tar.gz SCons-e37968dcdb65b228ec5bf0f738ca9121dd9282f2.tar.bz2 |
Fix for issue 2088: Java version 5 is same as 1.5 and 6 is same as 1.6.
Diffstat (limited to 'src/engine/SCons/Tool/JavaCommonTests.py')
-rw-r--r-- | src/engine/SCons/Tool/JavaCommonTests.py | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py index 1d01087..92649b2 100644 --- a/src/engine/SCons/Tool/JavaCommonTests.py +++ b/src/engine/SCons/Tool/JavaCommonTests.py @@ -184,6 +184,23 @@ class Private { ] assert classes == expect, (expect, classes) + pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '5') + assert pkg_dir is None, pkg_dir + expect = [ + 'Empty', + 'Listener', + 'Test$Inner$1', + 'Test$Inner', + 'Test$Inner2', + 'Test$Inner3', + 'Test$1', + 'Test$1$1', + 'Test', + 'Private$1', + 'Private', + ] + assert classes == expect, (expect, classes) + def test_comments(self): @@ -386,6 +403,9 @@ public class Foo { pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '1.5') assert classes == ['Foo$1', 'Foo$1$1', 'Foo'], classes + pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '6') + assert classes == ['Foo$1', 'Foo$1$1', 'Foo'], classes + def test_nested_anonymous_inner_classes(self): @@ -433,6 +453,10 @@ public class NestedExample expect = [ 'NestedExample$1', 'NestedExample$1$1', 'NestedExample' ] assert expect == classes, (expect, classes) + pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '6') + expect = [ 'NestedExample$1', 'NestedExample$1$1', 'NestedExample' ] + assert expect == classes, (expect, classes) + def test_private_inner_class_instantiation(self): """Test anonymous inner class generated by private instantiation""" @@ -535,6 +559,9 @@ public class Foo pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '1.6') assert expect == classes, (expect, classes) + pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '6') + assert expect == classes, (expect, classes) + if __name__ == "__main__": |