buildr 1.4.25-java → 1.5.0.dev2-java

data/spec/core/compile_spec.rb

@@ -234,12 +234,6 @@ describe Buildr::CompileTask, '#dependencies' do
     compile_task.dependencies.should == project('bar').packages
   end
 
-  it 'should be accessible as classpath up to version 1.5 since it was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-    lambda { compile_task.classpath = jars }.should change(compile_task, :dependencies).to(jars)
-    lambda { compile_task.dependencies = [] }.should change(compile_task, :classpath).to([])
-  end
-
 end
 
 

data/spec/core/console_spec.rb

@@ -20,7 +20,7 @@ describe Buildr::Console do
   describe 'console_dimensions' do
 
     it 'should return a value' do
-      Buildr::Console.console_dimensions.should_not be_nil
+      Buildr::Console.console_dimensions.should_not be_nil if $stdout.isatty # have to ask again as stdout may be redirected.
     end if $stdout.isatty && !ENV["TRAVIS"] && !Buildr::Util.win_os?
   end
 

data/spec/core/generate_from_eclipse_spec.rb

@@ -116,6 +116,7 @@ describe Buildr::Generate do
       buildFile = File.join(top, 'buildfile')
       file(buildFile).should exist
       file(buildFile).should contain("GROUP = \"#{top}\"")
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -127,17 +128,19 @@ describe Buildr::Generate do
       file(buildFile).should exist
       file(buildFile).should contain('define "single"')
       file(buildFile).should_not contain('define "myproject"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
-      it 'should honour Bundle-Version in MANIFEST.MF' do
-	define('bundle_version')
-	buildFile = File.join(top, 'buildfile')
-	file(buildFile).should exist
-	file(buildFile).should contain('define "single"')
-	file(buildFile).should contain('define "single", :version => "1.1"')
-	lambda { Buildr.application.run }.should_not raise_error
-      end
+    it 'should honour Bundle-Version in MANIFEST.MF' do
+      define('bundle_version')
+      buildFile = File.join(top, 'buildfile')
+      file(buildFile).should exist
+      file(buildFile).should contain('define "single"')
+      file(buildFile).should contain('define "single", :version => "1.1"')
+      chdir(top)
+      lambda { Buildr.application.run }.should_not raise_error
+    end
 
     it "should pass source in build.properties to layout[:source, :main, :java] and layout[:source, :main, :scala]" do
       define('layout_source')
@@ -147,6 +150,7 @@ describe Buildr::Generate do
       file(buildFile).should contain('define "single"')
       file(buildFile).should contain('layout[:source, :main, :java]')
       file(buildFile).should contain('layout[:source, :main, :scala]')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -159,6 +163,7 @@ describe Buildr::Generate do
       file(buildFile).should contain('layout[:target, :main]')
       file(buildFile).should contain('layout[:target, :main, :java]')
       file(buildFile).should contain('layout[:target, :main, :scala]')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -168,6 +173,7 @@ describe Buildr::Generate do
       file(buildFile).should exist
       file(buildFile).should contain('define')
       file(buildFile).should contain('package(:jar)')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -183,6 +189,7 @@ describe Buildr::Generate do
       buildFile = File.join(top, 'buildfile')
       file(buildFile).should exist
       file(buildFile).should contain('define "singleSymbolicName"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
   end
@@ -198,6 +205,7 @@ describe Buildr::Generate do
       buildFile = File.join(top, 'buildfile')
       file(buildFile).should exist
       file(buildFile).should contain('define "singleSymbolicName"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
   end
@@ -218,6 +226,7 @@ describe Buildr::Generate do
       buildFile = File.join(top, 'buildfile')
       file(buildFile).should contain("GROUP = \"#{top}\"")
       file(buildFile).should contain('define "single"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -227,6 +236,7 @@ describe Buildr::Generate do
       file(buildFile).should exist
       file(buildFile).should contain('define "single"')
       file(buildFile).should contain('define "single", :version => "1.1", :base_dir => "nested/single"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -251,6 +261,7 @@ describe Buildr::Generate do
       file(buildFile).should exist
       file(buildFile).should contain('compile.with dependencies')
       file(buildFile).should contain('resources')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
                                                            #dependencies << projects("first")
@@ -258,10 +269,12 @@ describe Buildr::Generate do
     it 'should honour Require-Bundle in MANIFEST.MF' do
       define('base_dir')
       buildFile = File.join(top, 'buildfile')
+
       file(buildFile).should exist
       file(buildFile).should contain(/define "second"/)
       file(buildFile).should contain(                     /dependencies << projects\("first"\)/)
       file(buildFile).should contain(/define "second".*do.*dependencies << projects\("first"\).* end/m)
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 
@@ -272,6 +285,7 @@ describe Buildr::Generate do
       file(buildFile).should exist
 #      system("cat #{buildFile}")  # if $VERBOSE
       file(buildFile).should contain('define "first"')
+      chdir(top)
       lambda { Buildr.application.run }.should_not raise_error
     end
 

data/spec/core/project_spec.rb

@@ -83,6 +83,16 @@ describe Project do
     Buildr.define('foo') { define('bar') { project('baz:bar') } }
     lambda { project('foo') }.should raise_error(RuntimeError, /Circular dependency/)
   end
+
+  it 'should handle non-circular dependencies' do
+    Buildr.define "root" do
+      define "child" do
+        puts project('root')._('foo.resource')
+      end
+    end
+
+    lambda { project('root') }.should_not raise_error
+  end
 end
 
 describe Project, ' property' do
@@ -318,70 +328,22 @@ describe Project, '#path_to' do
 end
 
 
-describe Project, '#on_define' do
-  it 'should be called when project is defined' do
-    names = []
-    Project.on_define { |project| names << project.name }
-    define 'foo' ; define 'bar'
-    names.should eql(['foo', 'bar'])
-  end
-
-  it 'should be called with project object' do
-    Project.on_define { |project| project.name.should eql('foo') }
-    define('foo')
-  end
-
-  it 'should be called with project object and set properties' do
-    Project.on_define { |project| project.version.should eql('2.0') }
-    define('foo', :version=>'2.0')
-  end
-
-  it 'should execute in namespace of project' do
-    scopes = []
-    Project.on_define { |project| scopes << Buildr.application.current_scope }
-    define('foo') { define 'bar' }
-    scopes.should eql([['foo'], ['foo', 'bar']])
-  end
-
-  it 'should be called before project block' do
-    order = []
-    Project.on_define { |project| order << 'on_define' }
-    define('foo') { order << 'define' }
-    order.should eql(['on_define', 'define'])
-  end
-
-  it 'should accept enhancement and call it after project block' do
-    order = []
-    Project.on_define { |project| project.enhance { order << 'enhance' } }
-    define('foo') { order << 'define' }
-    order.should eql(['define', 'enhance'])
-  end
-
-  it 'should accept enhancement and call it with project' do
-    Project.on_define { |project| project.enhance { |project| project.name.should eql('foo') } }
-    define('foo')
-  end
-
-  it 'should execute enhancement in namespace of project' do
-    scopes = []
-    Project.on_define { |project| project.enhance { scopes << Buildr.application.current_scope } }
-    define('foo') { define 'bar' }
-    scopes.should eql([['foo'], ['foo', 'bar']])
-  end
-
-  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-  end
-end
-
-
 describe Rake::Task, ' recursive' do
   before do
-    @order = []
-    Project.on_define do |project| # TODO on_define is deprecated
-      project.recursive_task('doda') { @order << project.name }
-    end
-    define('foo') { define('bar') { define('baz') } }
+    define('foo') {
+      @order = []
+      def order
+        @order
+      end
+      recursive_task('doda') { project('foo').order << 'foo' }
+      define('bar') { 
+        recursive_task('doda') { project('foo').order << 'foo:bar' }
+        define('baz') {
+          recursive_task('doda') { project('foo').order << 'foo:bar:baz' }
+        }
+      }
+    }
+    @order = project('foo').order
   end
 
   it 'should invoke same task in child project' do
@@ -533,7 +495,7 @@ describe Buildr, '#project' do
     project('foo:bar').project('baz').should be(project('foo:baz'))
   end
 
-  it 'should fine a project from its parent by proximity' do
+  it 'should find a project from its parent by proximity' do
     define 'foo' do
       define('bar') { define 'baz' }
       define 'baz'
@@ -542,11 +504,6 @@ describe Buildr, '#project' do
     project('foo:bar').project('baz').should be(project('foo:bar:baz'))
   end
 
-  it 'should invoke project before returning it' do
-    define('foo').should_receive(:invoke).once
-    project('foo')
-  end
-
   it 'should fail if called without a project name' do
     lambda { project }.should raise_error(ArgumentError)
   end
@@ -621,11 +578,12 @@ end
 describe Rake::Task, ' local directory' do
   before do
     @task = Project.local_task(task(('doda')))
-    Project.on_define { |project| task('doda') { |task| @task.from project.name } }
+    
   end
 
   it 'should execute project in local directory' do
     define 'foo'
+    project('foo').tap { |project| task('doda') { |task| @task.from project.name } }
     @task.should_receive(:from).with('foo')
     @task.invoke
   end
@@ -633,18 +591,24 @@ describe Rake::Task, ' local directory' do
   it 'should execute sub-project in local directory' do
     @task.should_receive(:from).with('foo:bar')
     define('foo') { define 'bar' }
+    project('foo:bar').tap { |project| task('doda') { |task| @task.from project.name } }
     in_original_dir(project('foo:bar').base_dir) { @task.invoke }
   end
 
   it 'should do nothing if no project in local directory' do
     @task.should_not_receive(:from)
-    define('foo') { define 'bar' }
+    define('foo') {
+      task('doda') { |task| @task.from project.name }
+      define 'bar'
+    }
+    
     in_original_dir('../not_foo') { @task.invoke }
   end
 
   it 'should find closest project that matches current directory' do
     mkpath 'bar/src/main'
     define('foo') { define 'bar' }
+    project('foo:bar').tap { |project| task('doda') { |task| @task.from project.name } }
     @task.should_receive(:from).with('foo:bar')
     in_original_dir('bar/src/main') { @task.invoke }
   end

data/spec/core/test_spec.rb

@@ -141,13 +141,6 @@ describe Buildr::TestTask do
     test_task.options[:bar].should eql('BAR')
   end
 
-  it 'should respond to :using with deprecated parameter style and set value options to true, up to version 1.5 since this usage was deprecated in version 1.3' do
-    Buildr::VERSION.should < '1.5'
-    test_task.using('foo', 'bar')
-    test_task.options[:foo].should eql(true)
-    test_task.options[:bar].should eql(true)
-  end
-
   it 'should start without pre-selected test framework' do
     test_task.framework.should be_nil
   end
@@ -555,7 +548,8 @@ describe Buildr::Project, '#test.compile' do
   end
 
   it 'should compile to target/test/<code>' do
-    define 'foo', :target=>'targeted' do
+    define 'foo' do
+      layout[:target] = _('targeted')
       test.compile.using(:javac)
       test.compile.target.should eql(file('targeted/test/classes'))
     end
@@ -607,7 +601,10 @@ describe Buildr::Project, '#test.resources' do
 
   it 'should copy to the resources target directory' do
     write 'src/test/resources/config.xml', '</xml>'
-    define('foo', :target=>'targeted').test.invoke
+    define('foo') do
+      layout[:target] = _('targeted')
+    end.test.invoke
+    
     file('targeted/test/resources/config.xml').should contain('</xml>')
   end
 

data/spec/core/transport_spec.rb

@@ -119,9 +119,6 @@ end
 
 
 describe URI::FILE do
-  it 'should complain about file:' do
-    lambda { URI('file:') }.should raise_error(URI::InvalidURIError)
-  end
 
   it 'should accept file:something as file:///something' do
     URI('file:something').should eql(URI('file:///something'))
@@ -135,10 +132,6 @@ describe URI::FILE do
     URI('file:/something').should eql(URI('file:///something'))
   end
 
-  it 'should complain about file://' do
-    lambda { URI('file://').should eql(URI('file:///')) }.should raise_error(URI::InvalidURIError)
-  end
-
   it 'should accept file://something as file://something/' do
     URI('file://something').should eql(URI('file://something/'))
   end
@@ -253,6 +246,22 @@ describe URI::HTTP, '#read' do
     @http.should_receive(:use_ssl=).with(true)
     URI(@uri.to_s.sub(/http/, 'https')).read
   end
+  
+  it 'should use custom SSL CA certificates if provided through the environment variable SSL_CA_CERTS' do
+    ENV['SSL_VERIFY_MODE'] = 'VERIFY_PEER'
+    Net::HTTP.should_receive(:new).with(@host_domain, 443).and_return(@http)
+    @http.should_receive(:use_ssl=).with(true)
+    @http.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+    URI(@uri.to_s.sub(/http/, 'https')).read
+  end
+  
+  it 'should use custom verify mode if provided through the environment variable SSL_VERIFY_MODE' do
+    ENV['SSL_CA_CERTS'] = 'tmp/certs'
+    Net::HTTP.should_receive(:new).with(@host_domain, 443).and_return(@http)
+    @http.should_receive(:use_ssl=).with(true)
+    @http.should_receive(:ca_path=).with('tmp/certs')
+    URI(@uri.to_s.sub(/http/, 'https')).read
+  end
 
   it 'should use proxy from environment variable HTTP_PROXY when using http' do
     ENV['HTTP_PROXY'] = @proxy

data/spec/groovy/compiler_spec.rb

@@ -140,8 +140,8 @@ describe 'groovyc compiler' do
     write 'src/main/groovy/some/Example.groovy', 'package some; class Example { }'
     define('foo', :version => '1.0').package.invoke
     file('target/foo-1.0.jar').should exist
-    Zip::ZipFile.open(project('foo').package(:jar).to_s) do |jar|
-      jar.file.exist?('some/Example.class').should be_true
+    Zip::File.open(project('foo').package(:jar).to_s) do |jar|
+      jar.exist?('some/Example.class').should be_true
     end
   end
 

data/spec/java/ant_spec.rb

@@ -29,9 +29,4 @@ describe Buildr::Ant do
     end
   end
 
-  it 'should have REQUIRES up to version 1.5 since it was deprecated in version 1.3.3' do
-    Buildr::VERSION.should < '1.5'
-    lambda { Ant::REQUIRES }.should_not raise_error
-  end
-
 end

data/spec/java/compiler_spec.rb

@@ -99,12 +99,12 @@ describe 'javac compiler' do
   end
 
   it 'should include tools.jar dependency' do
-    write 'src/main/java/UseApt.java', <<-JAVA
-      import com.sun.mirror.apt.AnnotationProcessor;
-      public class UseApt { }
+    write 'src/main/java/UseJarSigner.java', <<-JAVA
+    import sun.tools.jar.Manifest;
+    public class UseJarSigner { }
     JAVA
     define('foo').compile.invoke
-    file('target/classes/UseApt.class').should exist
+    file('target/classes/UseJarSigner.class').should exist
   end
 
   it 'should ignore package-info.java files in up-to-date check' do

data/spec/java/ecj_spec.rb

@@ -15,47 +15,250 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
-describe Buildr::Compiler::Ecj do
-
-  before(:all) do
-    #Make ecj appear as a compiler that applies:
-    class Buildr::Compiler::Ecj
-      class << self
-        def applies_to?(project, task)
-          paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
-          paths.flatten.each { |path|
-            path = path.to_s
-            Find.find(path) {|found|
-              if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
-                return true
-              end
-              } if File.exist? path
-            }
-            false
-          end
+
+describe 'ecj compiler' do
+  it 'should be explicitly referenced' do
+    write 'src/main/java/com/example/Test.java', 'package com.example; class Test {}'
+    define('foo').compile.using(:ecj).compiler.should eql(:ecj)
+  end
+
+  it 'should report the language as :java' do
+    define('foo').compile.using(:ecj).language.should eql(:java)
+  end
+
+  it 'should set the target directory to target/classes' do
+    define 'foo' do
+      lambda { compile.using(:ecj) }.should change { compile.target.to_s }.to(File.expand_path('target/classes'))
+    end
+  end
+
+  it 'should not override existing target directory' do
+    define 'foo' do
+      compile.into('classes')
+      lambda { compile.using(:ecj) }.should_not change { compile.target }
+    end
+  end
+
+  it 'should accept a task to compile from' do
+    p = define 'foo' do
+      project.version = '1'
+      f = file(_(:target, :generated, 'myjava')) do
+        mkdir_p _(:target, :generated, 'myjava')
+        File.open("#{_(:target, :generated, 'myjava')}/Foo.java", "wb") do |f|
+          f.write "public class Foo {}"
         end
       end
+
+      compile.from(f)
+      package(:jar)
+    end.compile.invoke
+    file('target/classes/Foo.class').should exist
+  end
+
+  it 'should not change existing list of sources' do
+    define 'foo' do
+      compile.from('sources')
+      lambda { compile.using(:ecj) }.should_not change { compile.sources }
+    end
+  end
+
+  # Doesn't work under jdk1.5 - caused in one of the commits 1167678, 1170604, 1170605, 1180125
+  if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+    it 'should include classpath dependencies' do
+      write 'src/dependency/Dependency.java', 'class Dependency {}'
+      define 'dependency', :version=>'1.0' do
+        compile.from('src/dependency').into('target/dependency')
+        package(:jar)
+      end
+      write 'src/test/DependencyTest.java', 'class DependencyTest { Dependency _var; }'
+      define('foo').compile.from('src/test').with(project('dependency')).invoke
+      file('target/classes/DependencyTest.class').should exist
     end
+  end
+  
+  it 'should include tools.jar dependency' do
+    repositories.remote << "http://repo1.maven.org/maven2/"
+    write 'src/main/java/UseJarSigner.java', <<-JAVA
+    import sun.tools.jar.Manifest;
+    public class UseJarSigner { }
+    JAVA
+    define('foo').compile.invoke
+    file('target/classes/UseJarSigner.class').should exist
+  end
+
+  it 'should ignore package-info.java files in up-to-date check' do
+    write 'src/main/java/foo/Test.java', 'package foo; class Test { public void foo() {} }'
+    write 'src/main/java/foo/package-info.java', 'package foo;'
+    lambda{ define('foo').compile.invoke }.should run_task('foo:compile')
+    lambda{ define('bar').compile.invoke }.should_not run_task('bar:compile')
+  end
+end
+
+
+describe 'ecj compiler options' do
+  def compile_task
+    @compile_task ||= define('foo').compile.using(:ecj)
+  end
+
+  def ecj_args
+    compile_task.instance_eval { @compiler }.send(:ecj_args)
+  end
+
+  it 'should set warnings option to false by default' do
+    compile_task.options.warnings.should be_false
+  end
+
+  it 'should set warnings option to true when running with --verbose option' do
+    verbose true
+    compile_task.options.warnings.should be_false
+  end
+
+  it 'should use -nowarn argument when warnings is false' do
+    compile_task.using(:warnings=>false)
+    ecj_args.should include('-warn:none')
+  end
+
+  it 'should not use -nowarn argument when warnings is true' do
+    compile_task.using(:warnings=>true)
+    ecj_args.should_not include('-warn:none')
+  end
+
+  it 'should not use -verbose argument by default' do
+    ecj_args.should_not include('-verbose')
+  end
+
+  it 'should use -verbose argument when running with --trace=ecj option' do
+    Buildr.application.options.trace_categories = [:ecj]
+    ecj_args.should include('-verbose')
+  end
+
+  it 'should set debug option to true by default' do
+    compile_task.options.debug.should be_true
+  end
+
+  it 'should set debug option to false based on Buildr.options' do
+    Buildr.options.debug = false
+    compile_task.options.debug.should be_false
+  end
+
+  it 'should set debug option to false based on debug environment variable' do
+    ENV['debug'] = 'no'
+    compile_task.options.debug.should be_false
+  end
+
+  it 'should set debug option to false based on DEBUG environment variable' do
+    ENV['DEBUG'] = 'no'
+    compile_task.options.debug.should be_false
+  end
+
+  it 'should use -g argument when debug option is true' do
+    compile_task.using(:debug=>true)
+    ecj_args.should include('-g')
+  end
+
+  it 'should not use -g argument when debug option is false' do
+    compile_task.using(:debug=>false)
+    ecj_args.should_not include('-g')
+  end
+
+  it 'should set deprecation option to false by default' do
+    compile_task.options.deprecation.should be_false
+  end
+
+  it 'should use -deprecation argument when deprecation is true' do
+    compile_task.using(:deprecation=>true)
+    ecj_args.should include('-deprecation')
+  end
+
+  it 'should not use -deprecation argument when deprecation is false' do
+    compile_task.using(:deprecation=>false)
+    ecj_args.should_not include('-deprecation')
+  end
+
+  it 'should not set source option by default' do
+    compile_task.options.source.should be_nil
+    ecj_args.should_not include('-source')
+  end
+
+  it 'should not set target option by default' do
+    compile_task.options.target.should be_nil
+    ecj_args.should_not include('-target')
+  end
+
+  it 'should use -source nn argument if source option set' do
+    compile_task.using(:source=>'1.5')
+    ecj_args.should include('-source', '1.5')
+  end
+
+  it 'should use -target nn argument if target option set' do
+    compile_task.using(:target=>'1.5')
+    ecj_args.should include('-target', '1.5')
+  end
+
+  it 'should set lint option to false by default' do
+    compile_task.options.lint.should be_false
+  end
 
-    it "should be the default Java compiler once loaded" do
-      write 'src/main/java/Foo.java', 'public class Foo {}'
-    foo = define('foo')
-    foo.compile.compiler.should == :ecj
+  it 'should use -lint argument if lint option is true' do
+    compile_task.using(:lint=>true)
+    ecj_args.should include('-Xlint')
   end
 
-  describe "should compile a Java project just in the same way javac does" do
-    javac_spec = File.read(File.join(File.dirname(__FILE__), "compiler_spec.rb"))
-    javac_spec = javac_spec.match(Regexp.escape("require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))\n")).post_match
-    javac_spec.gsub!("javac", "ecj")
-    javac_spec.gsub!("nowarn", "warn:none")
-    eval(javac_spec)
+  it 'should use -lint argument with value of option' do
+    compile_task.using(:lint=>'all')
+    ecj_args.should include('-Xlint:all')
+  end
+
+  it 'should use -lint argument with value of option as array' do
+    compile_task.using(:lint=>['path', 'serial'])
+    ecj_args.should include('-Xlint:path,serial')
+  end
+
+  it 'should not set other option by default' do
+    compile_task.options.other.should be_nil
+  end
+
+  it 'should pass other argument if other option is string' do
+    compile_task.using(:other=>'-Xprint')
+    ecj_args.should include('-Xprint')
+  end
+
+  it 'should pass other argument if other option is array' do
+    compile_task.using(:other=>['-Xstdout', 'msgs'])
+    ecj_args.should include('-Xstdout', 'msgs')
+  end
+
+  it 'should complain about options it doesn\'t know' do
+    repositories.remote << "http://repo1.maven.org/maven2/"
+    write 'source/Test.java', 'class Test {}'
+    compile_task.using(:unknown=>'option')
+    lambda { compile_task.from('source').invoke }.should raise_error(ArgumentError, /no such option/i)
+  end
+
+  it 'should inherit options from parent' do
+    define 'foo' do
+      compile.using(:warnings=>true, :debug=>true, :deprecation=>true, :source=>'1.5', :target=>'1.4')
+      define 'bar' do
+        compile.using(:ecj)
+        compile.options.warnings.should be_true
+        compile.options.debug.should be_true
+        compile.options.deprecation.should be_true
+        compile.options.source.should eql('1.5')
+        compile.options.target.should eql('1.4')
+      end
+    end
+  end
+
+  after do
+    Buildr.options.debug = nil
+    ENV.delete "debug"
+    ENV.delete "DEBUG"
   end
 
   # Redirect the java error ouput, yielding so you can do something while it is
   # and returning the content of the error buffer.
   #
   def redirect_java_err
-    pending "RJB doesn't support well instantiating a class that has several constructors" unless RUBY_PLATFORM =~ /java/
     err = Java.java.io.ByteArrayOutputStream.new
     original_err = Java.java.lang.System.err
     begin
@@ -75,7 +278,7 @@ describe Buildr::Compiler::Ecj do
       compile.options.source = "1.5"
       compile.options.target = "1.5"
     }
-    redirect_java_err { foo.compile.invoke }.should_not match(/WARNING/)
+    redirect_java_err { foo.compile.invoke }.should_not match(/warning/)
   end
 
   it "should issue warnings for type casting when warnings are set" do
@@ -85,21 +288,17 @@ describe Buildr::Compiler::Ecj do
       compile.options.target = "1.5"
       compile.options.warnings = true
     }
-    redirect_java_err { foo.compile.invoke }.should match(/WARNING/)
-  end
-
-  after(:all) do
-    #Make ecj appear as a compiler that doesn't apply:
-    module Buildr
-      module Compiler
-        class Ecj
-          class << self
-            def applies_to?(project, task)
-              false
-            end
-          end
-        end
-      end
+    redirect_java_err { foo.compile.invoke }.should match(/warning/)
+  end
+  
+  it 'should pick Ecj version from ecj build settings' do
+    begin
+      Buildr::Compiler::Ecj.instance_eval { @dependencies = nil }
+      write 'build.yaml', 'ecj: 3.5.1'
+      Buildr::Compiler::Ecj.dependencies.should include("org.eclipse.jdt.core.compiler:ecj:jar:3.5.1")
+    ensure
+      Buildr::Compiler::Ecj.instance_eval { @dependencies = nil }
     end
   end
+
 end