buildr 1.3.5 → 1.4.0

data/spec/scala/tests_spec.rb

@@ -15,7 +15,6 @@
 
 
 require File.join(File.dirname(__FILE__), '../spec_helpers')
-require 'buildr/scala'
 
 # TODO's
 #  -test passing System props
@@ -26,6 +25,12 @@ require 'buildr/scala'
 
 
 describe Buildr::Scala::ScalaTest do
+  
+  before(:each) do
+    # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+    Buildr.settings.build['scala.version'] = "2.7.7"
+  end
+    
   it 'should be the default test framework when test cases are in Scala' do
     write 'src/test/scala/com/example/MySuite.scala', <<-SCALA
       package com.example
@@ -113,7 +118,7 @@ describe Buildr::Scala::ScalaTest do
           val sum = 1 + 1
           assert(sum === 2)
         }
-        
+
         class InnerSuite extends FunSuite {
           test("addition") {
             val sum = 1 + 1
@@ -161,6 +166,21 @@ describe Buildr::Scala::ScalaTest do
     project('foo').test.failed_tests.should include('FailingSuite')
   end
 
+  it 'should report to reports/scalatest/TEST-TestSuiteName.xml' do
+    write 'src/test/scala/PassingSuite.scala', <<-SCALA
+      class PassingSuite extends org.scalatest.FunSuite {
+        test("passing") {
+          assert(true)
+        }
+      }
+    SCALA
+    define 'foo' do
+      test.report_to.should be(file('reports/scalatest'))
+    end
+    project('foo').test.invoke
+    project('foo').file('reports/scalatest/TEST-PassingSuite.xml').should exist
+  end
+
   it 'should report to reports/scalatest/TEST-TestSuiteName.txt' do
     write 'src/test/scala/PassingSuite.scala', <<-SCALA
       class PassingSuite extends org.scalatest.FunSuite {
@@ -180,15 +200,16 @@ describe Buildr::Scala::ScalaTest do
     write 'src/test/scala/PropertyTestSuite.scala', <<-SCALA
       import org.scalatest._
       class PropertyTestSuite extends FunSuite {
-        var properties = Map[String, Any]()
+        var configMap = Map[String, Any]()
         test("testProperty") {
-          assert(properties("name") === "value")
+          assert(configMap("name") === "value")
         }
-        
+
         protected override def runTests(testName: Option[String], reporter: Reporter, stopper: Stopper,
-                                        includes: Set[String], excludes: Set[String], properties: Map[String, Any]) {
-          this.properties = properties;                              
-          super.runTests(testName, reporter, stopper, includes, excludes, properties)
+                                        filter: Filter, configMap: Map[String, Any],
+                                        distributor: Option[Distributor], tracker: Tracker) {
+          this.configMap = configMap
+          super.runTests(testName, reporter, stopper, filter, configMap, distributor, tracker)
         }
       }
     SCALA
@@ -198,54 +219,55 @@ describe Buildr::Scala::ScalaTest do
 
   it 'should run with ScalaCheck automatic test case generation' do
     write 'src/test/scala/MySuite.scala', <<-SCALA
-      import org.scalatest.prop.PropSuite
+      import org.scalatest.FunSuite
+      import org.scalatest.prop.Checkers
       import org.scalacheck.Arbitrary._
       import org.scalacheck.Prop._
-      
-      class MySuite extends PropSuite {
-      
+
+      class MySuite extends FunSuite with Checkers {
+
         test("list concatenation") {
           val x = List(1, 2, 3)
           val y = List(4, 5, 6)
           assert(x ::: y === List(1, 2, 3, 4, 5, 6))
           check((a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size)
         }
-      
-        test(
-          "list concatenation using a test method",
-          (a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size
-        )
+
+        test("list concatenation using a test method") {
+          check((a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size)
+        }
       }
     SCALA
     define('foo')
     project('foo').test.invoke
     project('foo').test.passed_tests.should include('MySuite')
   end
-  
+
   it 'should fail if ScalaCheck test case fails' do
     write 'src/test/scala/StringSuite.scala', <<-SCALA
-      import org.scalatest.prop.PropSuite
+      import org.scalatest.FunSuite
+      import org.scalatest.prop.Checkers
       import org.scalacheck.Arbitrary._
       import org.scalacheck.Prop._
 
-      class StringSuite extends PropSuite {
+      class StringSuite extends FunSuite with Checkers {
         test("startsWith") {
           check( (a: String, b: String) => (a+b).startsWith(a) )
         }
-      
+
         test("endsWith") {
           check( (a: String, b: String) => (a+b).endsWith(b) )
         }
-      
+
         // Is this really always true?
         test("concat") {
           check( (a: String, b: String) => (a+b).length > a.length && (a+b).length > b.length )
         }
-      
+
         test("substring2") {
           check( (a: String, b: String) => (a+b).substring(a.length) == b )
         }
-      
+
         test("substring3") {
           check( (a: String, b: String, c: String) =>
                    (a+b+c).substring(a.length, a.length+b.length) == b )

data/spec/spec_helpers.rb

@@ -22,8 +22,9 @@ unless defined?(SpecHelpers)
 
   # For testing we use the gem requirements specified on the buildr.gemspec
   spec = Gem::Specification.load(File.expand_path('../buildr.gemspec', File.dirname(__FILE__)))
-  spec.dependencies.each { |dep| gem dep.name, dep.version_requirements.to_s }
-
+  # Dependency.version_requirements deprecated in rubygems 1.3.6
+  spec.dependencies.each { |dep| gem dep.name, (dep.respond_to?(:requirement) ? dep.requirement.to_s : dep.version_requirements.to_s) }
+  
   # Make sure to load from these paths first, we don't want to load any
   # code from Gem library.
   $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)),
@@ -40,7 +41,7 @@ unless defined?(SpecHelpers)
 
   # Give a chance for plugins to do a few things before requiring the sandbox.
   include SandboxHook if defined?(SandboxHook)
-  
+
   require File.expand_path('sandbox', File.dirname(__FILE__))
 
   module SpecHelpers
@@ -56,7 +57,7 @@ unless defined?(SpecHelpers)
         end
       end
     end
-    
+
     class << Buildr.application
       alias :deprecated_without_capture :deprecated
       def deprecated(message)
@@ -118,6 +119,23 @@ unless defined?(SpecHelpers)
       MessageWithSeverityMatcher.new :puts, message
     end
 
+    # Yields a block that should try exiting the application.
+    # Accepts
+    #
+    # For example:
+    #   test_exit(1) {  puts "Hello" ; exit(1) }.should show("Hello")
+    #
+    def test_exit(status = nil)
+      return lambda {
+        begin
+          yield
+          raise "Exit was not called!"
+        rescue SystemExit => e
+          raise "Exit status incorrect! Expected: #{status}, got #{e.status}" if status && (e.status != status)
+        end
+      }
+    end
+
     class ::Rake::Task
       alias :execute_without_a_record :execute
       def execute(args)
@@ -151,7 +169,7 @@ unless defined?(SpecHelpers)
           "Expected the tasks #{expected} to not run, but they all ran."
         else
           "Expected the tasks #{expected} to not run, and all but #{remaining} ran."
-        end 
+        end
       end
 
       def but_not(*tasks)
@@ -226,7 +244,7 @@ unless defined?(SpecHelpers)
         "URI with path matching #{@expression}"
       end
     end
-    
+
     # Matches a parsed URI's path against the given regular expression
     def uri(re)
       UriPathMatcher.new(re)
@@ -256,16 +274,16 @@ unless defined?(SpecHelpers)
       AbsolutePathMatcher.new(path)
     end
 
-    
+
     # Value covered by range. For example:
     #   (1..5).should cover(3)
     def cover(value)
       simple_matcher :cover do |given|
-        value >= given.min && value <= given.max 
+        value >= given.min && value <= given.max
       end
     end
 
-  
+
     def suppress_stdout
       stdout = $stdout
       $stdout = StringIO.new
@@ -308,7 +326,7 @@ unless defined?(SpecHelpers)
         yield
       ensure
         Buildr.application.instance_eval { @original_dir = original_dir }
-      end 
+      end
     end
 
 

data/spec/version_requirement_spec.rb

@@ -20,8 +20,8 @@ describe Buildr::VersionRequirement, '.create' do
   def create(str)
     Buildr::VersionRequirement.create(str)
   end
-  
-  it 'should complain on invalid input' do 
+
+  it 'should complain on invalid input' do
     lambda { create }.should raise_error(Exception)
     lambda { create('%') }.should raise_error(Exception, /invalid character/)
     lambda { create('1#{0}') }.should raise_error(Exception, /invalid character/)
@@ -30,16 +30,16 @@ describe Buildr::VersionRequirement, '.create' do
     lambda { create('1.0') }.should_not raise_error(Exception)
     lambda { create('1.0rc3') }.should_not raise_error(Exception)
   end
-  
+
   it 'should allow versions using hyphen' do
     lambda { create('1.0-rc3') }.should_not raise_error(Exception)
   end
 
-  it 'should create a single version requirement' do 
+  it 'should create a single version requirement' do
     create('1.0').should_not be_composed
   end
 
-  it 'should create a composed version requirement' do 
+  it 'should create a composed version requirement' do
     create('1.0 | 2.1').should be_composed
   end
 end
@@ -61,13 +61,13 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
     should_satisfy '=1.0', %w(1 1.0), %w(1.1 0.1)
     should_satisfy '= 1.0', %w(1 1.0), %w(1.1 0.1)
     should_satisfy '!= 1.0', %w(0.9 1.1 2), %w(1 1.0 1.0.0)
-    
+
     should_satisfy '>1.0', %w(1.0.1), %w(1 1.0 0.1)
     should_satisfy '>=1.0', %w(1.0.1 1 1.0), %w(0.9)
 
     should_satisfy '<1.0', %w(0.9 0.9.9), %w(1 1.0 1.1 2)
     should_satisfy '<=1.0', %w(0.9 0.9.9 1 1.0), %w(1.1 2)
-    
+
     should_satisfy '~> 1.2.3', %w(1.2.3 1.2.3.4 1.2.4), %w(1.2.1 0.9 1.4 2)
   end
 
@@ -91,7 +91,7 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
   it 'should assume logic and if missing operator between expressions' do
     should_satisfy '>1.5 <2.0', %w(1.6 1.9), %w(1.5 2 2.0)
   end
-  
+
   it 'should allow combining logic operators' do
     should_satisfy '>1.0 | <2.0 | =3.0', %w(1.5 3.0 1 2 4)
     should_satisfy '>1.0 & <2.0 | =3.0', %w(1.3 3.0), %w(1 2)
@@ -99,7 +99,7 @@ describe Buildr::VersionRequirement, '#satisfied_by?' do
     should_satisfy '~>1.1 | ~>1.3 | ~>1.5 | 2.0', %w(2 1.5.6 1.1.2 1.1.3), %w(1.0.9 0.5 2.2.1)
     should_satisfy 'not(2) | 1', %w(1 3), %w(2)
   end
-  
+
   it 'should allow using parens to group logic expressions' do
     should_satisfy '(1.0)', %w(1 1.0), %w(0.9 1.1)
     should_satisfy '!( !(1.0) )', %w(1 1.0), %w(0.9 1.1)
@@ -110,13 +110,13 @@ end
 =end
 
 describe Buildr::VersionRequirement, '#default' do
-  it 'should return nil if missing default requirement' do 
+  it 'should return nil if missing default requirement' do
     Buildr::VersionRequirement.create('>1').default.should be_nil
     Buildr::VersionRequirement.create('<1').default.should be_nil
     Buildr::VersionRequirement.create('!1').default.should be_nil
     Buildr::VersionRequirement.create('!<=1').default.should be_nil
   end
-  
+
   it 'should return the last version with a = requirement' do
     Buildr::VersionRequirement.create('1').default.should == '1'
     Buildr::VersionRequirement.create('=1').default.should == '1'
@@ -127,3 +127,17 @@ describe Buildr::VersionRequirement, '#default' do
     Buildr::VersionRequirement.create('1 & 2 | 3').default.should == '3'
   end
 end
+
+describe Buildr::VersionRequirement, '#version?' do
+  it 'should identify valid versions' do
+    Buildr::VersionRequirement.version?('1').should be_true
+    Buildr::VersionRequirement.version?('1a').should be_true
+    Buildr::VersionRequirement.version?('1.0').should be_true
+    Buildr::VersionRequirement.version?('11.0').should be_true
+    Buildr::VersionRequirement.version?(' 11.0 ').should be_true
+    Buildr::VersionRequirement.version?('11.0-alpha').should be_true
+
+    Buildr::VersionRequirement.version?('a').should be_false
+    Buildr::VersionRequirement.version?('a1').should be_false
+  end
+end