Author: boisvert
Date: Mon Dec 28 22:56:15 2009
New Revision: 894267
URL: http://svn.apache.org/viewvc?rev=894267&view=rev
Log:
Dependencies already include compile target
Modified:
buildr/trunk/lib/buildr/scala/bdd.rb
Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=894267&r1=894266&r2=894267&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Mon Dec 28 22:56:15 2009
@@ -20,12 +20,12 @@
require 'buildr/scala/tests'
module Buildr::Scala
-
+
# Specs is a Scala based BDD framework.
# To use in your project:
#
# test.using :specs
- #
+ #
# This framework will search in your project for:
# src/spec/scala/**/*.scala
class Specs < Buildr::TestFramework::JavaBDD
@@ -33,16 +33,16 @@
@bdd_dir = :spec
VERSION = '1.6.0'
-
+
class << self
def version
Buildr.settings.build['scala.specs'] || VERSION
end
-
+
def dependencies
["org.scala-tools.testing:specs:jar:#{version}"] + Check.dependencies
+ JUnit.dependencies
end
-
+
def applies_to?(project) #:nodoc:
!Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')].empty?
end
@@ -57,28 +57,27 @@
def initialize(task, options) #:nodoc:
super
-
+
specs = task.project.path_to(:source, :spec, :scala)
task.compile.from specs if File.directory?(specs)
-
+
resources = task.project.path_to(:source, :spec, :resources)
task.resources.from resources if File.directory?(resources)
end
-
+
def tests(dependencies)
- dependencies += [task.compile.target.to_s]
candidates = filter_classes(dependencies, :interfaces =>
['org.specs.Specification'])
-
+
Java.load # Java is already loaded, but just in case
-
+
filter =
Java.org.apache.buildr.JavaTestFilter.new(dependencies.to_java(Java.java.lang.String))
filter.add_fields ['MODULE$'].to_java(Java.java.lang.String)
filter.filter(candidates.to_java(Java.java.lang.String)).map { |s|
s[0..(s.size - 2)] }
end
-
+
def run(specs, dependencies) #:nodoc:
dependencies += [task.compile.target.to_s,
File.join(File.dirname(__FILE__))] + Scalac.dependencies
-
+
cmd_options = { :properties => options[:properties],
:java_args => options[:java_args],
:classpath => dependencies,
