javaclass 0.4.1 → 0.4.2

data/lib/javaclass/classpath/temporary_unpacker.rb

@@ -37,7 +37,7 @@ module JavaClass
       def create_temporary_folder
         folder = File.join(find_temp_folder, "temp_#{File.basename(@jarfile)}_#{Time.now.to_i.to_s}")
         FileUtils.mkdir_p(folder)
-        at_exit { FileUtils.rm_r(folder) }
+        at_exit { FileUtils.rm_r(folder) if File.exist? folder }
         @folder = folder
       end
 

data/lib/javaclass/string_hexdump.rb

@@ -18,7 +18,7 @@ class String
       
       [ offset + columns, previous_lines + [line] ]
     }
-    offset, lines = *output
+    lines = output[1]
     lines.join
   end
   

data/license.txt

@@ -1,4 +1,4 @@
-=== BSD License
+=== BSD 2-Clause "Simplified" License
 
 Copyright (c) 2009, Peter Kofler.
 All rights reserved.
@@ -15,14 +15,14 @@ modification, are permitted provided that the following conditions are met:
 
 <b>
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIEDWARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR APARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANYDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,PROCUREMENT OF
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVERCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OROTHERWISE)
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCHDAMAGE.
+POSSIBILITY OF SUCH DAMAGE.
 </b>

data/test/data/access_flags/AccessFlagsTestAnonym.java

@@ -0,0 +1,9 @@
+package packagename;
+
+public class AccessFlagsTestAnonym {
+
+   private Runnable anonymous = new Runnable() { 
+      public void run() { }
+   };
+   
+}

data/test/data/access_flags/AccessFlagsTestPublic_javap.txt

@@ -1,4 +1,5 @@
 public class packagename.AccessFlagsTestPublic extends java.lang.Object
+  SourceFile: "AccessFlagsTestPublic.java"
   minor version: 0
   major version: 50
   Constant pool:

data/test/data/jar_searcher/PublicClass.java

@@ -2,11 +2,54 @@ package packagename;
 
 public class PublicClass {
 
-   class InnerClass {
+   private class PublicClass_PrivateInnerClass {
    }
 
+   private static class PublicClass_StaticPrivateInnerClass {
+   }
+
+   class PublicClass_PackageInnerClass {
+   }
+   
+   static class PublicClass_StaticPackageInnerClass {
+   }
+
+   public class PublicClass_PublicInnerClass {
+   }
+   
+   public static class PublicClass_StaticPublicInnerClass {
+   }
+   
+   void named() {
+       class Method_PackageInnerClass {
+       }
+   }
+
+   void anonymous() {
+       new Runnable() {
+           public void run() {
+           }
+       };
+   }
 }
 
 class PackageClass {
 
+    private class PackageClass_PrivateInnerClass {
+    }
+
+    private static class PackageClass_StaticPrivateInnerClass {
+    }
+
+    class PackageClass_PackageInnerClass {
+    }
+    
+    static class PackageClass_StaticPackageInnerClass {
+    }
+
+    public class PackageClass_PublicInnerClass {
+    }
+    
+    public static class PackageClass_StaticPublicInnerClass {
+    }
 }

data/test/data/jar_searcher/make.bat

@@ -1,4 +1,3 @@
-del *.class
 del *.jar
 
 md classes
@@ -7,7 +6,7 @@ cd classes
 jar -cf ..\JarClassListTest.jar *
 cd ..
 
-copy classes\packagename\*.class .
+rem copy classes\packagename\*.class .
 
 rmdir /S /Q classes
 pause

data/test/{test_access_flags.rb → test_class_access_flags.rb}

@@ -1,94 +1,92 @@
-require File.dirname(__FILE__) + '/setup'
-require 'javaclass/classfile/java_class_header'
-
-module TestJavaClass
-  module TestClassFile
-
-    class TestAccessFlags < Test::Unit::TestCase
-
-      def setup
-        %w[Public Package Abstract Interface Final Enum Annotation
-           Public$Inner Public$StaticInner Public$InnerInterface Enum$1 Inner Inner$1 Inner$2].each do |t|
-          binary_data = load_class("access_flags/AccessFlagsTest#{t}")
-          clazz = JavaClass::ClassFile::JavaClassHeader.new(binary_data)
-          variable_name = t.sub(/Public\$/, 'public_').
-                            sub(/Inner\$1/, 'anonymous').
-                            sub(/Inner\$2/, 'static_anonymous').
-                            sub(/Enum\$1/,  'enum_inner').
-                            downcase
-          eval("@#{variable_name} = clazz.access_flags")
-        end
-      end
-
-      def test_flags_hex
-        assert_equal('0021', @public.flags_hex)
-        assert_equal('0020', @package.flags_hex)
-      end
-
-      def test_accessible_eh
-        assert(@public.accessible?)
-        assert(!@package.accessible?)
-      end
-
-      def test_public_eh
-        assert(@public.public?)
-        assert(!@package.public?)
-      end
-
-      def test_interface_eh
-        assert(!@public.interface?)
-        assert(!@abstract.interface?)
-        assert(@interface.interface?)
-        assert(@public_innerinterface.interface?)
-        assert(@annotation.interface?)
-      end
-
-      def test_abstract_eh
-        assert(!@public.abstract?)
-        assert(@abstract.abstract?)
-        assert(@interface.abstract?)
-        assert(@public_innerinterface.abstract?)
-        assert(@annotation.abstract?)
-      end
-
-      def test_final_eh
-        assert(!@public.final?)
-        assert(!@abstract.final?)
-        assert(!@interface.final?)
-        assert(@final.final?)
-        assert(!@enum.final?) # because we have a inner class
-        assert(@enum_inner.final?)
-      end
-
-      def test_enum_eh
-        assert(!@public.enum?)
-        assert(@enum.enum?)
-        assert(@enum_inner.enum?)
-      end
-
-#      def test_inner_eh
-#        assert(!@public.inner?)
-#        assert(!@public_inner.inner?)
-#        assert(!@inner.inner?)
-#        assert(!@anonymous.inner?)
-#        assert(!@static_anonymous.inner?)
-#        assert(!@enum_inner.inner?)
-#      end
-
-      def test_annotation_eh
-        assert(!@public.annotation?)
-        assert(!@public_innerinterface.annotation?)
-        assert(!@interface.annotation?)
-        assert(@annotation.annotation?)
-      end
-      
-      def test_class_new_jdk10_fix
-        flags = JavaClass::ClassFile::JavaClassHeader.new(load_class('Runnable_102')).access_flags
-        assert(flags.abstract?)
-        assert(flags.interface?)
-      end
-      
-    end
-
-  end
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classfile/java_class_header'
+
+module TestJavaClass
+  module TestClassFile
+
+    class TestClassAccessFlags < Test::Unit::TestCase
+
+      def setup
+        %w[Public Package Abstract Interface Final Enum Annotation
+           Public$InnerInterface Enum$1 Anonym$1].each do |t|
+          binary_data = load_class("access_flags/AccessFlagsTest#{t}")
+          clazz = JavaClass::ClassFile::JavaClassHeader.new(binary_data)
+          variable_name = t.sub(/Public\$/, 'public_').
+                            sub(/Anonym\$1/, 'anonymous').
+                            sub(/Enum\$1/,  'enum_inner').
+                            downcase
+          eval("@#{variable_name} = clazz.access_flags")
+        end
+      end
+
+      def test_flags_hex
+        assert_equal('0021', @public.flags_hex)
+        assert_equal('0020', @package.flags_hex)
+      end
+
+      def test_accessible_eh
+        assert(@public.accessible?)
+        assert(!@package.accessible?)
+      end
+
+      def test_public_eh
+        assert(@public.public?)
+        assert(!@package.public?)
+      end
+
+      def test_interface_eh
+        assert(!@public.interface?)
+        assert(!@abstract.interface?)
+        assert(@interface.interface?)
+        assert(@public_innerinterface.interface?)
+        assert(@public_innerinterface.interface_class?)
+        assert(@annotation.interface?)
+        assert(!@annotation.interface_class?)
+      end
+
+      def test_abstract_eh
+        assert(!@public.abstract?)
+        assert(@abstract.abstract?)
+        assert(@interface.abstract?)
+        assert(@public_innerinterface.abstract?)
+        assert(@annotation.abstract?)
+      end
+
+      def test_final_eh
+        assert(!@public.final?)
+        assert(!@abstract.final?)
+        assert(!@interface.final?)
+        assert(@final.final?)
+        assert(!@enum.final?) # because we have a inner class
+        assert(@enum_inner.final?)
+      end
+
+      def test_enum_eh
+        assert(!@public.enum?)
+        assert(@enum.enum?)
+        assert(@enum_inner.enum?)
+      end
+
+      def test_annotation_eh
+        assert(!@public.annotation?)
+        assert(!@public_innerinterface.annotation?)
+        assert(!@interface.annotation?)
+        assert(@annotation.annotation?)
+      end
+
+      def test_synthetic_eh
+        assert(!@public.synthetic?)
+        # assert(@anonymous.synthetic?) # should be but is not, hmm
+        # assert(@enum_inner.synthetic?)
+      end
+      
+      def test_class_new_jdk10_fix
+        flags = JavaClass::ClassFile::JavaClassHeader.new(load_class('Runnable_102')).access_flags
+        assert(flags.abstract?)
+        assert(flags.interface?)
+      end
+      
+    end
+
+  end
 end

data/test/test_class_file_attributes.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classfile/java_class_header'
+
+module TestJavaClass
+  module TestClassFile
+
+    class TestClassFileAttributes < Test::Unit::TestCase
+
+      def setup
+        %w[Public Public$Inner Public$StaticInner Public$InnerInterface Enum$1 Anonym$1].each do |t|
+          binary_data = load_class("access_flags/AccessFlagsTest#{t}")
+          clazz = JavaClass::ClassFile::JavaClassHeader.new(binary_data)
+          variable_name = t.sub(/Public\$/, 'public_').
+                            sub(/Anonym\$1/, 'anonymous').
+                            sub(/Enum\$1/,  'enum_inner').
+                            downcase
+          eval("@#{variable_name} = clazz.attributes")
+        end
+      end
+
+      def test_inner_eh
+        assert(!@public.inner_class?)
+        assert(@public_inner.inner_class?)
+        assert(@public_staticinner.inner_class?)
+        assert(@public_innerinterface.inner_class?)
+        assert(@anonymous.inner_class?)
+        assert(@enum_inner.inner_class?)
+      end
+
+      def test_static_inner_eh
+        assert(!@public_inner.static_inner_class?)
+        assert(@public_staticinner.static_inner_class?)
+        assert(@public_innerinterface.static_inner_class?)
+        assert(!@anonymous.static_inner_class?)
+        assert(@enum_inner.static_inner_class?)
+      end
+
+      def test_anonymous_eh
+        assert(!@public.anonymous?)
+        assert(!@public_inner.anonymous?)
+        assert(@anonymous.anonymous?)
+        assert(@enum_inner.anonymous?)
+      end
+
+      def test_source_file
+        assert_equal('AccessFlagsTestPublic.java', @public.source_file)
+        assert_equal('AccessFlagsTestPublic.java', @public_inner.source_file)
+      end
+      
+      def test_outer_class
+        assert_equal('packagename/AccessFlagsTestPublic', @public.outer_class)
+        assert_equal('packagename/AccessFlagsTestPublic', @public_inner.outer_class)
+      end
+    end
+
+  end
+end

data/test/test_constant_pool.rb

@@ -116,6 +116,37 @@ const #43 = Asciz       java/lang/Runnable;'
           JavaClass::ClassFile::ConstantPool.new(data)
         }
       end
+      
+      def test_java_8_tag_15
+        @cp = JavaClass::ClassFile::ConstantPool.new(load_class('constant_pool/Java8_JavaFX_Animation$1_Tag15'))
+        found = @cp.find(JavaClass::ClassFile::ConstantPool::METHOD_HANDLE_TAG)
+        assert_equal(2, found.size)
+        assert_equal('MethodHandle', found[0].name)
+
+        found = @cp.find(JavaClass::ClassFile::ConstantPool::METHOD_TYPE_TAG)
+        assert_equal(2, found.size)
+        assert_equal('MethodType', found[0].name)
+        assert_equal('()Ljava/lang/Object;', found[0].method_type_value)
+        
+        found = @cp.find(JavaClass::ClassFile::ConstantPool::INVOKE_DYNAMIC_TAG)
+        assert_equal(1, found.size)
+        assert_equal('InvokeDynamic', found[0].name)
+        assert_equal('run:(Ljavafx/animation/Animation$1;J)Ljava/security/PrivilegedAction;', found[0].name_and_type_value)
+      end
+
+      def test_java_9_tag_20
+        @cp = JavaClass::ClassFile::ConstantPool.new(load_class('constant_pool/Java9_Activation_module-info_Tag20'))
+        found = @cp.find(JavaClass::ClassFile::ConstantPool::MODULE_TAG)
+        assert_equal(4, found.size)
+        assert_equal('Module', found[0].name)
+        assert_equal('java.activation', found[0].name_value)
+
+        found = @cp.find(JavaClass::ClassFile::ConstantPool::PACKAGE_TAG)
+        assert_equal(2, found.size)
+        assert_equal('Package', found[1].name)
+        assert_equal('javax/activation', found[1].name_value)
+      end
+      
     end
 
   end

data/test/test_jar_searcher.rb

@@ -9,7 +9,8 @@ module TestJavaClass
     class TestJarSearcher < Test::Unit::TestCase
 
       PACKAGE_CLASS = "packagename/PackageClass.class"
-      INNER_CLASS = "packagename/PublicClass$InnerClass.class"
+      INNER_CLASS = "packagename/PublicClass$PublicClass_PackageInnerClass.class"
+      PUBLIC_INNER_CLASS = "packagename/PackageClass$PackageClass_PublicInnerClass.class"
       PUBLIC_CLASS = "packagename/PublicClass.class"
       PUBLIC_INTERFACE = "packagename/PublicInterface.class"
       CLASSES = [INNER_CLASS, PUBLIC_CLASS, PUBLIC_INTERFACE, PACKAGE_CLASS]
@@ -44,14 +45,15 @@ module TestJavaClass
       end
 
       def test_public_eh
-        @cpe = JavaClass::Classpath::JarClasspath.new(File.expand_path("#{TEST_DATA_PATH}/jar_searcher/JarClassListTest.jar"))
+        @cpe = create_jar_searcher
         assert(!@cs.public?(@cpe, PACKAGE_CLASS))
         assert(!@cs.public?(@cpe, INNER_CLASS))
         assert(@cs.public?(@cpe, PUBLIC_CLASS))
+        assert(@cs.public?(@cpe, PUBLIC_INNER_CLASS))
       end
-
+      
       def test_public_eh_fails
-        @cpe = JavaClass::Classpath::JarClasspath.new(File.expand_path("#{TEST_DATA_PATH}/jar_searcher/JarClassListTest.jar"))
+        @cpe = create_jar_searcher
         assert_raise(JavaClass::Classpath::ClassNotFoundError){ @cs.public?(@cpe, 'NonExistingClass') }
 
         @cpe = JavaClass::Classpath::FolderClasspath.new(File.expand_path("#{TEST_DATA_PATH}/jar_searcher"))
@@ -59,7 +61,11 @@ module TestJavaClass
           @cs.public?(@cpe, 'BrokenRunnable_102') 
         }
       end
-      
+
+      def create_jar_searcher
+        JavaClass::Classpath::JarClasspath.new(File.expand_path("#{TEST_DATA_PATH}/jar_searcher/JarClassListTest.jar"))
+      end
+
       class MockList # ZenTest SKIP mock class
         attr_reader :versions
         attr_reader :modifiers
@@ -81,9 +87,16 @@ module TestJavaClass
         def size
           @entries.size
         end
+        
+        def to_s
+          @entries.join("\n")
+        end
       end
 
-      def test_compile_list
+      def test_compile_list_no_inner_classes
+        # @cs.skip_inner_classes = true # default
+        # @cs.skip_package_classes = false # default
+
         list = @cs.compile_list(2, "#{TEST_DATA_PATH}/jar_searcher", MockList.new )
 
         assert_equal(3, list.size)
@@ -92,14 +105,34 @@ module TestJavaClass
         assert_equal([2, 2, 2], list.versions)
       end
 
-      def test_skip_package_classes_equals
+      def test_compile_list_no_inner_no_package_classes
+        # @cs.skip_inner_classes = true # default
         @cs.skip_package_classes = true
+        
         list = @cs.compile_list(3, "#{TEST_DATA_PATH}/jar_searcher", MockList.new )
 
         assert_equal(2, list.size)
         assert_equal([PUBLIC_CLASS, PUBLIC_INTERFACE], list.entries)
       end
 
+      def test_compile_list_all_public_and_package_classes
+        @cs.skip_inner_classes = false
+        # @cs.skip_package_classes = false # default
+        
+        list = @cs.compile_list(3, "#{TEST_DATA_PATH}/jar_searcher", MockList.new )
+        
+        assert_equal(3 + 2 + 2, list.size) # 3 files, 2 static inner in public, 2 static inner in package 
+      end
+      
+      def test_compile_list_all_public_and_no_package_classes
+        @cs.skip_inner_classes = false 
+        @cs.skip_package_classes = true
+        
+        list = @cs.compile_list(3, "#{TEST_DATA_PATH}/jar_searcher", MockList.new )
+        
+        assert_equal(2 + 1, list.size) # 2 files, 1 public static inner in public 
+      end
+      
     end
 
   end