avoid regression in loading Java classes with upper case package names (

fixes #2742) ... caused by the internal cleanup (the regression is not part of any 1.7.x release) one can only test this with *-Xji.upper.case.package.name.allowed=true* but since there's another failure the feature introduces, this will need to be revisited
jruby · Mar 25, 2015 · f4ff889 · f4ff889
1 parent 052e0d0
commit f4ff889
Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -943,8 +943,13 @@ private static RubyModule getProxyOrPackageUnderPackage(final ThreadContext cont
                         // we'll try as a package
                         result = getJavaPackageModule(runtime, fullName);
                         // NOTE result = getPackageModule(runtime, name);
+                        if ( result == null ) {
+                            throw runtime.newNameError("missing class (or package) name (`" + fullName + "')", fullName);
+                        }
+                    }
+                    else {
+                        throw runtime.newNameError("missing class name (`" + fullName + "')", fullName);
                     }
-                    throw runtime.newNameError("missing class name (`" + fullName + "')", fullName);
                 }
             }
             catch (RuntimeException e) {

diff --git a/test/org/jruby/javasupport/TestApp/UpperClass.java b/test/org/jruby/javasupport/TestApp/UpperClass.java
@@ -0,0 +1,5 @@
+package org.jruby.javasupport.TestApp;
+
+public abstract class UpperClass {
+    public static Object UglyMethod() { return "UGLY!"; }
+}
diff --git a/test/org/jruby/javasupport/TestApp/lowerClass.java b/test/org/jruby/javasupport/TestApp/lowerClass.java
@@ -0,0 +1,5 @@
+package org.jruby.javasupport.TestApp;
+
+public class lowerClass {
+    public static String UglyMethod() { return "ugly!"; }
+}
diff --git a/test/test_higher_javasupport.rb b/test/test_higher_javasupport.rb
@@ -13,6 +13,8 @@ class TestHigherJavasupport < Test::Unit::TestCase
   Annotation = java.lang.annotation.Annotation
   ClassWithPrimitive = org.jruby.test.ClassWithPrimitive
 
+  ALLOW_UPPERCASE_PACKAGE_NAMES = JRuby.runtime.getInstanceConfig.getAllowUppercasePackageNames
+
   def test_java_int_primitive_assignment
     assert_nothing_raised {
       cwp = ClassWithPrimitive.new
@@ -447,8 +449,10 @@ def test_expected_missing_interface_method
   end
 
   def test_that_misspelt_fq_class_names_dont_stop_future_fq_class_names_with_same_inner_most_package
+    # NOTE: with ALLOW_UPPERCASE_PACKAGE_NAMES this raises nothing !
     assert_raises(NameError) { Java::java.til.zip.ZipFile }
-    assert_nothing_raised { Java::java.util.zip.ZipFile }
+    Java::java.util.zip.ZipFile
+    Java::java.util.zip.ZipFile::OPEN_READ
   end
 
   def test_that_subpackages_havent_leaked_into_other_packages
@@ -465,6 +469,19 @@ def test_that_we_get_the_same_package_instance_on_subsequent_calls
     assert(com.flirble.equal?(com.flirble))
   end
 
+  def test_uppercase_package_name_and_lowercase_class_name # and upper-case method
+    Java::org.jruby.javasupport.TestApp
+    Java::org.jruby.javasupport.TestApp.UpperClass
+    assert_equal 'UGLY!', Java::org.jruby.javasupport.TestApp::UpperClass.UglyMethod
+
+    Java::org.jruby.javasupport.TestApp::lowerClass
+    assert_equal 'ugly!', Java::org.jruby.javasupport.TestApp.lowerClass.UglyMethod
+
+    # NOTE: can not work due package case conventions :
+    # Java::OrgJrubyJavasupportTestApp::UpperClass
+    # Java::OrgJrubyJavasupportTestApp::lowerClass
+  end if ALLOW_UPPERCASE_PACKAGE_NAMES
+
   @@include_proc = Proc.new do
     Thread.stop
     java_import "java.lang.System"