buildr 1.3.4 → 1.3.5

data/spec/java/bdd_spec.rb

@@ -60,6 +60,15 @@ 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 }
+  end
+
   def foo(*args, &prc)
     define('foo', *args) do
       test.using :jtestr, :output => false
@@ -261,6 +270,12 @@ describe Buildr::JtestR do
     end
   end
 
+  after do
+    # reset to default
+    Buildr.settings.build['junit'] = nil
+    Buildr::JUnit.instance_eval { @dependencies = nil }
+    Buildr::JtestR.instance_eval { @dependencies = nil }
+  end
 
 end if RUBY_PLATFORM =~ /java/ || ENV['JRUBY_HOME'] # JtestR
 

data/spec/java/cobertura_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'test_coverage_spec')
+require File.join(File.dirname(__FILE__), 'test_coverage_helper')
 Sandbox.require_optional_extension 'buildr/java/cobertura'
 artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
 
@@ -47,6 +47,12 @@ describe Buildr::Cobertura do
         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
@@ -73,5 +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/emma_spec.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-require File.join(File.dirname(__FILE__), 'test_coverage_spec')
+require File.join(File.dirname(__FILE__), 'test_coverage_helper')
 Sandbox.require_optional_extension 'buildr/java/emma'
 artifacts(Buildr::Emma::dependencies).map(&:invoke)
 

data/spec/java/java_spec.rb

@@ -89,6 +89,32 @@ describe Java, '#tools_jar' do
   end
 end
 
+describe Java, '#java' do
+  before do
+    @old_home = ENV['JAVA_HOME']
+  end
+  
+  describe 'when JAVA_HOME points to an invalid JRE/JDK installation' do
+    before do
+      write 'jdk'
+      ENV['JAVA_HOME'] = File.expand_path('jdk')
+    end
+  
+    it 'should fail with an error message mentioning JAVA_HOME' do
+      begin
+        Java.java ['-version']
+        fail 'Java.java did not fail with JAVA_HOME pointing to invalid JRE/JDK installation'
+      rescue => error
+        error.message.to_s.should match(/JAVA_HOME/)
+      end
+    end
+  end
+  
+  after do
+    ENV['JAVA_HOME'] = @old_home
+  end
+end
+
 
 describe Java::JavaWrapper do
   it 'should be removed in version 1.5 since it was deprecated in version 1.3' do

data/spec/java/packaging_spec.rb

@@ -97,7 +97,9 @@ shared_examples_for 'package with manifest' do
   end
 
   it 'should generate a new manifest for a file that does not have one' do
-    Zip::ZipFile.open("tmp.zip", Zip::ZipFile::CREATE).close 
+    Zip::ZipOutputStream.open 'tmp.zip' do |zip|
+      zip.put_next_entry 'empty.txt'
+    end
     begin
       manifest = Buildr::Packaging::Java::Manifest.from_zip('tmp.zip')
       manifest.each do |key, val|
@@ -339,7 +341,7 @@ describe 'package with meta_inf', :shared=>true do
     package.invoke
     assumed = Array(@meta_inf_ignore)
     Zip::ZipFile.open(package.to_s) do |zip|
-      entries = zip.entries.map(&:to_s).select { |f| File.dirname(f) == 'META-INF' }.map { |f| File.basename(f) }
+      entries = zip.entries.map(&:name).select { |f| File.dirname(f) == 'META-INF' }.map { |f| File.basename(f) }
       assumed.each { |f| entries.should include(f) }
       yield entries - assumed if block_given?
     end
@@ -657,7 +659,7 @@ describe Packaging, 'ear' do
         tmp.write ear.file.read(package)
       end
       manifest = Buildr::Packaging::Java::Manifest.from_zip('tmp.zip')
-      yield manifest.main['Class-Path'].to_s.split(' ')
+      yield manifest.main['Class-Path'].split(' ')
     end
   end
 
@@ -909,7 +911,7 @@ describe Packaging, 'ear' do
       package(:ear) << { :jar=>package(:jar) } << { :jar=>package(:jar, :id=>'bar') }
     end
     inspect_application_xml do |xml|
-      jars = xml.get_elements('/application/jar').map(&:texts).map(&:to_s)
+      jars = xml.get_elements('/application/jar').map(&:texts).map(&:join)
       jars.should include('jar/foo-1.0.jar', 'jar/bar-1.0.jar')
     end
   end
@@ -939,7 +941,7 @@ describe Packaging, 'ear' do
   it 'should update EJB component classpath to include libraries' do
     define 'foo', :version=>'1.0' do
       package(:ear) << package(:jar, :id=>'lib1') << package(:jar, :id=>'lib2')
-      package(:ear).add :ejb=>package(:jar)
+      package(:ear).add :ejb=>package(:jar, :id=>'foo')
     end
     inspect_classpath 'ejb/foo-1.0.jar' do |classpath|
       classpath.should include('../lib/lib1-1.0.jar', '../lib/lib2-1.0.jar')
@@ -949,7 +951,7 @@ describe Packaging, 'ear' do
   it 'should update JAR component classpath to include libraries' do
     define 'foo', :version=>'1.0' do
       package(:ear) << package(:jar, :id=>'lib1') << package(:jar, :id=>'lib2')
-      package(:ear).add :jar=>package(:jar)
+      package(:ear).add :jar=>package(:jar, :id=>'foo')
     end
     inspect_classpath 'jar/foo-1.0.jar' do |classpath|
       classpath.should include('../lib/lib1-1.0.jar', '../lib/lib2-1.0.jar')
@@ -959,7 +961,7 @@ describe Packaging, 'ear' do
   it 'should deal with very long classpaths' do
     define 'foo', :version=>'1.0' do
       20.times { |i| package(:ear) << package(:jar, :id=>"lib#{i}") }
-      package(:ear).add :jar=>package(:jar)
+      package(:ear).add :jar=>package(:jar, :id=>'foo')
     end
     inspect_classpath 'jar/foo-1.0.jar' do |classpath|
       classpath.should include('../lib/lib1-1.0.jar', '../lib/lib2-1.0.jar')

data/spec/java/{test_coverage_spec.rb → test_coverage_helper.rb}

@@ -166,8 +166,9 @@ describe 'test coverage tool', :shared=>true do
           'public class Foo { /* This comment is a TOKEN to check that test coverage reports include the source code */ }'
         define('foo')
         task("foo:#{toolname}:html").invoke
-        htlm_report_contents = Dir[File.join(test_coverage_config.report_dir, '**/*.html')].map{|path|File.open(path).read}.join
-        htlm_report_contents.should =~ /TOKEN/
+        html_report_contents = Dir[File.join(test_coverage_config.report_dir, '**/*.html')].map{|path|File.open(path).read}.join
+        html_report_contents.force_encoding('ascii-8bit') if RUBY_VERSION >= '1.9'
+        html_report_contents.should =~ /TOKEN/
       end
     end
   end
@@ -203,8 +204,9 @@ describe 'test coverage tool', :shared=>true do
           write 'bar/src/main/java/Bar.java',
             'public class Bar { /* This comment is a TOKEN to check that test coverage reports include the source code */ }'
           task("#{toolname}:html").invoke
-          htlm_report_contents = Dir[File.join(@tool_module.report_to(:html), '**/*.html')].map{|path|File.open(path).read}.join
-          htlm_report_contents.should =~ /TOKEN/
+          html_report_contents = Dir[File.join(@tool_module.report_to(:html), '**/*.html')].map{|path|File.read(path)}.join
+          html_report_contents.force_encoding('ascii-8bit') if RUBY_VERSION >= '1.9'
+          html_report_contents.should =~ /TOKEN/
         end
         
         it 'should handle gracefully a project with no source' do

data/spec/java/tests_spec.rb

@@ -216,6 +216,7 @@ describe Buildr::JUnit do
     JAVA
     define('foo').test.using :properties=>{ 'name'=>'value' }
     project('foo').test.invoke
+    project('foo').test.options[:properties]["baseDir"].should eql(project("foo").test.compile.target.to_s)
   end
 
   it 'should pass environment to JVM' do
@@ -439,6 +440,27 @@ describe Buildr::TestNG do
     lambda { project('foo').test.invoke }.should raise_error(RuntimeError, /Tests failed/)
   end
 
+  it 'should fail when multiple TestNG test case fail' do
+    write 'src/test/java/FailingTest1.java', <<-JAVA
+      public class FailingTest1 {
+        @org.testng.annotations.Test
+        public void testNothing() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    write 'src/test/java/FailingTest2.java', <<-JAVA
+      public class FailingTest2 {
+        @org.testng.annotations.Test
+        public void testNothing() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    define('foo') { test.using(:testng) }
+    lambda { project('foo').test.invoke }.should raise_error(RuntimeError, /Tests failed/)
+  end
+
   it 'should report failed test names' do
     write 'src/test/java/FailingTest.java', <<-JAVA
       public class FailingTest {

data/spec/packaging/archive_spec.rb

@@ -375,6 +375,20 @@ describe ZipTask do
     archive(@archive).invoke
     inspect_archive { |archive| archive.keys.should include('code/') }
   end
+
+  it 'should preserve file permissions' do
+    # with JRuby it's important to use absolute paths with File.chmod()
+    # http://jira.codehaus.org/browse/JRUBY-3300
+    hello = File.expand_path('src/main/bin/hello')
+    write hello, 'echo hi'
+    File.chmod(0777,  hello) || 
+    fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
+
+    zip('foo.zip').include('src/main/bin/*').invoke
+    unzip('target' => 'foo.zip').extract
+    (File.stat('target/hello').mode & 0777).should == 0777
+  end
+
 end
 
 

data/spec/packaging/artifact_spec.rb

@@ -231,7 +231,7 @@ describe Repositories, 'remote' do
   it 'should deal well with repositories URL that lack the last slash' do
     repositories.remote = 'http://example.com/base'
     uri = nil
-    URI.should_receive(:download).twice.and_return { |uri, target, options| }
+    URI.should_receive(:download).twice.and_return { |_uri, args| uri = _uri }
     artifact('group:id:jar:1.0').invoke
     uri.to_s.should eql('http://example.com/base/group/id/1.0/id-1.0.pom')
   end
@@ -239,7 +239,7 @@ describe Repositories, 'remote' do
   it 'should deal well with repositories URL that have the last slash' do
     repositories.remote = 'http://example.com/base/'
     uri = nil
-    URI.should_receive(:download).twice.and_return { |uri, target, options| }
+    URI.should_receive(:download).twice.and_return { |_uri, args| p args ; uri = _uri }
     artifact('group:id:jar:1.0').invoke
     uri.to_s.should eql('http://example.com/base/group/id/1.0/id-1.0.pom')
   end

data/spec/packaging/packaging_spec.rb

@@ -168,6 +168,62 @@ describe Project, '#package' do
     lambda { define('foo') { package(:weirdo) } }.should raise_error(RuntimeError, /Don't know how to create a package/)
   end
 
+  it 'should call package_as_foo when using package(:foo)' do
+    class Buildr::Project  
+      def package_as_foo(file_name)
+        file(file_name) do |t|
+          mkdir_p File.dirname(t.to_s)
+          File.open(t.to_s, 'w') {|f| f.write('foo') }
+        end
+      end
+    end
+    define('foo', :version => '1.0') do |project|
+      package(:foo).invoke
+      package(:foo).should exist
+      package(:foo).should contain('foo')
+    end
+  end
+
+  it 'should allow to respec package(:sources) using package_as_sources_spec()' do
+    class Buildr::Project  
+      def package_as_sources_spec(spec)
+        spec.merge({ :type=>:jar, :classifier=>'sources' })
+      end
+    end
+    define('foo', :version => '1.0') do
+      package(:sources).type.should eql(:jar)
+      package(:sources).classifier.should eql('sources')
+    end
+  end
+  
+  it 'should produce different packages for different specs' do
+    class Buildr::Project  
+      def package_as_foo(file_name)
+        file(file_name)  
+      end
+      
+      def package_as_foo_spec(spec)
+        spec.merge(:type => :zip)
+      end
+      
+      def package_as_bar(file_name)
+        file(file_name)
+      end
+      
+      def package_as_bar_spec(spec)
+        spec.merge(:type => :zip, :classifier => "foobar")
+      end
+      
+    end
+    define('foo', :version => '1.0') do
+      package(:foo).type.should eql(:zip)
+      package(:foo).classifier.should be_nil
+      package(:bar).type.should eql(:zip)
+      package(:bar).classifier.should eql('foobar')
+      package(:foo).equal?(package(:bar)).should be_false
+    end
+  end
+
   it 'should default to no classifier' do
     define 'foo', :version=>'1.0' do
       package.classifier.should be_nil
@@ -203,8 +259,17 @@ describe Project, '#package' do
       package(:war)
       package(:jar, :id=>'bar')
       package(:jar, :classifier=>'srcs')
+      package(:jar, :classifier=>'doc')
     end
-    project('foo').packages.uniq.size.should be(4)
+    project('foo').packages.uniq.size.should be(5)
+  end
+
+  it 'should create different tasks for package with classifier' do
+    define 'foo', :version=>'1.0' do
+      package(:jar)
+      package(:jar, :classifier=>'foo')
+    end
+    project('foo').packages.uniq.size.should be(2)
   end
 
   it 'should not create multiple packages for the same spec' do
@@ -213,8 +278,9 @@ describe Project, '#package' do
       package(:war)
       package(:jar, :id=>'bar')
       package(:jar, :id=>'bar')
+      package(:jar, :id=>'baz')
     end
-    project('foo').packages.uniq.size.should be(2)
+    project('foo').packages.uniq.size.should be(3)
   end
 
   it 'should return the same task for subsequent calls' do
@@ -299,6 +365,35 @@ POM
     lambda { task('artifacts').invoke }.should_not raise_error
   end
 
+  describe "existing package access" do
+    it "should return the same instance for identical optionless invocations" do
+      define 'foo', :version => '1.0' do
+        package(:zip).should equal(package(:zip))
+      end
+      project('foo').packages.size.should == 1
+    end
+
+    it "should return the exactly matching package identical invocations with options" do
+      define 'foo', :version => '1.0' do
+        package(:zip, :id => 'src')
+        package(:zip, :id => 'bin')
+      end
+      project('foo').package(:zip, :id => 'src').should equal(project('foo').packages.first)
+      project('foo').package(:zip, :id => 'bin').should equal(project('foo').packages.last)
+      project('foo').packages.size.should == 2
+    end
+
+    it "should return the first of the same type for subsequent optionless invocations" do
+      define 'foo', :version => '1.0' do
+        package(:zip, :file => 'override.zip')
+        package(:jar, :file => 'another.jar')
+      end
+      project('foo').package(:zip).name.should == 'override.zip'
+      project('foo').package(:jar).name.should == 'another.jar'
+      project('foo').packages.size.should == 2
+    end
+  end
+
 end
 
 

data/spec/sandbox.rb

@@ -29,8 +29,10 @@ Java.load # Anything added to the classpath.
 artifacts(TestFramework.frameworks.map(&:dependencies).flatten, JUnit.ant_taskdef).each do |path|
   file(path).invoke
 end
+# JtestR currently requires JUnit 4.4
+file(artifact("junit:junit:jar:4.4")).invoke
 
-ENV['HOME'] = File.expand_path('tmp/home')
+ENV['HOME'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'home'))
 
 # We need to run all tests inside a _sandbox, tacking a snapshot of Buildr before the test,
 # and restoring everything to its previous state after the test. Damn state changes.

data/spec/scala/bdd_spec.rb

@@ -15,6 +15,7 @@
 
 
 require File.join(File.dirname(__FILE__), '../spec_helpers')
+require 'buildr/scala'
 
 describe Buildr::Scala::Specs do
   it 'should be the default when tests in src/spec/scala' do
@@ -51,7 +52,7 @@ describe Buildr::Scala::Specs do
     project('foo').test.dependencies.should include(*artifacts(JMock.dependencies))
   end
 
-  it 'should include public classes extending org.specs.Specification' do
+  it 'should include public objects extending org.specs.Specification' do
     write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
       package com.example
       object MySpecs extends org.specs.Specification {
@@ -64,12 +65,13 @@ describe Buildr::Scala::Specs do
       }
     SCALA
     define('foo').test.invoke
-    project('foo').test.tests.should include('com.example.MySpecs')
+    project('foo').test.tests.should include('com.example.MySpecs$')
   end
 
-  it 'should pass when spec passes' do
-    write 'src/spec/scala/PassingSpecs.scala', <<-SCALA
-      object PassingSpecs extends org.specs.Specification {
+  it 'should include public objects extending org.specs.Specification even with companion classes' do
+    write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
+      package com.example
+      object MySpecs extends org.specs.Specification {
         "it" should {
           "add" in {
             val sum = 1 + 1
@@ -77,59 +79,27 @@ describe Buildr::Scala::Specs do
           }
         }
       }
+      class MySpecs extends org.specs.runner.JUnit4(MySpecs)
     SCALA
-    lambda { define('foo').test.invoke }.should_not raise_error
-  end
-
-  it 'should fail when ScalaTest test case fails' do
-    write 'src/spec/scala/FailingSpecs.scala', <<-SCALA
-      object FailingSpecs extends org.specs.Specification {
-        "it" should {
-          "add" in {
-            val sum = 1 + 1
-            sum mustEqual 42
-          }
-        }
-      }
-    SCALA
-    lambda { define('foo').test.invoke }.should raise_error(RuntimeError, /Tests failed/) rescue nil
+    define('foo').test.invoke
+    project('foo').test.tests.should include('com.example.MySpecs$')
   end
 
-  it 'should report failed test names' do
-    write 'src/spec/scala/FailingSpecs.scala', <<-SCALA
-      object FailingSpecs extends org.specs.Specification {
+  it 'should pass when spec passes' do
+    write 'src/spec/scala/PassingSpecs.scala', <<-SCALA
+      object PassingSpecs extends org.specs.Specification {
         "it" should {
           "add" in {
             val sum = 1 + 1
-            sum mustEqual 42
+            sum mustEqual 2
           }
         }
       }
     SCALA
-    define('foo').test.invoke rescue
-    project('foo').test.failed_tests.should include('FailingSpecs')
+    lambda { define('foo').test.invoke }.should_not raise_error
   end
   
-  it 'should compile and run specifications with "Specs" suffix' do
-    write 'src/spec/scala/HelloWorldSpecs.scala', <<-SCALA
-      import org.specs._
-  
-      object HelloWorldSpecs extends Specification {
-        "'hello world' has 11 characters" in {
-          "hello world".size must beEqualTo(11)
-        }
-        "'hello world' matches 'h.* w.*'" in {
-          "hello world" must beMatching("h.* w.*")
-        }
-      }
-    SCALA
-    define('foo')
-    project('foo').test.invoke
-    project('foo').test.passed_tests.should include('HelloWorldSpecs')
-  end
-
-
-  it 'should fail if specifications fail' do
+  it 'should fail when spec fails' do
     write 'src/spec/scala/StringSpecs.scala', <<-SCALA
       import org.specs._
       import org.specs.runner._
@@ -144,7 +114,6 @@ describe Buildr::Scala::Specs do
     SCALA
     define('foo')
     project('foo').test.invoke rescue
-    project('foo').test.failed_tests.should include('StringSpecs')
+    project('foo').test.failed_tests.should include('StringSpecs$')
   end
-
 end