javaclass 0.0.3 → 0.0.4

data/test/data/access_flags/AccessFlagsTestPackage.java

@@ -1,3 +1,3 @@
 package packagename;
 
-class AccessFlagsTestPackage { }
+class AccessFlagsTestPackage implements AccessFlagsTestInterface { }

data/test/data/class_version/make.bat

@@ -3,11 +3,11 @@ if exist ClassVersionTest*.class del ClassVersionTest*.class
 setlocal
 
 call profile102
-javac -classpath %CLASSPATH% ClassVersionTest.java
+javac -classpath "%CLASSPATH%" ClassVersionTest.java
 ren ClassVersionTest.class ClassVersionTest10.class
 
 call profile118
-javac -classpath %CLASSPATH% ClassVersionTest.java
+javac -classpath "%CLASSPATH%" ClassVersionTest.java
 ren ClassVersionTest.class ClassVersionTest11.class
 
 call profile122
@@ -30,6 +30,10 @@ call profile160
 javac ClassVersionTest.java
 ren ClassVersionTest.class ClassVersionTest16.class
 
+call profile170
+javac ClassVersionTest.java
+ren ClassVersionTest.class ClassVersionTest17.class
+
 endlocal
 
 pause

data/test/data/jar_classpath/make.bat

@@ -3,12 +3,13 @@ if exist JarClasspathTest*.* del JarClasspathTest*.*
 md JarClasspathTestFolder\package
 copy ..\class_version\ClassVersionTest10.class JarClasspathTestFolder
 copy ..\class_version\ClassVersionTest11.class JarClasspathTestFolder\package
+copy ..\class_version\ClassVersionTest11.class .
 
 cd JarClasspathTestFolder
 jar -cf ..\JarClasspathTest.jar .
-cd ..
 
-call winzip -a JarClasspathTest.zip ClassVersionTest10.class
+call 7za a -bd -tzip ..\JarClasspathTest.zip ClassVersionTest10.class
+cd ..
 
 echo Class-Path: JarClasspathTest.jar > manifest.txt
 jar -cfm JarClasspathTestManifest.jar manifest.txt ClassVersionTest11.class
@@ -21,4 +22,7 @@ echo    lib/xercesImpl-2.5.jar lib/js-1.5R4.1.jar>> manifest.txt
 jar -cfm JarClasspathTestMultiManifest.jar manifest.txt ClassVersionTest11.class
 del manifest.txt
 
+rmdir /S /Q JarClasspathTestFolder
+del *.class
+
 pause

data/test/data/java_name_scanner/META-INF/MANIFEST.MF

@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Some Plug-in
+Bundle-SymbolicName: some.plugin;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: some.plugin.Activator
+Bundle-Vendor: Codecop
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-RequiredExecutionEnvironment: J2SE-1.5

data/test/data/java_name_scanner/plugin.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            id="some..treeReOrder"
+            name="Re Order Event">
+      </command>
+   </extension>
+   <extension
+         point="some.sessionSecurityCheck">
+      <sessionSecurityCheck
+            class="some.PrivilegeCheck">
+      </sessionSecurityCheck>
+   </extension>
+
+</plugin>

data/test/data/maven_classpath/module/pom.xml

@@ -0,0 +1,8 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>maven_classpath</groupId>
+    <artifactId>module</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>MavenClasspath Submodule</name>
+</project>

data/test/data/maven_classpath/pom.xml

@@ -0,0 +1,8 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>maven_classpath</groupId>
+    <artifactId>maven_classpath</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>MavenClasspath</name>
+</project>

data/test/data/transitive_dependencies/A.java

@@ -0,0 +1,5 @@
+public class A {
+
+   private B b = new B();
+   private C c = new C();
+}

data/test/data/transitive_dependencies/B.java

@@ -0,0 +1,3 @@
+public class B {
+
+}

data/test/data/transitive_dependencies/C.java

@@ -0,0 +1,3 @@
+public class C {
+
+}

data/test/data/transitive_dependencies/Start.java

@@ -0,0 +1,4 @@
+public class Start {
+   private A a = new A();
+   private C c = new C();
+}

data/test/data/transitive_dependencies/make.bat

@@ -0,0 +1,3 @@
+if exist *.class del *.class
+javac *.java
+pause

data/test/dot_classpath.rb

@@ -0,0 +1,33 @@
+module TestJavaClass
+  module TestClasspath
+   
+    module DotClasspath
+      def create_dot_classpath
+        dot_classpath = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+                        <classpath>
+                            <classpathentry kind=\"src\" path=\"src\" />
+                            <classpathentry kind=\"src\" path=\"test\" output=\"test-classes\" />
+                            <classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER\" />
+                            <classpathentry kind=\"lib\" path=\"lib/JarClasspathTest.jar\" />
+                            <classpathentry kind=\"var\" path=\"TEST/jar_classpath/JarClasspathTest.zip\" />
+                            <classpathentry kind=\"con\" path=\"org.eclipse.jdt.junit.JUNIT_CONTAINER/4\" />
+                            <classpathentry kind=\"output\" path=\"classes\" />
+                        </classpath>"
+        File.open(dot_classpath_file, "w") { |f| f.print dot_classpath }
+      end
+
+      def dot_classpath_file
+        File.join(eclipse_classpath, '.classpath')
+      end
+
+      def eclipse_classpath
+        "#{TEST_DATA_PATH}/eclipse_classpath"
+      end
+
+      def remove_dot_classpath
+        File.delete dot_classpath_file
+      end
+    end
+
+  end
+end

data/test/logging_folder_classpath.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classpath/folder_classpath'
+
+module JavaClass
+  module Classpath
+
+    # Add a field +was_called+ to see if the load_binary was called.
+    class FolderClasspath
+      alias :__old_load_binary :load_binary
+
+      def load_binary(classname)
+        @was_called = true
+        __old_load_binary(classname)
+      end
+      attr_accessor :was_called
+    end
+
+  end
+end

data/test/setup.rb

@@ -1,4 +1,4 @@
-require 'test/unit' 
+require 'test/unit'
 require 'test/unit/testcase'
 
 # Base require of tests.

data/test/test_access_flags.rb

@@ -3,66 +3,92 @@ require 'javaclass/classfile/java_class_header'
 
 module TestJavaClass
   module TestClassFile
-    
+
     class TestAccessFlags < Test::Unit::TestCase
-      
+
       def setup
-        @cls = {}
-        %w[Public Package Abstract Interface Final Public$Inner Public$StaticInner Public$InnerInterface].each do |t| 
-          eval("@#{t.sub(/Public\$/, '').downcase} = JavaClass::ClassFile::JavaClassHeader.new(load_class('access_flags/AccessFlagsTest#{t}')).access_flags") 
+        %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?)
-        assert(@abstract.accessible?)
-        assert(@interface.accessible?)
-        assert(@final.accessible?)
       end
-      
+
       def test_public_eh
         assert(@public.public?)
-      end    
-      
+        assert(!@package.public?)
+      end
+
       def test_interface_eh
         assert(!@public.interface?)
-        assert(!@package.interface?)
         assert(!@abstract.interface?)
         assert(@interface.interface?)
-        assert(!@final.interface?)
-        assert(@innerinterface.interface?)
+        assert(@public_innerinterface.interface?)
+        assert(@annotation.interface?)
       end
-      
+
       def test_abstract_eh
         assert(!@public.abstract?)
-        assert(!@package.abstract?)
         assert(@abstract.abstract?)
         assert(@interface.abstract?)
-        assert(!@final.abstract?)
-        assert(@innerinterface.abstract?)
+        assert(@public_innerinterface.abstract?)
+        assert(@annotation.abstract?)
       end
-      
+
       def test_final_eh
         assert(!@public.final?)
-        assert(!@package.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_inner_eh
-      #      assert(!@public.inner?)
-      #      assert(!@package.inner?)
-      #      assert(!@abstract.inner?)
-      #      assert(!@interface.inner?)
-      #      assert(!@final.inner?)
-      #      assert(@inner.inner?)
-      #      assert(@staticinner.inner?)
-      #      assert(@innerinterface.inner?)
-      #    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_adder_tree.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/adder_tree'
+
+class TestAdderTree < Test::Unit::TestCase
+
+  def setup
+    @tree = AdderTree.new(0)
+  end
+
+  def test_data
+    assert_equal(0, @tree.data)
+  end
+
+  def test_to_a
+    assert_equal([0], @tree.to_a)
+  end
+
+  def test_add
+    @tree.add(1)
+    assert_equal([0, [1]], @tree.to_a)
+    node = @tree.add(2)
+    assert_equal([0, [1, 2]], @tree.to_a)
+
+    node.add(3)
+    assert_equal([0, [1, 2, [3]]], @tree.to_a)
+  end
+
+  def test_size
+    assert_equal(1, @tree.size)
+    @tree.add(1)
+    assert_equal(2, @tree.size)
+    @tree.add(2)
+    assert_equal(3, @tree.size)
+  end
+
+  def test_levels
+    assert_equal(1, @tree.levels)
+    node = @tree.add(1)
+    assert_equal(2, @tree.levels)
+    node.add(2)
+    assert_equal(3, @tree.levels)
+  end
+
+  def test_children
+    assert_equal(0, @tree.children.size)
+    @tree.add(1)
+    assert_equal(1, @tree.children.size)
+
+    assert_equal(1, @tree.children[0].data)
+  end
+
+  def test_contain_eh_itself
+    assert(@tree.contain?(0))
+    assert_nil(@tree.contain?(1))
+  end
+
+  def test_contain_eh
+    assert_nil(@tree.contain?(1))
+    @tree.add(1)
+    assert(@tree.contain?(1))
+  end
+
+  def test_level
+    assert_equal(0, @tree.level)
+    node = @tree.add(1)
+    assert_equal(0, @tree.level)
+    assert_equal(1, node.level)
+    node.add(2)
+    assert_equal(1, node.level)
+  end
+
+  def test_root
+    assert_equal(0, @tree.root.data)
+    node = @tree.add(1)
+    assert_equal(0, node.root.data)
+  end
+
+end

data/test/test_any_classpath.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/classpath/any_classpath'
+
+module TestJavaClass
+  module TestClasspath
+
+    class TestAnyClasspath < Test::Unit::TestCase
+
+      def test_includes_eh
+#        @cpe = JavaClass::Classpath::AnyClasspath.new(TEST_DATA_PATH)
+#        # from folder
+#        assert(@cpe.includes?('access_flags.AccessFlagsTestAbstract'))
+#        # from jar, would have another package
+#        assert(@cpe.includes?('packagename/PublicClass'))
+#        # from jar, would have any package
+#        assert(@cpe.includes?('ClassVersionTest10'))
+      end
+
+      def test_find_jars_direct
+        @cpe = JavaClass::Classpath::AnyClasspath.new("#{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
+
+      def test_find_jars_recursive
+        @cpe = JavaClass::Classpath::AnyClasspath.new("#{TEST_DATA_PATH}/eclipse_classpath")
+        assert_equal(1, @cpe.elements.size)
+      end
+
+      def test_find_jars_single
+        @cpe = JavaClass::Classpath::AnyClasspath.new("#{TEST_DATA_PATH}/jar_classpath/JarClasspathTest.zip")
+        assert_equal(1, @cpe.elements.size)
+        assert_equal(File.expand_path("#{TEST_DATA_PATH}/jar_classpath/JarClasspathTest.zip"), @cpe.elements[0].to_s)
+      end
+      
+    end
+
+  end
+end

data/test/test_base.rb

@@ -4,23 +4,25 @@ require 'javaclass/classfile/constants/base'
 module TestJavaClass
   module TestClassFile
     module TestConstants
-      
+
       class TestBase < Test::Unit::TestCase
-        
+
         class ConstantClass < JavaClass::ClassFile::Constants::Base; # ZenTest SKIP mock class
-          def initialize(name=nil); super(name); end
+          def initialize(name=nil)
+            super(name)
+          end
         end
-        
+
         def test_name
           v = ConstantClass.new
           assert_equal('Class', v.name)
-          
+
           v = ConstantClass.new('Bubu')
           assert_equal('Bubu', v.name)
         end
-        
+
       end
-      
+
     end
   end
 end

data/test/test_caching_classpath.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/setup'
+require 'javaclass/dsl/caching_classpath'
+require File.dirname(__FILE__) + '/logging_folder_classpath'
+require File.dirname(__FILE__) + '/test_folder_classpath'
+
+module TestJavaClass
+  module TestDsl
+
+    class TestCachingClasspath < TestClasspath::TestFolderClasspath
+      # extend TestFolderClasspath to execute all tests again
+
+      def test_new_wrong_type
+        assert_raise(ArgumentError){ 
+          JavaClass::Dsl::CachingClasspath.new('3') 
+        }
+      end
+
+      def setup
+        super
+        class << @cpe
+          def load(*obj)
+            load_binary(*obj)
+          end
+        end
+        @cpe = JavaClass::Dsl::CachingClasspath.new(@cpe)
+      end
+
+      def test_load_cached
+        @cpe.was_called = false
+        @cpe.load('ClassVersionTest10')
+        assert(@cpe.was_called)
+        
+        # load again, now it's still false
+        @cpe.was_called = false
+        @cpe.load('ClassVersionTest10')
+        assert(!@cpe.was_called)
+      end
+    end
+
+  end
+end