buildr 1.3.2 → 1.3.3

data/spec/{common_spec.rb → core/common_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 describe Buildr.method(:struct) do
   before do
@@ -110,42 +110,62 @@ describe Buildr.method(:download) do
   end
 
   it 'should accept a String and download from that URL' do
-    download('http://localhost/download').tap do |task|
-      task.source.should_receive(:read).and_yield [@content]
-      task.invoke
-      task.should contain(@content)
+    define 'foo' do
+      download('http://localhost/download').tap do |task|
+        task.source.should_receive(:read).and_yield [@content]
+        task.invoke
+        task.should contain(@content)
+      end
     end
   end
 
   it 'should accept a URI and download from that URL' do
-    download(URI.parse('http://localhost/download')).tap do |task|
-      task.source.should_receive(:read).and_yield [@content]
-      task.invoke
-      task.should contain(@content)
+    define 'foo' do
+      download(URI.parse('http://localhost/download')).tap do |task|
+        task.source.should_receive(:read).and_yield [@content]
+        task.invoke
+        task.should contain(@content)
+      end
     end
   end
 
   it 'should accept a path and String and download from that URL' do
-    download('downloaded'=>'http://localhost/download').tap do |task|
-      task.source.should_receive(:read).and_yield [@content]
-      task.invoke
-      task.should contain(@content)
+    define 'foo' do
+      download('downloaded'=>'http://localhost/download').tap do |task|
+        task.source.should_receive(:read).and_yield [@content]
+        task.invoke
+        task.should contain(@content)
+      end
+    end
+  end
+
+  it 'should accept an artifact and String and download from that URL' do
+    define 'foo' do
+      artifact('com.example:library:jar:2.0').tap do |artifact|
+        download(artifact=>'http://localhost/download').source.should_receive(:read).and_yield [@content]
+        artifact.invoke
+        artifact.should contain(@content)
+      end
     end
   end
 
   it 'should accept a path and URI and download from that URL' do
-    download('downloaded'=>URI.parse('http://localhost/download')).tap do |task|
-      task.source.should_receive(:read).and_yield [@content]
-      task.invoke
-      task.should contain(@content)
+    define 'foo' do
+      download('downloaded'=>URI.parse('http://localhost/download')).tap do |task|
+        task.source.should_receive(:read).and_yield [@content]
+        task.invoke
+        task.should contain(@content)
+      end
     end
   end
 
   it 'should create path for download' do
-    download('path/downloaded'=>URI.parse('http://localhost/download')).tap do |task|
-      task.source.should_receive(:read).and_yield [@content]
-      task.invoke
-      task.should contain(@content)
+    define 'foo' do
+      download('path/downloaded'=>URI.parse('http://localhost/download')).tap do |task|
+        task.source.should_receive(:read).and_yield [@content]
+        task.invoke
+        task.should contain(@content)
+      end
     end
   end
 
@@ -166,10 +186,12 @@ describe Buildr.method(:download) do
   end
 
   it 'should execute only if file does not already exist' do
-    download('downloaded'=>'http://localhost/download').tap do |task|
-      task.source.should_not_receive(:read)
-      write task.to_s, 'not really'
-      task.invoke
+    define 'foo' do
+      download('downloaded'=>'http://localhost/download').tap do |task|
+        task.source.should_not_receive(:read)
+        write task.to_s, 'not really'
+        task.invoke
+      end
     end
   end
 
@@ -282,7 +304,7 @@ describe Buildr::Filter do
 
   it 'should respond to :include and use these inclusion patterns' do
     @filter.from('src').into('target').include('file2', 'file3').run
-    Dir['target/*'].should eql(['target/file2', 'target/file3'])
+    Dir['target/*'].sort.should eql(['target/file2', 'target/file3'])
   end
 
   it 'should respond to :exclude and return self' do
@@ -354,6 +376,43 @@ describe Buildr::Filter do
     end
   end
 
+  it 'should use erb when given a binding' do
+    1.upto(4) { |i| write "src/file#{i}", "file#{i} with <%= key1 %> and <%= key2 * 2 %>" }
+    key1 = 'value1'
+    key2 = 12
+    @filter.from('src').into('target').using(binding).run
+    Dir['target/*'].each do |file|
+      read(file).should eql("#{File.basename(file)} with value1 and 24")
+    end
+  end
+
+  it 'should apply hash mapping using erb' do
+    1.upto(4) { |i| write "src/file#{i}", "file#{i} with <%= key1 %> and <%= key2 * 2 %>" }
+    @filter.from('src').into('target').using(:erb, 'key1'=>'value1', 'key2'=> 12).run
+    Dir['target/*'].each do |file|
+      read(file).should eql("#{File.basename(file)} with value1 and 24")
+    end
+  end
+
+  it 'should use an object binding when using erb' do
+    1.upto(4) { |i| write "src/file#{i}", "file#{i} with <%= key1 %> and <%= key2 * 2 %>" }
+    obj = Struct.new(:key1, :key2).new('value1', 12)
+    @filter.from('src').into('target').using(:erb, obj).run
+    Dir['target/*'].each do |file|
+      read(file).should eql("#{File.basename(file)} with value1 and 24")
+    end
+  end
+
+  it 'should use a given block context when using erb' do
+    1.upto(4) { |i| write "src/file#{i}", "file#{i} with <%= key1 %> and <%= key2 * 2 %>" }
+    key1 = 'value1'
+    key2 = 12
+    @filter.from('src').into('target').using(:erb){}.run
+    Dir['target/*'].each do |file|
+      read(file).should eql("#{File.basename(file)} with value1 and 24")
+    end
+  end
+
   it 'should using Maven mapper by default' do
     @filter.using('key1'=>'value1', 'key2'=>'value2').mapper.should eql(:maven)
   end
@@ -430,6 +489,32 @@ describe Buildr::Filter do
   end
 end
 
+describe Filter::Mapper do 
+  
+  module MooMapper
+    def moo_config(*args, &block)
+      raise ArgumentError, "Expected moo block" unless block_given?
+      { :moos => args, :callback => block }
+    end
+    
+    def moo_transform(content, path = nil)
+      content.gsub(/moo+/i) do |str|
+        moos = yield :moos # same than config[:moos]
+        moo = moos[str.size - 3] || str
+        config[:callback].call(moo)
+      end
+    end
+  end
+
+  it 'should allow plugable mapping types' do
+    mapper = Filter::Mapper.new.extend(MooMapper)
+    mapper.using(:moo, 'ooone', 'twoo') do |str|
+      i = nil; str.capitalize.gsub(/\w/) { |s| s.send( (i = !i) ? 'upcase' : 'downcase' ) }
+    end
+    mapper.transform('Moo cow, mooo cows singing mooooo').should == 'OoOnE cow, TwOo cows singing MoOoOo'
+  end
+
+end
 
 describe Buildr.method(:options) do
   it 'should return an Options object' do
@@ -446,7 +531,6 @@ describe Buildr.method(:options) do
   end
 end
 
-
 describe Buildr::Options, 'proxy.exclude' do
   before do
     options.proxy.http = 'http://myproxy:8080'
@@ -551,9 +635,14 @@ name1=with\tand\r
 
 name2=with\\nand\f
 
-name3=double\\hash
+name3=double\\\\hash
 PROPS
-    hash.should == {'name1'=>"with\tand\r", 'name2'=>"with\nand\f", 'name3'=>"double\\hash"}
+    hash.should == {'name1'=>"with\tand", 'name2'=>"with\nand\f", 'name3'=>'double\hash'}
+  end
+  
+  it 'should ignore whitespace' do
+    hash = Hash.from_java_properties('name1 = value1')
+    hash.should == {'name1'=>'value1'}
   end
 end
 
@@ -567,7 +656,7 @@ describe Hash, '#to_java_properties' do
   end
 
   it 'should handle \t, \r, \n and \f' do
-    props = {'name1'=>"with\tand\r", 'name2'=>"with\nand\f", 'name3'=>"double\\hash"}.to_java_properties
+    props = {'name1'=>"with\tand\r", 'name2'=>"with\nand\f", 'name3'=>'double\hash'}.to_java_properties
     props.split("\n").should include("name1=with\\tand\\r")
     props.split("\n").should include("name2=with\\nand\\f")
     props.split("\n").should include("name3=double\\\\hash")

data/spec/{compile_spec.rb → core/compile_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 module CompilerHelper
@@ -23,8 +23,8 @@ module CompilerHelper
   end
 
   def sources
-    @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java', f) }.
-      each { |src| write src, "class #{src.pathmap('%n')} {}" }
+    @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java/thepackage', f) }.
+      each { |src| write src, "package thepackage; class #{src.pathmap('%n')} {}" }
   end
 
   def jars
@@ -146,12 +146,12 @@ describe Buildr::CompileTask, '#sources' do
 
   it 'should allow files' do
     compile_task.from(sources).into('classes').invoke
-    sources.each { |src| file(src.pathmap('classes/%n.class')).should exist }
+    sources.each { |src| file(src.pathmap('classes/thepackage/%n.class')).should exist }
   end
 
   it 'should allow directories' do
     compile_task.from(File.dirname(sources.first)).into('classes').invoke
-    sources.each { |src| file(src.pathmap('classes/%n.class')).should exist }
+    sources.each { |src| file(src.pathmap('classes/thepackage/%n.class')).should exist }
   end
 
   it 'should allow tasks' do
@@ -179,7 +179,7 @@ describe Buildr::CompileTask, '#dependencies' do
 
   it 'should allow files' do
     compile_task.from(sources).with(jars).into('classes').invoke
-    sources.each { |src| file(src.pathmap('classes/%n.class')).should exist }
+    sources.each { |src| file(src.pathmap('classes/thepackage/%n.class')).should exist }
   end
 
   it 'should allow tasks' do
@@ -261,7 +261,7 @@ describe Buildr::CompileTask, '#invoke' do
 
   it 'should compile into target directory' do
     compile_task.from(sources).into('code').invoke
-    Dir['code/*.class'].should_not be_empty
+    Dir['code/thepackage/*.class'].should_not be_empty
   end
 
   it 'should compile only once' do
@@ -302,7 +302,9 @@ describe Buildr::CompileTask, '#invoke' do
   end
 
   it 'should force compilation if target empty' do
+    time = Time.now
     mkpath compile_task.target.to_s
+    File.utime(time - 1, time - 1, compile_task.target.to_s)
     lambda { compile_task.from(sources).invoke }.should run_task('foo:compile')
   end
 
@@ -310,15 +312,16 @@ describe Buildr::CompileTask, '#invoke' do
     # Simulate class files that are older than source files.
     time = Time.now
     sources.each { |src| File.utime(time + 1, time + 1, src) }
-    sources.map { |src| src.pathmap("#{compile_task.target}/%n.class") }.
+    sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
+    File.utime(time - 1, time - 1, project('foo').compile.target.to_s)
     lambda { compile_task.from(sources).invoke }.should run_task('foo:compile')
   end
 
   it 'should not force compilation if sources older than compiled' do
     # When everything has the same timestamp, nothing is compiled again.
     time = Time.now
-    sources.map { |src| src.pathmap("#{compile_task.target}/%n.class") }.
+    sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
     lambda { compile_task.from(sources).invoke }.should_not run_task('foo:compile')
   end
@@ -327,8 +330,9 @@ describe Buildr::CompileTask, '#invoke' do
     jars; project('jars').task("package").invoke
     # On my machine the times end up the same, so need to push dependencies in the past.
     time = Time.now
-    sources.map { |src| src.pathmap("#{compile_task.target}/%n.class") }.
-      each { |kls| write kls ; File.utime(time, time, kls) }
+    sources.map { |src| src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
+      each { |kls| write kls ; File.utime(time - 1, time - 1, kls) }
+    File.utime(time - 1, time - 1, project('foo').compile.target.to_s)
     jars.each { |jar| File.utime(time + 1, time + 1, jar) }
     lambda { compile_task.from(sources).with(jars).invoke }.should run_task('foo:compile')
   end
@@ -337,7 +341,7 @@ describe Buildr::CompileTask, '#invoke' do
     jars; project('jars').task("package").invoke
     time = Time.now
     jars.each { |jar| File.utime(time - 1 , time - 1, jar) }
-    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/%n.class") }.
+    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/thepackage/%n.class") }.
       each { |kls| write kls ; File.utime(time, time, kls) }
     lambda { compile_task.from(sources).with(jars).invoke }.should_not run_task('foo:compile')
   end
@@ -434,7 +438,7 @@ describe Project, '#compile' do
     lambda { project('foo').compile.invoke }.should run_task('foo:bar:compile')
   end
 
-  it 'sould be a local task' do
+  it 'should be a local task' do
     write 'bar/src/main/java/Test.java', 'class Test {}'
     define('foo') { define 'bar' }
     lambda do

data/spec/core/generate_spec.rb

@@ -0,0 +1,33 @@
+# 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 Buildr::Generate do
+  
+  describe 'Generated buildfile' do
+    it 'should be a legal buildfile' do
+      File.open('buildfile', 'w') { |file| file.write Generate.from_directory(true).join("\n") }
+      lambda { Buildr.application.run }.should_not raise_error
+    end
+    
+    it 'should not contain NEXT_VERSION because it was removed in buildr 1.3.3' do
+      buildfile = Generate.from_directory(true)
+      buildfile.each { |line| line.should_not include('NEXT_VERSION')}
+    end
+  end
+end

data/spec/{project_spec.rb → core/project_spec.rb}

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
 
 
 describe Project do
@@ -644,6 +644,13 @@ describe Project, '#task' do
     define('foo') { task('bar') }
     project('foo').task('bar').name.should eql('foo:bar')
   end
+  
+  it 'should ignore namespace if starting with color' do
+    define 'foo' do
+      task(':bar').name.should == 'bar'
+    end
+    Rake::Task.task_defined?('bar').should be_true
+  end
 
   it 'should accept single dependency' do
     define('foo') { task('bar'=>'baz') }
@@ -739,13 +746,9 @@ end
 
 
 describe Rake::Task, 'buildr:initialize' do
-  it 'should be ready to run as the first task' do
-    Buildr.application.top_level_tasks.first.should eql('buildr:initialize')
-  end
-
   it 'should evaluate all project definitions' do
     defined = false
     Buildr.define('foo') { defined = true }
     lambda { task('buildr:initialize').invoke }.should change { defined }.to(true)
   end
-end
+end

data/spec/{test_spec.rb → core/test_spec.rb}

@@ -14,7 +14,17 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'spec_helpers')
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+
+module TestHelper
+  def touch_last_successful_test_run(test_task, timestamp = Time.now)
+    test_task.instance_eval do
+      record_successful_run
+      File.utime(timestamp, timestamp, last_successful_run_file)
+    end
+  end
+end
 
 
 describe Buildr::TestTask do
@@ -188,6 +198,12 @@ describe Buildr::TestTask do
     project('foo').test.dependencies.should include(project('foo').compile.target)
   end
 
+  it 'should include the main compile target in its dependencies, even when using non standard directories' do
+    write 'src/java/Nothing.java', 'class Nothing {}'
+    define('foo') { compile path_to('src/java') }
+    project('foo').test.dependencies.should include(project('foo').compile.target)
+  end
+
   it 'should include the main resources target in its dependencies' do
     write 'src/main/resources/config.xml'
     define('foo').test.dependencies.should include(project('foo').resources.target)
@@ -203,6 +219,12 @@ describe Buildr::TestTask do
     project('foo').test.dependencies.should include(project('foo').test.compile.target)
   end
 
+  it 'should include the test compile target in its dependencies, even when using non standard directories' do
+    write 'src/test/Test.java', 'class Test {}'
+    define('foo') { test.compile path_to('src/test') }
+    project('foo').test.dependencies.should include(project('foo').test.compile.target)
+  end
+
   it 'should add test compile target ahead of regular compile target' do
     write 'src/main/java/Code.java'
     write 'src/test/java/Test.java'
@@ -223,6 +245,10 @@ describe Buildr::TestTask do
     depends = project('foo').test.dependencies
     depends.index(project('foo').test.resources.target).should < depends.index(project('foo').resources.target)
   end
+  
+  it 'should not have a last successful run timestamp before the tests are run' do
+    test_task.timestamp.should == Rake::EARLY
+  end
 
   it 'should clean after itself (test files)' do
     define('foo') { test.compile.using(:javac) }
@@ -244,7 +270,7 @@ describe Buildr::TestTask, 'with no tests' do
   end
 
   it 'should report no failed tests' do
-    lambda { verbose(true) { define('foo').test.invoke } }.should_not warn_that(/fail/i)
+    lambda { verbose(true) { define('foo').test.invoke } }.should_not show_error(/fail/i)
   end
   
   it 'should return no failed tests' do
@@ -284,7 +310,7 @@ describe Buildr::TestTask, 'with passing tests' do
   end
 
   it 'should report no failed tests' do
-    lambda { verbose(true) { test_task.invoke } }.should_not warn_that(/fail/i)
+    lambda { verbose(true) { test_task.invoke } }.should_not show_error(/fail/i)
   end
   
   it 'should return passed tests' do
@@ -300,10 +326,17 @@ describe Buildr::TestTask, 'with passing tests' do
   it 'should execute teardown task' do
     lambda { test_task.invoke }.should run_task('foo:test:teardown')
   end
+  
+  it 'should update the last successful run timestamp' do
+    before = Time.now ; test_task.invoke ; after = Time.now
+    (before-1..after+1).should include(test_task.timestamp)
+  end
 end
 
 
 describe Buildr::TestTask, 'with failed test' do
+  include TestHelper
+  
   def test_task
     @test_task ||= begin
       define 'foo' do
@@ -322,7 +355,7 @@ describe Buildr::TestTask, 'with failed test' do
   end
 
   it 'should report failed tests' do
-    lambda { verbose(true) { test_task.invoke rescue nil } }.should warn_that(/FailingTest/)
+    lambda { verbose(true) { test_task.invoke rescue nil } }.should show_error(/FailingTest/)
   end
 
   it 'should return failed tests' do
@@ -342,7 +375,7 @@ describe Buildr::TestTask, 'with failed test' do
 
   it 'should report failed tests even if fail_on_failure is false' do
     test_task.using(:fail_on_failure=>false)
-    lambda { verbose(true) { test_task.invoke } }.should warn_that(/FailingTest/)
+    lambda { verbose(true) { test_task.invoke } }.should show_error(/FailingTest/)
   end
 
   it 'should return failed tests even if fail_on_failure is false' do
@@ -353,6 +386,13 @@ describe Buildr::TestTask, 'with failed test' do
   it 'should execute teardown task' do
     lambda { test_task.invoke rescue nil }.should run_task('foo:test:teardown')
   end
+  
+  it 'should not update the last successful run timestamp' do
+    a_second_ago = Time.now - 1
+    touch_last_successful_test_run test_task, a_second_ago
+    test_task.invoke rescue nil
+    test_task.timestamp.should <= a_second_ago
+  end
 end
 
 
@@ -401,7 +441,7 @@ describe Buildr::Project, '#test' do
     end
   end
 
-  it 'should clone options from parent project' do
+  it 'should clone options from parent project when using #using' do
     define 'foo' do
       define 'bar' do
         test.using :fail_on_failure=>false, :fork=>:each, :properties=>{ :foo=>'bar' }, :environment=>{ 'config'=>'config.yaml' }
@@ -409,9 +449,57 @@ describe Buildr::Project, '#test' do
       end.invoke
       test.options[:fail_on_failure].should be_true
       test.options[:fork].should == :once
-      test.options[:properties].should be_empty
-      test.options[:environment].should be_empty
+      test.options[:properties].should == {}
+      test.options[:environment].should == {}
+    end
+  end
+  
+  it 'should clone options from parent project when using #options' do
+    define 'foo' do
+      define 'bar' do
+        test.options[:fail_on_failure] = false
+        test.options[:fork] = :each
+        test.options[:properties][:foo] = 'bar'
+        test.options[:environment]['config'] = 'config.yaml'
+        test.using :junit
+      end.invoke
+      test.options[:fail_on_failure].should be_true
+      test.options[:fork].should == :once
+      test.options[:properties].should == {}
+      test.options[:environment].should == {}
+    end
+  end
+  
+  it 'should accept to set a test property in the top project' do
+    define 'foo' do
+        test.options[:properties][:foo] = 'bar'
     end
+    project('foo').test.options[:properties][:foo].should == 'bar'
+  end
+  
+  it 'should accept to set a test property in a subproject' do
+    define 'foo' do
+      define 'bar' do
+        test.options[:properties][:bar] = 'baz'
+      end
+    end
+    project('foo:bar').test.options[:properties][:bar].should == 'baz'
+  end
+  
+  it 'should not change options of unrelated projects when using #options' do
+    define 'foo' do
+      test.options[:properties][:foo] = 'bar'
+    end
+    define 'bar' do
+      test.options[:properties].should == {}
+    end
+  end
+  
+  it "should run from project's build task" do
+    write 'src/main/java/Foo.java'
+    write 'src/test/java/FooTest.java'
+    define('foo')
+    lambda { task('foo:build').invoke }.should run_task('foo:test')
   end
 end
 
@@ -471,7 +559,7 @@ describe Buildr::Project, '#test.compile' do
 end
 
 
-describe Buildr::Project, 'test:resources' do
+describe Buildr::Project, '#test.resources' do
   it 'should ignore resources unless they exist' do
     define('foo').test.resources.sources.should be_empty
     project('foo').test.resources.target.should be_nil
@@ -501,6 +589,99 @@ describe Buildr::Project, 'test:resources' do
 end
 
 
+describe Buildr::TestTask, '#invoke' do
+  include TestHelper
+  
+  def test_task
+    @test_task ||= define('foo') {
+      test.using(:junit)
+      test.instance_eval do
+        @framework.stub!(:tests).and_return(['PassingTest'])
+        @framework.stub!(:run).and_return(['PassingTest'])
+      end
+    }.test
+  end
+  
+  it 'should require dependencies to exist' do
+    lambda { test_task.with('no-such.jar').invoke }.should \
+      raise_error(RuntimeError, /Don't know how to build/)
+  end
+
+  it 'should run all dependencies as prerequisites' do
+    file(File.expand_path('no-such.jar')) { task('prereq').invoke }
+    lambda { test_task.with('no-such.jar').invoke }.should run_tasks(['prereq', 'foo:test'])
+  end
+
+  it 'should run tests if they have never run' do
+    lambda { test_task.invoke }.should run_task('foo:test')
+  end
+  
+  it 'should not run tests if test option is off' do
+    Buildr.options.test = false
+    lambda { test_task.invoke }.should_not run_task('foo:test')
+  end
+  
+  describe 'when there was a successful test run already' do
+    before do
+      @a_second_ago = Time.now - 1
+      src = ['main/java/Foo.java', 'main/resources/config.xml', 'test/java/FooTest.java', 'test/resources/config-test.xml'].map { |f| File.join('src', f) }
+      target = ['classes/Foo.class', 'resources/config.xml', 'test/classes/FooTest.class', 'test/resources/config-test.xml'].map { |f| File.join('target', f) }
+      files = ['buildfile'] + src + target
+      files.each { |file| write file }
+      (files + files.map { |file| file.pathmap('%d') }).each { |file| File.utime(@a_second_ago, @a_second_ago, file) }
+      touch_last_successful_test_run test_task, @a_second_ago
+    end
+    
+    it 'should not run tests if nothing changed' do
+      lambda { test_task.invoke }.should_not run_task('foo:test')
+    end
+    
+    it 'should run tests if options.test is :all' do
+      Buildr.options.test = :all
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if main compile target changed' do
+      touch project('foo').compile.target.to_s
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if test compile target changed' do
+      touch test_task.compile.target.to_s
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if main resources changed' do
+      touch project('foo').resources.target.to_s
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if test resources changed' do
+      touch test_task.resources.target.to_s
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if compile-dependent project changed' do
+      write 'bar/src/main/java/Bar.java', 'public class Bar {}'
+      define('bar', :version=>'1.0', :base_dir=>'bar') { package :jar }
+      project('foo').compile.with project('bar')
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if test-dependent project changed' do
+      write 'bar/src/main/java/Bar.java', 'public class Bar {}'
+      define('bar', :version=>'1.0', :base_dir=>'bar') { package :jar }
+      test_task.with project('bar')
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+    
+    it 'should run tests if buildfile changed' do
+      touch 'buildfile'
+      lambda { test_task.invoke }.should run_task('foo:test')
+    end
+  end
+end
+
 describe Rake::Task, 'test' do
   it 'should be recursive' do
     define('foo') { define 'bar' }
@@ -519,7 +700,7 @@ describe Rake::Task, 'test' do
   it 'should stop at first failure' do
     define('foo') { test { fail } }
     define('bar') { test { fail } }
-    lambda { task('test').invoke rescue nil }.should run_tasks('bar:test').but_not('foo:test')
+    lambda { task('test').invoke rescue nil }.should run_tasks('foo:test').but_not('bar:test')
   end
 
   it 'should ignore failure if options.test is :all' do
@@ -567,6 +748,8 @@ end
 
 
 describe 'test rule' do
+  include TestHelper
+  
   it 'should execute test task on local project' do
     define('foo') { define 'bar' }
     lambda { task('test:something').invoke }.should run_task('foo:test')
@@ -621,22 +804,31 @@ describe 'test rule' do
   it 'should execute only the named tests' do
     write 'src/test/java/TestSomething.java',
       'public class TestSomething extends junit.framework.TestCase { public void testNothing() {} }'
-    write 'src/test/java/TestFails.java', 'class TestFails {}'
+    write 'src/test/java/TestFails.java',
+      'public class TestFails extends junit.framework.TestCase { public void testFailure() { fail(); } }'
     define 'foo'
     task('test:Something').invoke
   end
-end
-
-
-describe Rake::Task, 'build' do
-  it 'should run test task if test option is on' do
-    Buildr.options.test = true
-    lambda { task('build').invoke }.should run_tasks('test')
+  
+  it 'should execute the named tests even if the test task is not needed' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+    end
+    touch_last_successful_test_run project('foo').test
+    task('test:something').invoke
+    project('foo').test.tests.should include('something')
   end
-
-  it 'should not run test task if test option is off' do
-    Buildr.options.test = false
-    lambda { task('build').invoke }.should_not run_task('test')
+  
+  it 'should not update the last successful test run timestamp' do
+    define 'foo' do
+      test.using(:junit)
+      test.instance_eval { @framework.stub!(:tests).and_return(['something', 'nothing']) }
+    end
+    a_second_ago = Time.now - 1
+    touch_last_successful_test_run project('foo').test, a_second_ago
+    task('test:something').invoke
+    project('foo').test.timestamp.should <= a_second_ago
   end
 end
 
@@ -668,7 +860,7 @@ describe Buildr::Options, 'test' do
 
   it 'should be true and warn for any other value' do
     ENV['TEST'] = 'funky'
-    lambda { Buildr.options.test.should be(true) }.should warn_that(/expecting the environment variable/i)
+    lambda { Buildr.options.test.should be(true) }.should show_warning(/expecting the environment variable/i)
   end
 end
 
@@ -763,13 +955,13 @@ describe Rake::Task, 'integration' do
   it 'should run setup task before any project integration tests' do
     define('foo') { test.using :integration }
     define('bar') { test.using :integration }
-    lambda { task('integration').invoke }.should run_tasks([integration.setup, 'bar:test', 'foo:test'])
+    lambda { task('integration').invoke }.should run_tasks([integration.setup, 'bar:test'], [integration.setup, 'foo:test'])
   end
 
   it 'should run teardown task after all project integrations tests' do
     define('foo') { test.using :integration }
     define('bar') { test.using :integration }
-    lambda { task('integration').invoke }.should run_tasks(['bar:test', 'foo:test', integration.teardown])
+    lambda { task('integration').invoke }.should run_tasks(['bar:test', integration.teardown], ['foo:test', integration.teardown])
   end
 
   it 'should run test cases marked for integration' do
@@ -819,7 +1011,7 @@ describe Rake::Task, 'integration' do
       define('bar') { test.using :integration=>false }
     end
     lambda { task('package').invoke }.should run_tasks(['foo:package', 'foo:test'],
-      ['foo:bar:build', 'foo:bar:test', 'foo:bar:package'])
+      ['foo:bar:test', 'foo:bar:package'])
   end
 
   it 'should not execute by local package task if test=no' do
@@ -888,10 +1080,12 @@ describe 'integration rule' do
     project('foo').test.tests.should_not include('baz')
   end
 
-  it 'should execute only the named tasts' do
+  it 'should execute only the named tests' do
     write 'src/test/java/TestSomething.java',
       'public class TestSomething extends junit.framework.TestCase { public void testNothing() {} }'
-    write 'src/test/java/TestFails.java', 'class TestFails {}'
+    write 'src/test/java/TestFails.java',
+      'public class TestFails extends junit.framework.TestCase { public void testFailure() { fail(); } }'
+    define('foo') { test.using :junit, :integration }
     task('integration:Something').invoke
   end
 end