javaclass 0.0.3 → 0.0.4

data/test/test_class_entry.rb

@@ -3,26 +3,26 @@ require 'javaclass/classlist/class_entry'
 
 module TestJavaClass
   module TestClassList
-    
+
     class TestClassEntry < Test::Unit::TestCase
-      
+
       attr_reader :version
-      
+
       def test_update
         # fake methods for zentest, tested in all other tests
         assert(true)
       end
-      
+
       def test_public_eh
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', true, 0)
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', :public, 0)
         assert(ce.public?)
-        
+
         ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', false, 0)
         assert(!ce.public?)
       end
-      
+
       def test_version
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', true, 0)
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', :public, 0)
         assert_equal([0], ce.version)
 
         ce.update(1)
@@ -31,10 +31,10 @@ module TestJavaClass
         ce.update(2)
         assert_equal([0,1,2], ce.version)
       end
-      
+
       def test_to_full_qualified_s_first
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', true, 0)
-        
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', :public, 0)
+
         # new class in 0
         assert_equal("pkg.Class - \n", ce.to_full_qualified_s(0,0))
         # class only in 0, package in 1
@@ -43,12 +43,12 @@ module TestJavaClass
         ce.update(1)
         assert_equal("pkg.Class - \n", ce.to_full_qualified_s(0,1))
         # dropped in 2
-        assert_equal("pkg.Class [-1] - \n", ce.to_full_qualified_s(0,2)) 
+        assert_equal("pkg.Class [-1] - \n", ce.to_full_qualified_s(0,2))
         # class also in 2
         ce.update(2)
         assert_equal("pkg.Class - \n", ce.to_full_qualified_s(0,2))
       end
-      
+
       def test_to_full_qualified_s_package
         ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', false, 0)
         # new class in 0
@@ -59,15 +59,15 @@ module TestJavaClass
         ce.update(1)
         assert_equal("pkg.Class [p] - \n", ce.to_full_qualified_s(0,1))
         # dropped in 2
-        assert_equal("pkg.Class [-1p] - \n", ce.to_full_qualified_s(0,2)) 
+        assert_equal("pkg.Class [-1p] - \n", ce.to_full_qualified_s(0,2))
         # class also in 2
         ce.update(2)
         assert_equal("pkg.Class [p] - \n", ce.to_full_qualified_s(0,2))
       end
-      
+
       def test_to_full_qualified_s_later
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', true, 1)
-        
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', :public, 1)
+
         # list is only for 1
         assert_equal("pkg.Class - \n", ce.to_full_qualified_s(1,1))
         # new class in 1
@@ -80,10 +80,10 @@ module TestJavaClass
         # dropped in 3
         assert_equal("pkg.Class [1-2] - \n", ce.to_full_qualified_s(0,3))
       end
-      
+
       def test_to_full_qualified_s_later_package
         ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg.Class', false, 1)
-        
+
         # list is only for 1
         assert_equal("pkg.Class [1p] - \n", ce.to_full_qualified_s(1,1))
         # new class in 1
@@ -96,103 +96,103 @@ module TestJavaClass
         # dropped in 3
         assert_equal("pkg.Class [1-2p] - \n", ce.to_full_qualified_s(0,3))
       end
-      
+
       def test_to_package_shortcut_s
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', true, 0)
-        
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', :public, 0)
+
         # new class in 0
-        @version = [0] 
+        @version = [0]
         assert_equal("   Class2 - \n", ce.to_package_shortcut_s)
-        
+
         # class only in 0, package in 1
-        @version = [0,1] 
+        @version = [0,1]
         assert_equal("   Class2 [only 0] - \n", ce.to_package_shortcut_s)
-        
+
         # class also in 1
         ce.update(1)
         assert_equal("   Class2 - \n", ce.to_package_shortcut_s)
-        
+
         # class dropped in 2, package exists
-        @version = [0,1,2] 
+        @version = [0,1,2]
         assert_equal("   Class2 [-1] - \n", ce.to_package_shortcut_s)
-        
+
         # class also in 2
         ce.update(2)
         assert_equal("   Class2 - \n", ce.to_package_shortcut_s)
       end
-      
+
       def test_to_package_shortcut_s_package
         ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', false, 0)
-        
+
         # new class in 0
-        @version = [0] 
+        @version = [0]
         assert_equal("   Class2 [p] - \n", ce.to_package_shortcut_s)
-        
+
         # class only in 0, package in 1
-        @version = [0,1] 
+        @version = [0,1]
         assert_equal("   Class2 [only 0p] - \n", ce.to_package_shortcut_s)
-        
+
         # class also in 1
         ce.update(1)
         assert_equal("   Class2 [p] - \n", ce.to_package_shortcut_s)
-        
+
         # class dropped in 2, package exists
-        @version = [0,1,2] 
+        @version = [0,1,2]
         assert_equal("   Class2 [-1p] - \n", ce.to_package_shortcut_s)
-        
+
         # class also in 2
         ce.update(2)
         assert_equal("   Class2 [p] - \n", ce.to_package_shortcut_s)
       end
-      
+
       def test_to_package_shortcut_s_later
-        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', true, 1)
-        
+        ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', :public, 1)
+
         # list is only for 1
-        @version = [1] 
+        @version = [1]
         assert_equal("   Class2 - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1
-        @version = [0,1] 
+        @version = [0,1]
         assert_equal("   Class2 [1] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1, not in 2
-        @version = [0,1,2] 
+        @version = [0,1,2]
         assert_equal("   Class2 [only 1] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1, also in 2
         ce.update(2)
         assert_equal("   Class2 [1] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1 and 2, not in 3
-        @version = [0,1,2,3] 
+        @version = [0,1,2,3]
         assert_equal("   Class2 [1-2] - \n", ce.to_package_shortcut_s)
       end
-      
+
       def test_to_package_shortcut_s_later_package
         ce = JavaClass::ClassList::ClassEntry.new(self, 'pkg2.Class2', false, 1)
-        
+
         # list is only for 1
-        @version = [1] 
+        @version = [1]
         assert_equal("   Class2 [1p] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1
-        @version = [0,1] 
+        @version = [0,1]
         assert_equal("   Class2 [1p] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1, not in 2
-        @version = [0,1,2] 
+        @version = [0,1,2]
         assert_equal("   Class2 [only 1p] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1, also in 2
         ce.update(2)
         assert_equal("   Class2 [1p] - \n", ce.to_package_shortcut_s)
-        
+
         # new class in 1 and 2, not in 3
-        @version = [0,1,2,3] 
+        @version = [0,1,2,3]
         assert_equal("   Class2 [1-2p] - \n", ce.to_package_shortcut_s)
       end
-      
+
     end
   end
 end

data/test/test_class_magic.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classfile/class_magic'
+
+module TestJavaClass
+  module TestClassFile
+
+    class TestClassMagic < Test::Unit::TestCase
+
+      def setup
+        @magic = JavaClass::ClassFile::ClassMagic.new(load_class('Object_102'))
+        @wrong = JavaClass::ClassFile::ClassMagic.new("\xCA\xFE\xBA\xBF")
+      end
+
+      def test_valid_eh
+        assert(@magic.valid?)
+        assert(!@wrong.valid?)
+      end
+
+      def test_bytes
+        assert_equal("\xCA\xFE\xBA\xBE", @magic.bytes)
+      end
+
+      def test_check
+        @magic.check # ok
+        assert_raise(JavaClass::ClassFile::ClassFormatError) { @wrong.check }      
+      end
+      
+    end
+
+  end
+end

data/test/test_class_version.rb

@@ -3,59 +3,59 @@ require 'javaclass/classfile/class_version'
 
 module TestJavaClass
   module TestClassFile
-    
+
     class TestClassVersion < Test::Unit::TestCase
-      
+
       def setup
-        @v = (0..6).collect do |i| 
-          JavaClass::ClassFile::ClassVersion.new(load_class("class_version/ClassVersionTest1#{i}")) 
+        @v = (0..7).collect do |i|
+          JavaClass::ClassFile::ClassVersion.new(load_class("class_version/ClassVersionTest1#{i}"))
         end
       end
-      
-      # Assert the list of +v+ against the list of _expectations_ when invoking the given block.
+
+      # Assert the list of +@v+ against the list of _expectations_ when invoking the given block.
       def assert_classes(expectations)
-        expectations.values_at.each do |i|
-          assert_equal(expectations[i], yield(@v[i]), "#{i}. element")
+        (0...expectations.size).each do |i|
+          assert_equal(expectations[i], yield(@v[i]), "#{i}. element is wrong")
         end
       end
-      
+
       def test_major
-        assert_classes([45, 45, 46, 47, 48, 49, 50]) {|v| v.major}
+        assert_classes([45, 45, 46, 47, 48, 49, 50, 51]) { |v| v.major }
       end
-      
+
       def test_minor
-        assert_classes([3, 3, 0, 0, 0, 0, 0]) {|v| v.minor}
-        assert_equal(3, @v[1].minor) # shouldn't it be > 45.3  
+        assert_classes([3, 3, 0, 0, 0, 0, 0, 0]) {|v| v.minor}
+        assert_equal(3, @v[1].minor) # shouldn't it be > 45.3, so JDK 1.1 still generates 1.0 byte code
       end
-      
+
       def test_to_s
         assert_equal('50.0', @v[6].to_s)
         assert_equal('45.3', @v[0].to_s)
       end
-      
+
       def test_dump
         assert_equal(['  minor version: 0', '  major version: 50'], @v[6].dump)
       end
-      
+
       def test_to_f
         assert_equal(50.0, @v[6].to_f)
         assert_equal(45.3, @v[0].to_f)
-        
+
         v = JavaClass::ClassFile::ClassVersion.new("....\000\xff\0002")
-        assert_equal(50.255, v.to_f) 
-        
+        assert_equal(50.255, v.to_f)
+
         v = JavaClass::ClassFile::ClassVersion.new("....\xff\xff\0002")
-        assert_equal(50.65535, v.to_f) 
+        assert_equal(50.65535, v.to_f)
       end
-      
+
       def test_jdk_version
-        assert_classes(%w[1.0 1.0 1.2 1.3 1.4 1.5 1.6]) {|v| v.jdk_version}
-        
+        assert_classes(%w[1.0 1.0 1.2 1.3 1.4 1.5 1.6 1.7]) { |v| v.jdk_version }
+
         v = JavaClass::ClassFile::ClassVersion.new("....\000\xff\0002")
         assert_equal('unknown', v.jdk_version)
       end
-      
+
     end
-    
+
   end
 end

data/test/test_composite_classpath.rb

@@ -3,66 +3,65 @@ require 'javaclass/classpath/composite_classpath'
 
 module TestJavaClass
   module TestClasspath
-    
+
     class TestCompositeClasspath < Test::Unit::TestCase
-      
+
       def setup
         @cpe = JavaClass::Classpath::CompositeClasspath.new
         @cpe.add_file_name "#{TEST_DATA_PATH}/jar_classpath/JarClasspathTestManifest.jar"
       end
-      
+
       def test_add_element
         # fake methods for zentest, tested in setup and add_file_name
         assert(true)
       end
-      
+
       def test_add_file_name
-        @cpe.add_file_name "#{TEST_DATA_PATH}/folder_classpath/JarClasspathTestFolder"
+        @cpe.add_file_name "#{TEST_DATA_PATH}/folder_classpath/classes"
         assert_equal(2+1+2, @cpe.count)
       end
-      
+
       def test_additional_classpath
         assert_equal([], @cpe.additional_classpath)
       end
-      
+
       def test_jar_eh
         assert(!@cpe.jar?)
       end
-      
+
       def test_count
         assert_equal(2+1, @cpe.count)
       end
-      
+
       def test_elements
         assert_equal(2, @cpe.elements.size)
+        assert_equal("#{TEST_DATA_PATH}/jar_classpath/JarClasspathTestManifest.jar", @cpe.elements[0].to_s)
         assert_equal("#{TEST_DATA_PATH}/jar_classpath/JarClasspathTest.jar", @cpe.elements[1].to_s)
       end
-      
+
       def test_includes_eh
         assert(@cpe.includes?('ClassVersionTest11.class'))
         assert(@cpe.includes?('ClassVersionTest11'))
         assert(@cpe.includes?('ClassVersionTest10.class'))
         assert(@cpe.includes?('ClassVersionTest10'))
       end
-      
+
       def test_load_binary
+        # JarClasspathTestManifest.jar
+        assert_equal(load_class('class_version/ClassVersionTest11'), @cpe.load_binary('package/ClassVersionTest11.class'))
+        # JarClasspathTest.jar
         assert_equal(load_class('class_version/ClassVersionTest11'), @cpe.load_binary('ClassVersionTest11'))
         assert_equal(load_class('class_version/ClassVersionTest10'), @cpe.load_binary('ClassVersionTest10'))
-        assert_equal(load_class('class_version/ClassVersionTest11'), @cpe.load_binary('package/ClassVersionTest11.class'))
+          
+        assert_raise(JavaClass::Classpath::ClassNotFoundError) { @cpe.load_binary('NonExisting') }
       end
-      
+
       def test_names
         assert_equal(['ClassVersionTest11.class', 'ClassVersionTest10.class', 'package/ClassVersionTest11.class'], @cpe.names)
+        assert_equal(['ClassVersionTest11.class', 'package/ClassVersionTest11.class'], @cpe.names { |n| n=~ /11/ })
       end
       
-      def test_find_jars
-        @cpe = JavaClass::Classpath::CompositeClasspath.new
-        @cpe.find_jars("#{TEST_DATA_PATH}/jar_classpath")
-        assert_equal(4, @cpe.elements.size)
-        assert_equal(File.expand_path("#{TEST_DATA_PATH}/jar_classpath/JarClasspathTest.zip"), @cpe.elements[1].to_s)
-      end
-      
-    end
-    
+    end unless defined? TestCompositeClasspath
+
   end
-end
+end

data/test/test_constant_pool.rb

@@ -3,9 +3,9 @@ require 'javaclass/classfile/constant_pool'
 
 module TestJavaClass
   module TestClassFile
-    
+
     class TestConstantPool < Test::Unit::TestCase
-      
+
       # 1.6.0_11 javap.exe output of test class, only tweaked the float value a bit...
       JAVAP_OUTPUT = '  Constant pool:
 const #1 = Method       #15.#33;        //  java/lang/Object."<init>":()V
@@ -13,7 +13,7 @@ const #2 = String       #34;    //  String field
 const #3 = Field        #14.#35;        //  ConstantPoolTest.stringField:Ljava/lang/String;
 const #4 = InterfaceMethod      #16.#36;        //  java/lang/Runnable.run:()V
 const #5 = Field        #14.#37;        //  ConstantPoolTest.intField:I
-const #6 = float        3.14158995322368e+022f;
+const #6 = float        3.14158995322368e+22f;
 const #7 = Field        #14.#38;        //  ConstantPoolTest.floatField:F
 const #8 = long 99999999l;
 const #10 = Field       #14.#39;        //  ConstantPoolTest.longField:J
@@ -49,50 +49,74 @@ const #40 = NameAndType #27:#28;//  doubleField:D
 const #41 = Asciz       ConstantPoolTest;
 const #42 = Asciz       java/lang/Object;
 const #43 = Asciz       java/lang/Runnable;'
-      
+
       def setup
         @cp = JavaClass::ClassFile::ConstantPool.new(load_class('constant_pool/ConstantPoolTest'))
       end
-      
+
       def test_index
         assert_equal('Method', @cp[1].name)
         assert_equal('Field', @cp[10].name)
+        assert_raise(IndexError) { @cp[-1] }
+        assert_raise(IndexError) { @cp[44] }
       end
-      
+
       def test_size
         assert_equal(331, @cp.size)
       end
-      
+
       def test_item_count
         assert_equal(43, @cp.item_count)
       end
-      
+
       def test_dump
         # puts @cp.dump.join("\n")
         assert_equal(JAVAP_OUTPUT.gsub(/ +/, ' ').gsub(/"</, '<').gsub(/>"/, '>'), @cp.dump.join("\n").gsub(/( |\t)+/,' '))
       end
-      
+
       def test_items
         pool = @cp.items
         assert_equal(41, pool.size) # 2 double
         assert_equal('Method', pool[0].name)
         assert_equal('stringField', pool[14].value)
       end
-      
+
       def test_find
         found = @cp.find(JavaClass::ClassFile::ConstantPool::STRING_TAG)
         assert_equal(1, found.size)
         assert_equal('String', found[0].name)
         assert_equal(34, found[0].string_index)
       end
-      
+
       def test_strings
         found = @cp.strings
         assert_equal(1, found.size)
         assert_equal('String', found[0].name)
       end
-      
+
+      def test_class_item
+        assert_equal('ConstantPoolTest', @cp.class_item(14).to_s)
+        assert_raise(JavaClass::ClassFile::ClassFormatError) { @cp.class_item(13) }
+      end
+
+      def test_field_item
+        assert_equal('ConstantPoolTest', @cp.field_item(3).class_name)
+        assert_raise(JavaClass::ClassFile::ClassFormatError) { @cp.field_item(4) }
+      end
+
+      def test_method_item
+        assert_equal('java/lang/Object', @cp.method_item(1).class_name)
+        assert_raise(JavaClass::ClassFile::ClassFormatError) { @cp.method_item(3) }
+      end
+
+      def test_class_new_invalid_type
+        data = load_class('constant_pool/ConstantPoolTest')
+        data[10] = '*'; # 42, was 10
+        assert_raise(JavaClass::ClassFile::ClassFormatError){ 
+          JavaClass::ClassFile::ConstantPool.new(data)
+        }
+      end
     end
-    
+
   end
 end

data/test/test_convention_classpath.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classpath/convention_classpath'
+
+module TestJavaClass
+  module TestClasspath
+
+    class TestConventionClasspath < Test::Unit::TestCase
+
+      def setup
+        @folder = "#{TEST_DATA_PATH}/eclipse_classpath"
+        @cpe = JavaClass::Classpath::ConventionClasspath.new(@folder)
+      end
+
+      def test_class_valid_location_eh
+        assert(JavaClass::Classpath::ConventionClasspath.valid_location?("#{TEST_DATA_PATH}/eclipse_classpath"))
+        assert(JavaClass::Classpath::ConventionClasspath.valid_location?("#{TEST_DATA_PATH}/folder_classpath"))
+      end
+
+      def test_class_valid_location_eh_no_pom
+        assert(!JavaClass::Classpath::ConventionClasspath.valid_location?("#{TEST_DATA_PATH}/jar_classpath"))
+        assert(!JavaClass::Classpath::ConventionClasspath.valid_location?("#{TEST_DATA_PATH}/not_existing_folder"))
+      end
+
+      def test_count
+        assert_equal(1, @cpe.count)
+      end
+
+      def test_additional_classpath
+        assert_equal(["#{@folder}/lib/JarClasspathTest.jar"], @cpe.additional_classpath)
+      end
+
+      def test_includes_eh
+        assert(@cpe.includes?('ClassVersionTest12.class'))
+      end
+
+    end
+
+  end
+end

data/test/test_eclipse_classpath.rb

@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classpath/eclipse_classpath'
+require 'test/dot_classpath'
+
+module TestJavaClass
+  module TestClasspath
+
+    class TestEclipseClasspath < Test::Unit::TestCase
+      include DotClasspath
+
+      def setup
+        create_dot_classpath
+        @cpe = JavaClass::Classpath::EclipseClasspath.new(eclipse_classpath)
+      end
+
+      def teardown
+        remove_dot_classpath
+      end
+
+      def test_class_valid_location_eh
+        assert(JavaClass::Classpath::EclipseClasspath.valid_location?(eclipse_classpath))
+      end
+
+      def test_class_valid_location_eh_invalid
+        assert(!JavaClass::Classpath::EclipseClasspath.valid_location?("#{TEST_DATA_PATH}/folder_classpath"))
+        assert(!JavaClass::Classpath::EclipseClasspath.valid_location?("#{TEST_DATA_PATH}/not_existing_folder"))
+      end
+            
+      def test_count
+        assert_equal(4, @cpe.count)
+      end
+
+      def test_elements
+        assert_equal(3, @cpe.elements.size)
+      end
+
+      def test_includes_eh
+        assert(@cpe.includes?('ClassVersionTest10.class'))
+        assert(@cpe.includes?('package/ClassVersionTest11.class'))
+        assert(@cpe.includes?('ClassVersionTest12.class'))
+        assert(@cpe.includes?('ClassVersionTest13.class'))
+      end
+
+      def test_class_skip_lib
+        JavaClass::Classpath::EclipseClasspath.skip_lib
+        cpe = JavaClass::Classpath::EclipseClasspath.new(eclipse_classpath)
+        JavaClass::Classpath::EclipseClasspath.skip_lib(false)
+        assert(!cpe.includes?('ClassVersionTest10.class'))
+        assert(cpe.includes?('ClassVersionTest12.class'))
+      end
+
+      def test_class_add_variable
+        begin
+          JavaClass::Classpath::EclipseClasspath.add_variable("TEST", TEST_DATA_PATH)
+
+          cpe = JavaClass::Classpath::EclipseClasspath.new(eclipse_classpath)
+          assert(cpe.includes?('ClassVersionTest10.class'))
+
+        ensure
+          JavaClass::Classpath::EclipseClasspath.add_variable("TEST", nil)
+        end
+      end
+      
+      def test_class_new_invalid
+        assert_raise(IOError) {
+          JavaClass::Classpath::EclipseClasspath.new("#{TEST_DATA_PATH}/folder_classpath")
+        }
+      end
+
+    end
+
+  end
+end