You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by as...@apache.org on 2008/09/22 19:27:59 UTC
svn commit: r697907 - in /incubator/buildr/trunk: lib/buildr/core/test.rb
lib/buildr/java/ant.rb lib/buildr/java/bdd_frameworks.rb
lib/buildr/java/test_frameworks.rb spec/java_bdd_frameworks_spec.rb
spec/java_test_frameworks_spec.rb spec/sandbox.rb
Author: assaf
Date: Mon Sep 22 10:27:59 2008
New Revision: 697907
URL: http://svn.apache.org/viewvc?rev=697907&view=rev
Log:
New way to control dependencies: module provides .version and .dependencies methods replacing VERSION and REQUIRES constants. Version number can be specified in buildr.yaml file (e.g. ant: 1.7.2)
Modified:
incubator/buildr/trunk/lib/buildr/core/test.rb
incubator/buildr/trunk/lib/buildr/java/ant.rb
incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb
incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb
incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
incubator/buildr/trunk/spec/java_test_frameworks_spec.rb
incubator/buildr/trunk/spec/sandbox.rb
Modified: incubator/buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/test.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/test.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/test.rb Mon Sep 22 10:27:59 2008
@@ -82,10 +82,10 @@
raise 'Not implemented'
end
- # Returns a list of dependencies for this framework. Defaults to obtaining a list of
- # artifact specifications from the REQUIRES constant.
+ # Returns a list of dependencies for this framework. Default is an empty list,
+ # override to add dependencies.
def dependencies
- @dependencies ||= Buildr.artifacts(*(const_get('REQUIRES') rescue []))
+ @dependencies ||= []
end
end
Modified: incubator/buildr/trunk/lib/buildr/java/ant.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/ant.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/ant.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/ant.rb Mon Sep 22 10:27:59 2008
@@ -33,13 +33,16 @@
# Ant classpath dependencies.
def dependencies
- ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}"]
+ # Ant-Trax required for running the JUnitReport task, and there's no other place
+ # to put it but the root classpath.
+ @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}",
+ "org.apache.ant:ant-trax:jar:#{version}"]
end
private
def const_missing(const)
return super unless const == :REQUIRES # TODO: remove in 1.5
- Buildr.application.deprecated "Please use Ant.version/dependencies instead of VERSION/REQUIRES"
+ Buildr.application.deprecated "Please use Ant.dependencies/.version instead of Ant::REQUIRES/VERSION"
dependencies
end
end
Modified: incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb Mon Sep 22 10:27:59 2008
@@ -55,14 +55,11 @@
end
end
+
class RSpec < TestFramework::Base
include TestFramework::JavaBDD
self.lang = :ruby
-
-
- REQUIRES = []
- # REQUIRES.unshift 'org.jruby:jruby-complete:jar:1.1.1' unless RUBY_PLATFORM =~ /java/
-
+
TESTS_PATTERN = [ /_spec.rb$/ ]
OPTIONS = [:properties, :java_args]
@@ -93,22 +90,19 @@
tests
end
- private
+ private
+
def jruby_home
@jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME']
end
- def required_gems(options)
- ["ci_reporter", options[:required_gems]].flatten.compact
- end
-
def jruby(*args)
- java_args = ["org.jruby.Main", *args]
+ java_args = ['org.jruby.Main', *args]
java_args << {} unless Hash === args.last
cmd_options = java_args.last
project = cmd_options.delete(:project)
cmd_options[:java_args] ||= []
- cmd_options[:java_args] << "-Xmx512m" unless cmd_options[:java_args].detect {|a| a =~ /^-Xmx/}
+ cmd_options[:java_args] << '-Xmx512m' unless cmd_options[:java_args].detect {|a| a =~ /^-Xmx/}
cmd_options[:properties] ||= {}
cmd_options[:properties]['jruby.home'] = jruby_home
Java::Commands.java(*java_args)
@@ -120,6 +114,7 @@
include TestFramework::JavaBDD
self.lang = :ruby
end
+
# JBehave is a Java BDD framework. To use in your project:
# test.using :jbehave
@@ -136,16 +131,30 @@
include TestFramework::JavaBDD
VERSION = "1.0.1" unless const_defined?('VERSION')
- REQUIRES = ["org.jbehave:jbehave:jar:#{VERSION}",
- "jmock:jmock-cglib:jar:#{JMock::VERSION}",
- "cglib:cglib-full:jar:2.0.2",
- ] + JUnit::REQUIRES
- TESTS_PATTERN = [ /Behaviou?r$/ ]
+ TESTS_PATTERN = [ /Behaviou?r$/ ] #:nodoc:
+
+ class << self
+ def version
+ Buildr.settings.build['jbehave'] || VERSION
+ end
- def self.applies_to?(project) #:nodoc:
- %w{
- **/*Behaviour.java **/*Behavior.java
- }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
+ def dependencies
+ @dependencies ||= ["org.jbehave:jbehave:jar:#{version}", "cglib:cglib-full:jar:2.0.2"] +
+ JMock.dependencies + JUnit.dependencies
+ end
+
+ def applies_to?(project) #:nodoc:
+ %w{
+ **/*Behaviour.java **/*Behavior.java
+ }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION"
+ dependencies
+ end
end
def tests(dependencies) #:nodoc:
@@ -168,6 +177,7 @@
end
+
# EasyB is a Groovy based BDD framework.
# To use in your project:
#
@@ -186,20 +196,34 @@
self.lang = :groovy
VERSION = "0.7" unless const_defined?(:VERSION)
- REQUIRES = ["org.easyb:easyb:jar:#{VERSION}",
- 'org.codehaus.groovy:groovy:jar:1.5.3',
- 'asm:asm:jar:2.2.3',
- 'commons-cli:commons-cli:jar:1.0',
- 'antlr:antlr:jar:2.7.7']
TESTS_PATTERN = [ /(Story|Behavior).groovy$/ ]
OPTIONS = [:format, :properties, :java_args]
- def self.applies_to?(project) #:nodoc:
- %w{
- **/*Behaviour.groovy **/*Behavior.groovy **/*Story.groovy
- }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
+ class << self
+ def version
+ Buildr.settings.build['jbehave'] || VERSION
+ end
+
+ def dependencies
+ @dependencies ||= ["org.easyb:easyb:jar:#{version}",
+ 'org.codehaus.groovy:groovy:jar:1.5.3','asm:asm:jar:2.2.3',
+ 'commons-cli:commons-cli:jar:1.0','antlr:antlr:jar:2.7.7']
+ end
+
+ def applies_to?(project) #:nodoc:
+ %w{
+ **/*Behaviour.groovy **/*Behavior.groovy **/*Story.groovy
+ }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION"
+ dependencies
+ end
end
-
+
def tests(dependencies) #:nodoc:
Dir[task.project.path_to(:source, bdd_dir, lang, "**/*.groovy")].
select { |name| TESTS_PATTERN.any? { |pat| pat === name } }
@@ -244,4 +268,4 @@
Buildr::TestFramework << Buildr::RSpec
Buildr::TestFramework << Buildr::JtestR
Buildr::TestFramework << Buildr::JBehave
-Buildr::TestFramework << Buildr::EasyB
+Buildr::TestFramework << Buildr::EasyB
\ No newline at end of file
Modified: incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb Mon Sep 22 10:27:59 2008
@@ -31,7 +31,7 @@
mod.extend ClassMethods
end
- private
+ private
# :call-seq:
# filter_classes(dependencies, criteria)
#
@@ -82,31 +82,31 @@
end
end
+
# JMock is available when using JUnit and TestNG, JBehave.
module JMock
- # JMock version.
+
VERSION = '1.2.0' unless const_defined?('VERSION')
- # JMock specification.
- REQUIRES = ["jmock:jmock:jar:#{VERSION}"]
- end
+
+ class << self
+ def version
+ Buildr.settings.build['jmock'] || VERSION
+ end
- # Specs is available when using ScalaTest
- module ScalaSpecs
- # Specs version number.
- VERSION = '1.2.9' unless const_defined?('VERSION')
- # Specs artifact(s)
- REQUIRES = ["org.specs:specs:jar:#{VERSION}"]
+ def dependencies
+ @dependencies ||= ["jmock:jmock:jar:#{version}"]
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION"
+ dependencies
+ end
+ end
end
- # ScalaCheck is available when using ScalaTest
- module ScalaCheck
- # ScalaCheck version number.
- VERSION = '1.3' unless const_defined?('VERSION')
- # ScalaCheck artifact(s)
- REQUIRES = ["org.scalacheck:scalacheck:jar:#{VERSION}"]
- end
-
-
+
# JUnit test framework, the default test framework for Java tests.
#
# Support the following options:
@@ -123,9 +123,6 @@
# JUnit.report.frames = false
class Report
- # Ant-Trax required for running the JUnitReport task.
- Java.classpath << "org.apache.ant:ant-trax:jar:#{Ant::VERSION}"
-
# Parameters passed to the Ant JUnitReport task.
attr_reader :params
# True (default) to produce a report using frames, false to produce a single-page report.
@@ -153,7 +150,7 @@
Buildr.ant('junit-report') do |ant|
ant.taskdef :name=>'junitreport', :classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
- :classpath=>Buildr.artifacts(JUnit::ANT_JUNIT).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+ :classpath=>Buildr.artifacts(JUnit.ant_taskdef).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
ant.junitreport :todir=>target do
projects.select { |project| project.test.framework == :junit }.
map { |project| project.test.report_to.to_s }.select { |path| File.exist?(path) }.
@@ -169,8 +166,12 @@
end
- class << self
+ # JUnit version number.
+ VERSION = '4.4' unless const_defined?('VERSION')
+ include TestFramework::JavaTest
+
+ class << self
# :call-seq:
# report()
#
@@ -182,16 +183,26 @@
@report ||= Report.new
end
- end
-
- # JUnit version number.
- VERSION = '4.4' unless const_defined?('VERSION')
-
- REQUIRES = ["junit:junit:jar:#{VERSION}"] + JMock::REQUIRES
- ANT_JUNIT = "org.apache.ant:ant-junit:jar:#{Ant::VERSION}" #:nodoc:
+ def version
+ Buildr.settings.build['junit'] || VERSION
+ end
+
+ def dependencies
+ @dependencies ||= ["junit:junit:jar:#{version}"]+ JMock.dependencies
+ end
+
+ def ant_taskdef #:nodoc:
+ "org.apache.ant:ant-junit:jar:#{Ant.version}"
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION"
+ dependencies
+ end
+ end
- include TestFramework::JavaTest
-
def tests(dependencies) #:nodoc:
filter_classes(dependencies,
:interfaces => %w{junit.framework.TestCase},
@@ -213,8 +224,11 @@
fail 'Option fork must be :once, :each or false.'
end
mkpath task.report_to.to_s
- ant.taskdef :name=>'junit', :classname=>'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask',
- :classpath=>Buildr.artifacts(ANT_JUNIT).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+
+ taskdef = Buildr.artifact(JUnit.ant_taskdef)
+ taskdef.invoke
+ ant.taskdef :name=>'junit', :classname=>'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask', :classpath=>taskdef.to_s
+
ant.junit forking.merge(:clonevm=>options[:clonevm] || false, :dir=>task.send(:project).path_to) do
ant.classpath :path=>dependencies.join(File::PATH_SEPARATOR)
(options[:properties] || []).each { |key, value| ant.sysproperty :key=>key, :value=>value }
@@ -266,13 +280,27 @@
# * :java_args -- Arguments passed to the JVM.
class TestNG < TestFramework::Base
- # TestNG version number.
VERSION = '5.7' unless const_defined?('VERSION')
- # TestNG specification.
- REQUIRES = ["org.testng:testng:jar:jdk15:#{VERSION}"] + JMock::REQUIRES
include TestFramework::JavaTest
+ class << self
+ def version
+ Buildr.settings.build['testng'] || VERSION
+ end
+
+ def dependencies
+ ["org.testng:testng:jar:jdk15:#{version}"]+ JMock.dependencies
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION"
+ dependencies
+ end
+ end
+
def tests(dependencies) #:nodoc:
filter_classes(dependencies,
:class_annotations => %w{org.testng.annotations.Test},
@@ -296,6 +324,56 @@
end
+
+ # Specs is available when using ScalaTest
+ module ScalaSpecs
+
+ VERSION = '1.2.9' unless const_defined?('VERSION')
+
+ class << self
+ def version
+ Buildr.settings.build['scala.specs'] || VERSION
+ end
+
+ def dependencies
+ ["org.specs:specs:jar:#{version}"]
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use ScalaSpecs.dependencies/.version instead of ScalaSpecs::REQUIRES/VERSION"
+ dependencies
+ end
+ end
+
+ end
+
+ # ScalaCheck is available when using ScalaTest
+ module ScalaCheck
+
+ VERSION = '1.3' unless const_defined?('VERSION')
+
+ class << self
+ def version
+ Buildr.settings.build['scala.check'] || VERSION
+ end
+
+ # ScalaTest dependencies.
+ def dependencies
+ ["org.scalacheck:scalacheck:jar:#{version}"]
+ end
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use ScalaCheck.dependencies/.version instead of ScalaCheck::REQUIRES/VERSION"
+ dependencies
+ end
+ end
+
+ end
+
# ScalaTest framework, the default test framework for Scala tests.
#
# Support the following options:
@@ -304,21 +382,31 @@
# * :java_args -- Arguments passed as is to the JVM.
class ScalaTest < TestFramework::Base
- # ScalaTest version number.
- VERSION = '0.9.3' unless const_defined?('VERSION')
- # ScalaTest dependencies
- REQUIRES = ["org.scalatest:scalatest:jar:#{VERSION}"] +
- JMock::REQUIRES +
- ScalaSpecs::REQUIRES +
- ScalaCheck::REQUIRES
+ include TestFramework::JavaTest
+ VERSION = '0.9.3' unless const_defined?('VERSION')
+
class << self
+ def version
+ Buildr.settings.build['scala.test'] || VERSION
+ end
+
+ def dependencies
+ ["org.scalatest:scalatest:jar:#{version}"] + ScalaSpecs.dependencies +
+ ScalaCheck.dependencies + JMock.dependencies
+ end
+
def applies_to?(project) #:nodoc:
project.test.compile.language == :scala
end
- end
-
- include TestFramework::JavaTest
+
+ private
+ def const_missing(const)
+ return super unless const == :REQUIRES # TODO: remove in 1.5
+ Buildr.application.deprecated "Please use ScalaTest.dependencies/.version instead of ScalaTest::REQUIRES/VERSION"
+ dependencies
+ end
+ end
# annotation-based group inclusion
attr_accessor :group_includes
@@ -340,14 +428,12 @@
end
def run(tests, dependencies) #:nodoc:
- self.class.dependencies.each(&:invoke)
mkpath task.report_to.to_s
success = []
scalatest = tests.select { |t| t !~ /Specs?$/ }
specs = tests.select { |t| t =~ /Specs?$/ }
# Specs
- #options = { :nostacktrace => false }.merge(options)
nostacktrace = (options[:nostacktrace]) ? "-ns" : ""
cmd_options = { :properties => options[:properties],
:java_args => options[:java_args],
@@ -355,7 +441,7 @@
specs.each do |spec|
Java.load
begin
- Java::Commands.java(spec, {:classpath => dependencies})
+ Java::Commands.java(spec, cmd_options)
rescue => e
print e.message
else
@@ -369,9 +455,10 @@
info "ScalaTest #{suite.inspect}"
# Use Ant to execute the ScalaTest task, gives us performance and reporting.
reportFile = File.join(task.report_to.to_s, "TEST-#{suite}.txt")
+ taskdef = Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
Buildr.ant('scalatest') do |ant|
ant.taskdef :name=>'scalatest', :classname=>'org.scalatest.tools.ScalaTestTask',
- :classpath=>self.class.dependencies.join(File::PATH_SEPARATOR)
+ :classpath=>taskdef.join(File::PATH_SEPARATOR)
ant.scalatest :runpath=>dependencies.join(File::PATH_SEPARATOR) do
ant.suite :classname=>suite
ant.reporter :type=>'stdout', :config=>reporter_options
@@ -416,10 +503,4 @@
Buildr::TestFramework << Buildr::JUnit
Buildr::TestFramework << Buildr::TestNG
-Buildr::TestFramework << Buildr::ScalaTest
-
-# Backward compatibility crap.
-Buildr::JUnit::JUNIT_REQUIRES = Buildr::JUnit::REQUIRES
-Buildr::TestNG::TestNG_REQUIRES = Buildr::TestNG::REQUIRES
-Java::JUnit = Buildr::JUnit
-Java::TestNG = Buildr::TestNG
+Buildr::TestFramework << Buildr::ScalaTest
\ No newline at end of file
Modified: incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb (original)
+++ incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb Mon Sep 22 10:27:59 2008
@@ -114,15 +114,15 @@
it 'should include JBehave dependencies' do
foo do
- test.compile.dependencies.should include(*artifacts(JBehave::REQUIRES))
- test.dependencies.should include(*artifacts(JBehave::REQUIRES))
+ test.compile.dependencies.should include(artifact("org.jbehave:jbehave:jar::#{JBehave.version}"))
+ test.dependencies.should include(artifact("org.jbehave:jbehave:jar::#{JBehave.version}"))
end
end
it 'should include JMock dependencies' do
foo do
- test.compile.dependencies.should include(*artifacts(JMock::REQUIRES))
- test.dependencies.should include(*artifacts(JMock::REQUIRES))
+ test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+ test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
end
end
Modified: incubator/buildr/trunk/spec/java_test_frameworks_spec.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_test_frameworks_spec.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/java_test_frameworks_spec.rb (original)
+++ incubator/buildr/trunk/spec/java_test_frameworks_spec.rb Mon Sep 22 10:27:59 2008
@@ -36,14 +36,14 @@
it 'should include JUnit dependencies' do
define('foo') { test.using(:junit) }
- project('foo').test.compile.dependencies.should include(*artifacts(JUnit::REQUIRES))
- project('foo').test.dependencies.should include(*artifacts(JUnit::REQUIRES))
+ project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
+ project('foo').test.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
end
-
+
it 'should include JMock dependencies' do
define('foo') { test.using(:junit) }
- project('foo').test.compile.dependencies.should include(*artifacts(JMock::REQUIRES))
- project('foo').test.dependencies.should include(*artifacts(JMock::REQUIRES))
+ project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+ project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
end
it 'should include public classes extending junit.framework.TestCase' do
@@ -341,14 +341,14 @@
it 'should include TestNG dependencies' do
define('foo') { test.using :testng }
- project('foo').test.compile.dependencies.should include(*artifacts(TestNG::REQUIRES))
- project('foo').test.dependencies.should include(*artifacts(TestNG::REQUIRES))
+ project('foo').test.compile.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
+ project('foo').test.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
end
it 'should include TestNG dependencies' do
define('foo') { test.using :testng }
- project('foo').test.compile.dependencies.should include(*artifacts(JMock::REQUIRES))
- project('foo').test.dependencies.should include(*artifacts(JMock::REQUIRES))
+ project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+ project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
end
it 'should include classes using TestNG annotations' do
Modified: incubator/buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/sandbox.rb?rev=697907&r1=697906&r2=697907&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/sandbox.rb (original)
+++ incubator/buildr/trunk/spec/sandbox.rb Mon Sep 22 10:27:59 2008
@@ -24,7 +24,7 @@
require 'buildr/java/groovyc'
Java.load # Anything added to the classpath.
task('buildr:scala:download').invoke
-artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit::ANT_JUNIT).each { |a| file(a).invoke }
+artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each { |a| file(a).invoke }
ENV['HOME'] = File.expand_path('tmp/home')