buildr 1.3.5-java → 1.4.0-java

data/spec/ide/idea7x_spec.rb

@@ -22,15 +22,15 @@ module Idea7xHelper
     task('idea7x').invoke
     REXML::Document.new(File.read("#{@project_name}-7x.ipr")).root.elements
   end
-  
+
   def ipr_module_elements
     ipr_xml_elements.to_a("//component[@name='ProjectModuleManager']/modules/module")
   end
-  
+
   def ipr_module_filepaths
     ipr_module_elements.collect { |m| m.attributes['filepath'] }
   end
-  
+
   def ipr_module_fileurls
     ipr_module_elements.collect { |m| m.attributes['fileurl'] }
   end
@@ -39,20 +39,20 @@ end
 
 describe Idea7x do
   include Idea7xHelper
-  
+
   describe "the project file" do
     before do
       @project_name = 'alphabet'
     end
-    
+
     it "includes a module for the root project" do
       # Current behavior is to only generate IMLs for packaged projects
-      define(@project_name) { project.version = '0.0.0'; package(:jar) } 
+      define(@project_name) { project.version = '0.0.0'; package(:jar) }
       ipr_module_elements.should have(1).element
       ipr_module_filepaths.should == ["$PROJECT_DIR$/alphabet-7x.iml"]
       ipr_module_fileurls.should  == ["file://$PROJECT_DIR$/alphabet-7x.iml"]
     end
-    
+
     it "includes an IML for a subproject" do
       mkpath 'h'
       define(@project_name) do
@@ -61,12 +61,12 @@ describe Idea7x do
           package(:jar)
         end
       end
-      
+
       ipr_module_elements.should have(2).elements
       ipr_module_filepaths.should include("$PROJECT_DIR$/h/alphabet-h-7x.iml")
       ipr_module_fileurls.should include("file://$PROJECT_DIR$/h/alphabet-h-7x.iml")
     end
-    
+
     it "pays attention to the base_dir for a subproject" do
       mkpath 'aitch'
       define(@project_name) do
@@ -75,10 +75,22 @@ describe Idea7x do
           package(:jar)
         end
       end
-     
+
       ipr_module_elements.should have(2).elements
       ipr_module_filepaths.should include("$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
       ipr_module_fileurls.should include("file://$PROJECT_DIR$/aitch/alphabet-h-7x.iml")
     end
   end
+  
+  describe "idea7x:clean" do
+    
+    it "should remove the idea7x project" do
+      write "src/main/java/com/example/Hello.java", ""
+      write "foo-7x.iml", ""
+      foo = define("foo")
+      foo.task("idea7x:clean").invoke
+      File.exists?("foo-7x.iml").should be_false
+    end
+    
+  end
 end

data/spec/java/ant_spec.rb

@@ -18,13 +18,17 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Buildr::Ant do
-  
+
   it 'should pick Ant version from ant build settings' do
-    Buildr::Ant.instance_eval { @dependencies = nil }
-    write 'build.yaml', 'ant: 1.2.3'
-    Buildr::Ant.dependencies.should include("org.apache.ant:ant:jar:1.2.3")
+    begin
+      Buildr::Ant.instance_eval { @dependencies = nil }
+      write 'build.yaml', 'ant: 1.2.3'
+      Buildr::Ant.dependencies.should include("org.apache.ant:ant:jar:1.2.3")
+    ensure
+      Buildr::Ant.instance_eval { @dependencies = nil }
+    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

data/spec/java/bdd_spec.rb

@@ -17,28 +17,21 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 describe Buildr::RSpec do
 
-  def foo(*args, &prc)
-    define('foo', *args) do 
+  before(:each) do
+    define('foo') do
       test.using :rspec, :output => false
-      if prc
-        instance_eval(&prc)
-      else
-        self
-      end
     end
   end
 
   it 'should be selected by :rspec name' do
-    foo { test.framework.should eql(:rspec) }
+    project('foo').test.framework.should eql(:rspec)
   end
 
   it 'should read passed specs from result yaml' do
-    success = File.expand_path('src/spec/ruby/success_spec.rb')
-    write(success, 'describe("success") { it("is true") { nil.should be_nil } }')
-    foo do
-      test.invoke
-      test.passed_tests.should eql([success])
-    end
+    write('src/spec/ruby/success_spec.rb', 'describe("success") { it("is true") { nil.should be_nil } }')
+    
+    project('foo').test.invoke
+    project('foo').test.passed_tests.should eql([File.expand_path('src/spec/ruby/success_spec.rb')])
   end
 
   it 'should read result yaml to obtain the list of failed specs' do
@@ -48,12 +41,12 @@ describe Buildr::RSpec do
     write(failure, 'describe("failure") { it("is false") { true.should == false } }')
     error = File.expand_path('src/spec/ruby/error_spec.rb')
     write(error, 'describe("error") { it("raises") { lambda; } }')
-    foo do
-      lambda { test.invoke }.should raise_error(/Tests failed/)
-      test.tests.should include(success, failure, error)
-      test.failed_tests.sort.should eql([failure, error].sort)
-      test.passed_tests.should eql([success])
-    end
+    
+    lambda { project('foo').test.invoke }.should raise_error(/Tests failed/)
+    project('foo').test.tests.should include(success, failure, error)
+    project('foo').test.failed_tests.sort.should eql([failure, error].sort)
+    project('foo').test.passed_tests.should eql([success])
+
   end
 
 end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # RSpec
@@ -61,9 +54,6 @@ end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # RSpec
 describe Buildr::JtestR do
 
   before do
-    # JtestR currently requires JUnit 4.4
-    Buildr.settings.build['junit'] = '4.4'
-
     # clear cached dependencies
     Buildr::JUnit.instance_eval { @dependencies = nil }
     Buildr::JtestR.instance_eval { @dependencies = nil }
@@ -119,7 +109,7 @@ describe Buildr::JtestR do
 
   it 'should apply to projects having junit sources' do
     define('one', :base_dir => 'one') do
-      write _('src/test/java/example/OneTest.java', <<-JAVA)
+      write _('src/test/java/example/OneTest.java'), <<-JAVA
         package example;
         public class OneTest extends junit.framework.TestCase { }
       JAVA
@@ -129,9 +119,9 @@ describe Buildr::JtestR do
 
   it 'should apply to projects having testng sources' do
     define('one', :base_dir => 'one') do
-      write _('src/test/java/example/OneTest.java', <<-JAVA)
+      write _('src/test/java/example/OneTest.java'), <<-JAVA
         package example;
-        public class OneTest { 
+        public class OneTest {
            @org.testng.annotations.Test
            public void testNothing() {}
         }
@@ -148,7 +138,7 @@ describe Buildr::JtestR do
   end
 
   it 'should load user jtestr_config.rb' do
-    foo do 
+    foo do
       hello = _('hello')
       write('src/spec/ruby/jtestr_config.rb', "File.open('#{hello}', 'w') { |f| f.write 'HELLO' }")
       write('src/spec/ruby/some_spec.rb')
@@ -161,13 +151,13 @@ describe Buildr::JtestR do
   it 'should run junit tests' do
     write('src/test/java/example/SuccessTest.java', <<-JAVA)
         package example;
-        public class SuccessTest extends junit.framework.TestCase { 
+        public class SuccessTest extends junit.framework.TestCase {
            public void testSuccess() { assertTrue(true); }
         }
     JAVA
     write('src/test/java/example/FailureTest.java', <<-JAVA)
         package example;
-        public class FailureTest extends junit.framework.TestCase { 
+        public class FailureTest extends junit.framework.TestCase {
            public void testFailure() { assertTrue(false); }
         }
     JAVA
@@ -179,7 +169,7 @@ describe Buildr::JtestR do
     end
   end
 
-  it 'should run testng tests' do 
+  it 'should run testng tests' do
     write('src/test/java/example/Success.java', <<-JAVA)
         package example;
         public class Success {
@@ -202,7 +192,7 @@ describe Buildr::JtestR do
     end
   end
 
-  it 'should run test_unit' do 
+  it 'should run test_unit' do
     success = File.expand_path('src/spec/ruby/success_test.rb')
     write(success, <<-TESTUNIT)
       require 'test/unit'
@@ -261,7 +251,7 @@ describe Buildr::JtestR do
     error = File.expand_path('src/spec/ruby/error_spec.rb')
     write(error, 'describe("error") { it("raises") { lambda; } }')
     pending =  File.expand_path('src/spec/ruby/pending_spec.rb')
-    write(pending, 'describe("peding") { it "is not implemented" }')
+    write(pending, 'describe("pending") { it "is not implemented" }')
     foo do
       lambda { test.invoke }.should raise_error(/Tests failed/)
       test.tests.should include(success, failure, error)
@@ -281,7 +271,7 @@ end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # JtestR
 
 describe Buildr::JBehave do
   def foo(*args, &prc)
-    define('foo', *args) do 
+    define('foo', *args) do
       test.using :jbehave
       if prc
         instance_eval(&prc)
@@ -314,7 +304,7 @@ describe Buildr::JBehave do
     foo { test.framework.should eql(:jbehave) }
   end
 
-  it 'should select a java compiler for its sources' do 
+  it 'should select a java compiler for its sources' do
     write 'src/test/java/SomeBehavior.java', 'public class SomeBehavior {}'
     foo do
       test.compile.language.should eql(:java)
@@ -330,8 +320,10 @@ describe Buildr::JBehave do
 
   it 'should include JMock dependencies' do
     foo do
-      test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
-      test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+      two_or_later = JMock.version[0,1].to_i >= 2
+      group = two_or_later ? "org.jmock" : "jmock"
+      test.compile.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
+      test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
     end
   end
 
@@ -356,7 +348,7 @@ describe Buildr::JBehave do
   it 'should include classes implementing Behaviours' do
     write 'src/spec/java/some/MyBehaviours.java',  <<-JAVA
       package some;
-      public class MyBehaviours implements 
+      public class MyBehaviours implements
       org.jbehave.core.behaviour.Behaviours {
         public Class[] getBehaviours() {
            return new Class[] { some.FooBehave.class };

data/spec/java/cobertura_spec.rb

@@ -24,54 +24,54 @@ describe Buildr::Cobertura do
     # Reloading the extension because the sandbox removes all its actions
     Buildr.module_eval { remove_const :Cobertura }
     load File.expand_path('../lib/buildr/java/cobertura.rb')
-    @tool_module = Buildr::Cobertura 
+    @tool_module = Buildr::Cobertura
   end
-  
+
   it_should_behave_like 'test coverage tool'
-  
+
   describe 'project-specific' do
-    
+
     describe 'data file' do
       it 'should have a default value' do
         define('foo').cobertura.data_file.should point_to_path('reports/cobertura.ser')
       end
-      
+
       it 'should be overridable' do
         define('foo') { cobertura.data_file = path_to('target/data.cobertura') }
         project('foo').cobertura.data_file.should point_to_path('target/data.cobertura')
       end
-      
+
       it 'should be created during instrumentation' do
         write 'src/main/java/Foo.java', 'public class Foo {}'
         define('foo')
         task('foo:cobertura:instrument').invoke
         file(project('foo').cobertura.data_file).should exist
       end
-      
+
       it 'should not instrument projects which have no sources' do
         write 'bar/src/main/java/Baz.java', 'public class Baz {}'
         define('foo') { define('bar') }
         task('foo:bar:cobertura:instrument').invoke
       end
     end
-      
+
     describe 'instrumentation' do
       before do
         ['Foo', 'Bar'].each { |cls| write File.join('src/main/java', "#{cls}.java"), "public class #{cls} {}" }
       end
-      
+
       it 'should instrument only included classes' do
         define('foo') { cobertura.include 'Foo' }
         task("foo:cobertura:instrument").invoke
         Dir.chdir('target/instrumented/classes') { Dir.glob('*').sort.should == ['Foo.class'] }
       end
-      
+
       it 'should not instrument excluded classes' do
         define('foo') { cobertura.exclude 'Foo' }
         task("foo:cobertura:instrument").invoke
         Dir.chdir('target/instrumented/classes') { Dir.glob('*').sort.should == ['Bar.class'] }
       end
-      
+
       it 'should instrument classes that are included but not excluded' do
         write 'src/main/java/Baz.java', 'public class Baz {}'
         define('foo') { cobertura.include('Ba').exclude('ar') }
@@ -79,7 +79,7 @@ describe Buildr::Cobertura do
         Dir.chdir('target/instrumented/classes') { Dir.glob('*').sort.should == ['Baz.class'] }
       end
     end
-    
+
     # TODO add specs for cobertura:check...somehow
   end
 end

data/spec/java/commands_spec.rb

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+
+describe Java::Commands do
+
+  it "should not be verbose by default" do
+    write "build.xml", <<-BUILD
+    <project name="MyProject" default="dist" basedir=".">
+        <description>
+            simple example build file
+        </description>
+        <target name="dist"/>
+    </project>
+BUILD
+    lambda { Java::Commands.java("org.apache.tools.ant.Main", :classpath => Buildr::Ant.dependencies) }.should_not show_info(/java/)
+    lambda { Java::Commands.java("org.apache.tools.ant.Main", :classpath => Buildr::Ant.dependencies, :verbose => true) }.should show_info(/java/)
+  end
+
+end

data/spec/java/compiler_spec.rb

@@ -19,13 +19,13 @@ require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 describe 'javac compiler' do
   it 'should identify itself from source directories' do
-    write 'src/main/java/com/example/Test.java', 'package com.example; class Test {}' 
+    write 'src/main/java/com/example/Test.java', 'package com.example; class Test {}'
     define('foo').compile.compiler.should eql(:javac)
   end
 
   it 'should identify from source directories using custom layout' do
-    write 'src/com/example/Code.java', 'package com.example; class Code {}' 
-    write 'testing/com/example/Test.java', 'package com.example; class Test {}' 
+    write 'src/com/example/Code.java', 'package com.example; class Code {}'
+    write 'testing/com/example/Test.java', 'package com.example; class Test {}'
     custom = Layout.new
     custom[:source, :main, :java] = 'src'
     custom[:source, :test, :java] = 'testing'
@@ -36,8 +36,8 @@ describe 'javac compiler' do
   end
 
   it 'should identify from compile source directories' do
-    write 'src/com/example/Code.java', 'package com.example; class Code {}' 
-    write 'testing/com/example/Test.java', 'package com.example; class Test {}' 
+    write 'src/com/example/Code.java', 'package com.example; class Code {}'
+    write 'testing/com/example/Test.java', 'package com.example; class Test {}'
     define 'foo' do
       lambda { compile.from 'src' }.should change { compile.compiler }.to(:javac)
       lambda { test.compile.from 'testing' }.should change { test.compile.compiler }.to(:javac)
@@ -103,28 +103,28 @@ describe 'javac compiler options' do
     compile_task.options.warnings.should be_false
   end
 
-  it 'should set wranings option to true when running with --verbose option' do
+  it 'should set warnings option to true when running with --verbose option' do
     verbose true
-    compile_task.options.warnings.should be_true
+    compile_task.options.warnings.should be_false
   end
 
   it 'should use -nowarn argument when warnings is false' do
     compile_task.using(:warnings=>false)
-    javac_args.should include('-nowarn') 
+    javac_args.should include('-nowarn')
   end
 
   it 'should not use -nowarn argument when warnings is true' do
     compile_task.using(:warnings=>true)
-    javac_args.should_not include('-nowarn') 
+    javac_args.should_not include('-nowarn')
   end
 
   it 'should not use -verbose argument by default' do
-    javac_args.should_not include('-verbose') 
+    javac_args.should_not include('-verbose')
   end
 
   it 'should use -verbose argument when running with --trace option' do
     trace true
-    javac_args.should include('-verbose') 
+    javac_args.should include('-verbose')
   end
 
   it 'should set debug option to true by default' do
@@ -251,7 +251,7 @@ describe 'javac compiler options' do
 end
 
 
-describe Project, '#javadoc' do
+describe Project, '#doc' do
   def sources
     @sources ||= (1..3).map { |i| "Test#{i}" }.
       each { |name| write "src/main/java/foo/#{name}.java", "package foo; public class #{name}{}" }.
@@ -260,64 +260,64 @@ describe Project, '#javadoc' do
 
   it 'should return the project\'s Javadoc task' do
     define('foo') { compile.using(:javac) }
-    project('foo').javadoc.name.should eql('foo:javadoc')
+    project('foo').doc.name.should eql('foo:doc')
   end
 
-  it 'should return a Javadoc task' do
+  it 'should return a DocTask' do
     define('foo') { compile.using(:javac) }
-    project('foo').javadoc.should be_kind_of(Javadoc::JavadocTask)
+    project('foo').doc.should be_kind_of(Doc::DocTask)
   end
 
-  it 'should set target directory to target/javadoc' do
+  it 'should set target directory to target/doc' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.target.to_s.should point_to_path('target/javadoc')
+      doc.target.to_s.should point_to_path('target/doc')
     end
   end
 
   it 'should create file task for target directory' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.should_receive(:invoke_prerequisites)
+      doc.should_receive(:invoke_prerequisites)
     end
-    project('foo').file('target/javadoc').invoke
+    project('foo').file('target/doc').invoke
   end
 
   it 'should respond to into() and return self' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.into('docs').should be(javadoc)
+      doc.into('docs').should be(doc)
     end
   end
 
   it 'should respond to into() and change target directory' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.into('docs')
-      javadoc.should_receive(:invoke_prerequisites)
+      doc.into('docs')
+      doc.should_receive(:invoke_prerequisites)
     end
     file('docs').invoke
   end
 
   it 'should respond to from() and return self' do
     task = nil
-    define('foo') { task = javadoc.from('srcs') }
-    task.should be(project('foo').javadoc)
+    define('foo') { task = doc.from('srcs') }
+    task.should be(project('foo').doc)
   end
 
   it 'should respond to from() and add sources' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.from('srcs').should be(javadoc)
+      doc.from('srcs').should be(doc)
     end
   end
 
   it 'should respond to from() and add file task' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.from('srcs').should be(javadoc)
+      doc.from('srcs').should be(doc)
     end
-    project('foo').javadoc.source_files.first.should point_to_path('srcs')
+    project('foo').doc.source_files.first.should point_to_path('srcs')
   end
 
   it 'should respond to from() and add project\'s sources and dependencies' do
@@ -325,27 +325,27 @@ describe Project, '#javadoc' do
     define 'foo' do
       compile.using(:javac)
       define('bar') { compile.using(:javac).with 'group:id:jar:1.0' }
-      javadoc.from project('foo:bar')
+      doc.from project('foo:bar')
     end
-    project('foo').javadoc.source_files.first.should point_to_path('bar/src/main/java/Test.java')
-    project('foo').javadoc.classpath.map(&:to_spec).should include('group:id:jar:1.0')
+    project('foo').doc.source_files.first.should point_to_path('bar/src/main/java/Test.java')
+    project('foo').doc.classpath.map(&:to_spec).should include('group:id:jar:1.0')
   end
 
-  it 'should generate javadocs from project' do
+  it 'should generate docs from project' do
     sources
     define('foo') { compile.using(:javac) }
-    project('foo').javadoc.source_files.sort.should == sources.sort.map { |f| File.expand_path(f) }
+    project('foo').doc.source_files.sort.should == sources.sort.map { |f| File.expand_path(f) }
   end
 
   it 'should include compile dependencies' do
     define('foo') { compile.using(:javac).with 'group:id:jar:1.0' }
-    project('foo').javadoc.classpath.map(&:to_spec).should include('group:id:jar:1.0')
+    project('foo').doc.classpath.map(&:to_spec).should include('group:id:jar:1.0')
   end
 
   it 'should respond to include() and return self' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.include('srcs').should be(javadoc)
+      doc.include('srcs').should be(doc)
     end
   end
 
@@ -353,15 +353,15 @@ describe Project, '#javadoc' do
     included = sources.first
     define 'foo' do
       compile.using(:javac)
-      javadoc.include included
+      doc.include included
     end
-    project('foo').javadoc.source_files.should include(included)
+    project('foo').doc.source_files.should include(included)
   end
 
   it 'should respond to exclude() and return self' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.exclude('srcs').should be(javadoc)
+      doc.exclude('srcs').should be(doc)
     end
   end
 
@@ -369,35 +369,35 @@ describe Project, '#javadoc' do
     excluded = sources.first
     define 'foo' do
       compile.using(:javac)
-      javadoc.exclude excluded
+      doc.exclude excluded
     end
     sources
-    project('foo').javadoc.source_files.sort.should == sources[1..-1].map { |f| File.expand_path(f) }
+    project('foo').doc.source_files.sort.should == sources[1..-1].map { |f| File.expand_path(f) }
   end
 
   it 'should respond to using() and return self' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.using(:windowtitle=>'Fooing').should be(javadoc)
+      doc.using(:windowtitle=>'Fooing').should be(doc)
     end
   end
 
   it 'should respond to using() and accept options' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.using :windowtitle=>'Fooing'
+      doc.using :windowtitle=>'Fooing'
     end
-    project('foo').javadoc.options[:windowtitle].should eql('Fooing')
+    project('foo').doc.options[:windowtitle].should eql('Fooing')
   end
 
   it 'should pick -windowtitle from project name' do
     define 'foo' do
       compile.using(:javac)
-      javadoc.options[:windowtitle].should eql('foo')
+      doc.options[:windowtitle].should eql('foo')
 
       define 'bar' do
         compile.using(:javac)
-        javadoc.options[:windowtitle].should eql('foo:bar')
+        doc.options[:windowtitle].should eql('foo:bar')
       end
     end
   end
@@ -406,32 +406,32 @@ describe Project, '#javadoc' do
     desc 'My App'
     define 'foo' do
       compile.using(:javac)
-      javadoc.options[:windowtitle].should eql('My App')
+      doc.options[:windowtitle].should eql('My App')
     end
   end
 
   it 'should produce documentation' do
     sources
     define('foo') { compile.using(:javac) }
-    project('foo').javadoc.invoke
-    (1..3).map { |i| "target/javadoc/foo/Test#{i}.html" }.each { |f| file(f).should exist }
+    project('foo').doc.invoke
+    (1..3).map { |i| "target/doc/foo/Test#{i}.html" }.each { |f| file(f).should exist }
   end
 
   it 'should fail on error' do
     write 'Test.java', 'class Test {}'
     define 'foo' do
       compile.using(:javac)
-      javadoc.include 'Test.java'
+      doc.include 'Test.java'
     end
-    lambda { project('foo').javadoc.invoke }.should raise_error(RuntimeError, /Failed to generate Javadocs/)
+    lambda { project('foo').doc.invoke }.should raise_error(RuntimeError, /Failed to generate Javadocs/)
   end
 
   it 'should be local task' do
     define 'foo' do
       define('bar') { compile.using(:javac) }
     end
-    project('foo:bar').javadoc.should_receive(:invoke_prerequisites)
-    in_original_dir(project('foo:bar').base_dir) { task('javadoc').invoke }
+    project('foo:bar').doc.should_receive(:invoke_prerequisites)
+    in_original_dir(project('foo:bar').base_dir) { task('doc').invoke }
   end
 
   it 'should not recurse' do
@@ -439,8 +439,8 @@ describe Project, '#javadoc' do
       compile.using(:javac)
       define('bar') { compile.using(:javac) }
     end
-    project('foo:bar').javadoc.should_not_receive(:invoke_prerequisites)
-    project('foo').javadoc.invoke
+    project('foo:bar').doc.should_not_receive(:invoke_prerequisites)
+    project('foo').doc.invoke
   end
 end