buildr 1.4.6-x86-mswin32 → 1.4.7-x86-mswin32

data/spec/java/cobertura_spec.rb

@@ -15,6 +15,8 @@
 
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
+if ENV_JAVA['java.version'] < "1.7"
+
 Sandbox.require_optional_extension 'buildr/java/cobertura'
 artifacts(Buildr::Cobertura::dependencies).map(&:invoke)
 
@@ -110,3 +112,5 @@ JAVA
     end
   end
 end
+
+end

data/spec/java/compiler_spec.rb

@@ -68,15 +68,18 @@ describe 'javac compiler' do
     end
   end
 
-  it 'should include classpath dependencies' do
-    write 'src/dependency/Dependency.java', 'class Dependency {}'
-    define 'dependency', :version=>'1.0' do
-      compile.from('src/dependency').into('target/dependency')
-      package(:jar)
+  # Doesn't work under jdk1.5 - caused in one of the commits 1167678, 1170604, 1170605, 1180125
+  if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+    it 'should include classpath dependencies' do
+      write 'src/dependency/Dependency.java', 'class Dependency {}'
+      define 'dependency', :version=>'1.0' do
+        compile.from('src/dependency').into('target/dependency')
+        package(:jar)
+      end
+      write 'src/test/DependencyTest.java', 'class DependencyTest { Dependency _var; }'
+      define('foo').compile.from('src/test').with(project('dependency')).invoke
+      file('target/classes/DependencyTest.class').should exist
     end
-    write 'src/test/DependencyTest.java', 'class DependencyTest { Dependency _var; }'
-    define('foo').compile.from('src/test').with(project('dependency')).invoke
-    file('target/classes/DependencyTest.class').should exist
   end
 
   it 'should include tools.jar dependency' do

data/spec/java/emma_spec.rb

@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_coverage_helper'))
+if ENV_JAVA['java.version'] < "1.7"
+
 Sandbox.require_optional_extension 'buildr/java/emma'
 artifacts(Buildr::Emma::dependencies).map(&:invoke)
 
@@ -119,3 +120,5 @@ describe Buildr::Emma do
     end
   end
 end
+
+end

data/spec/java/java_spec.rb

@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
     before do
       @old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
       @old_env_java = Object.module_eval { remove_const :ENV_JAVA }
-      Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+      RbConfig::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
     end
 
     it 'should point to default JVM' do

data/spec/java/pom_spec.rb

@@ -0,0 +1,125 @@
+# 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.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+require 'fileutils'
+
+describe Buildr::POM do
+  before do
+    repositories.remote = 'http://example.com'
+    @app = 'group:pomapp:jar:1.0'
+    write artifact(@app).pom.to_s, <<-XML
+<project>
+  <artifactId>pomapp</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>library</artifactId>
+      <groupId>org.example</groupId>
+      <version>1.1</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
+XML
+    @library = 'org.example:library:jar:1.1'
+    write artifact(@library).pom.to_s, <<-XML
+<project>
+  <artifactId>pomapp</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>mail</artifactId>
+      <groupId>javax.mail</groupId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <artifactId>foo</artifactId>
+      <groupId>org.example</groupId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>
+XML
+  end
+
+  it 'should respect exclusions when computing transitive dependencies' do
+    pom = POM.load(artifact(@app).pom)
+    specs = [ 'org.example:library:jar:1.1', 'org.example:foo:jar:2.0' ]
+    pom.dependencies.should eql(specs)
+  end
+end
+
+describe Buildr::POM do
+  before do
+    repositories.remote = 'http://example.com'
+    @app = 'group:app:jar:1.0'
+    write artifact(@app).pom.to_s, <<-XML
+<project>
+  <properties>
+    <a.version>${b.version}</a.version>
+    <b.version>1.1</b.version>
+  </properties>
+  <artifactId>app</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>library</artifactId>
+      <groupId>org.example</groupId>
+      <version>${a.version}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
+XML
+    @library = 'org.example:library:jar:1.1'
+    write artifact(@library).pom.to_s, <<-XML
+<project>
+  <artifactId>app</artifactId>
+  <groupId>group</groupId>
+  <dependencies>
+    <dependency>
+      <artifactId>mail</artifactId>
+      <groupId>javax.mail</groupId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <artifactId>foo</artifactId>
+      <groupId>org.example</groupId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>
+XML
+  end
+
+  it 'should respect exclusions when computing transitive dependencies when the pom includes properties' do
+    pom = POM.load(artifact(@app).pom)
+    specs = {"a.version"=>"1.1", "b.version"=>"1.1", "project.groupId"=>"group", "pom.groupId"=>"group", "groupId"=>"group", "project.artifactId"=>"app", "pom.artifactId"=>"app", "artifactId"=>"app"}
+    pom.properties.should eql(specs)
+  end
+end

data/spec/java/tests_spec.rb

@@ -494,4 +494,189 @@ describe Buildr::TestNG do
     define('foo') { test.using(:testng) }
     lambda { project('foo').test.invoke }.should change { File.exist?('reports/testng/foo/index.html') }.to(true)
   end
+
+  it 'should include classes using TestNG annotations marked with a specific group' do
+    write 'src/test/java/com/example/AnnotatedClass.java', <<-JAVA
+      package com.example;
+      @org.testng.annotations.Test(groups={"included"})
+      public class AnnotatedClass { }
+    JAVA
+    write 'src/test/java/com/example/AnnotatedMethod.java', <<-JAVA
+      package com.example;
+      public class AnnotatedMethod {
+        @org.testng.annotations.Test
+        public void annotated() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    define('foo').test.using :testng, :groups=>['included']
+    lambda { project('foo').test.invoke }.should_not raise_error
+  end
+
+  it 'should exclude classes using TestNG annotations marked with a specific group' do
+    write 'src/test/java/com/example/AnnotatedClass.java', <<-JAVA
+      package com.example;
+      @org.testng.annotations.Test(groups={"excluded"})
+      public class AnnotatedClass {
+        public void annotated() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    write 'src/test/java/com/example/AnnotatedMethod.java', <<-JAVA
+      package com.example;
+      public class AnnotatedMethod {
+        @org.testng.annotations.Test(groups={"included"})
+        public void annotated() {}
+      }
+    JAVA
+    define('foo').test.using :testng, :excludegroups=>['excluded']
+    lambda { project('foo').test.invoke }.should_not raise_error
+  end
+end
+
+describe Buildr::MultiTest do
+  it 'should be selectable in project' do
+    define 'foo' do
+      test.using(:multitest, :frameworks => [])
+      test.framework.should eql(:multitest)
+    end
+  end
+
+  it 'should include dependencies of whichever test framework(s) are selected' do
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
+    project('foo').test.compile.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
+    project('foo').test.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
+    project('foo').test.dependencies.should include(artifact("org.testng:testng:jar:jdk15:#{TestNG.version}"))
+  end
+
+  it 'should include classes of given test framework(s)' do
+    write 'src/test/java/com/example/JUnitTest.java', <<-JAVA
+      package com.example;
+      public class JUnitTest extends junit.framework.TestCase {
+        public void testNothing() { }
+      }
+    JAVA
+    write 'src/test/java/com/example/TestNGTest.java', <<-JAVA
+      package com.example;
+      @org.testng.annotations.Test
+      public class TestNGTest { }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    project('foo').test.invoke
+    project('foo').test.tests.should include('com.example.JUnitTest', 'com.example.TestNGTest')
+  end
+
+  it 'should pass when test case passes' do
+    write 'src/test/java/PassingTest.java', <<-JAVA
+      public class PassingTest extends junit.framework.TestCase {
+        public void testNothing() {}
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    lambda { project('foo').test.invoke }.should_not raise_error
+  end
+
+  it 'should fail when test case fails' do
+    write 'src/test/java/FailingTest.java', <<-JAVA
+      public class FailingTest {
+        @org.testng.annotations.Test
+        public void testNothing() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    lambda { project('foo').test.invoke }.should raise_error(RuntimeError, /Tests failed/)
+  end
+
+  it 'should fail when multiple 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 :multitest, :frameworks => [ Buildr::JUnit, Buildr::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 {
+        @org.testng.annotations.Test
+        public void testNothing() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    project('foo').test.invoke rescue nil
+    project('foo').test.failed_tests.should include('FailingTest')
+  end
+
+  it 'should generate reports' do
+    write 'src/test/java/PassingTest.java', <<-JAVA
+      public class PassingTest {
+        @org.testng.annotations.Test
+        public void testNothing() {}
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ] }
+    lambda { project('foo').test.invoke }.should change {
+      p Dir['./**/*'].inspect
+    File.exist?('reports/multitest/foo/index.html') }.to(true)
+  end
+
+  it 'should include classes using TestNG annotations marked with a specific group' do
+    write 'src/test/java/com/example/AnnotatedClass.java', <<-JAVA
+      package com.example;
+      @org.testng.annotations.Test(groups={"included"})
+      public class AnnotatedClass { }
+    JAVA
+    write 'src/test/java/com/example/AnnotatedMethod.java', <<-JAVA
+      package com.example;
+      public class AnnotatedMethod {
+        @org.testng.annotations.Test
+        public void annotated() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :groups=>['included'] }
+    lambda { project('foo').test.invoke }.should_not raise_error
+  end
+
+  it 'should exclude classes using TestNG annotations marked with a specific group' do
+    write 'src/test/java/com/example/AnnotatedClass.java', <<-JAVA
+      package com.example;
+      @org.testng.annotations.Test(groups={"excluded"})
+      public class AnnotatedClass {
+        public void annotated() {
+          org.testng.AssertJUnit.assertTrue(false);
+        }
+      }
+    JAVA
+    write 'src/test/java/com/example/AnnotatedMethod.java', <<-JAVA
+      package com.example;
+      public class AnnotatedMethod {
+        @org.testng.annotations.Test(groups={"included"})
+        public void annotated() {}
+      }
+    JAVA
+    define('foo') { test.using :multitest, :frameworks => [ Buildr::JUnit, Buildr::TestNG ], :excludegroups=>['excluded'] }
+    lambda { project('foo').test.invoke }.should_not raise_error
+  end
 end

data/spec/packaging/archive_spec.rb

@@ -474,7 +474,7 @@ describe "ZipTask" do
     Zip::ZipFile.open @archive do |zip|
       zip.entries.each do |entry|
         # Ignore the / directory created for empty ZIPs when using java.util.zip.
-        entries[entry.to_s] = zip.read(entry) unless entry.to_s == '/'
+        entries[entry.name.to_s] = zip.read(entry.name) unless entry.name.to_s == '/'
       end
     end
     yield entries if block_given?

data/spec/packaging/artifact_namespace_spec.rb

@@ -162,6 +162,21 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
+    it 'should accept an artifact spec with classifier' do
+      define 'one' do
+        artifact_ns.need 'a:b:c:d:1'
+        # referenced by spec
+        artifact_ns['a:b:c:d:'].should_not be_selected
+
+        # referenced by name
+        artifact_ns[:b].should_not be_selected
+        artifact_ns[:b].should be_satisfied_by('a:b:c:d:1')
+        artifact_ns[:b].should_not be_satisfied_by('a:b:c:d:2')
+        artifact_ns[:b].should_not be_satisfied_by('d:b:c:d:1')
+        artifact_ns[:b].version.should == '1'
+      end
+    end
+
     it 'should accept a requirement_spec' do
       define 'one' do
         artifact_ns.need 'thing -> a:b:c:2.1 -> ~>2.0'

data/spec/packaging/artifact_spec.rb

@@ -100,7 +100,7 @@ describe Artifact do
 
   it 'should handle lack of POM gracefully' do
     repositories.remote = 'http://example.com'
-    URI.should_receive(:download).twice { |uri, target, options| raise URI::NotFoundError if uri.to_s.ends_with('.pom') }
+    URI.should_receive(:download).twice { |*args| raise URI::NotFoundError if args[0].to_s.end_with?('.pom') }
     lambda { @artifact.invoke }.should_not raise_error
   end
 
@@ -690,6 +690,14 @@ describe Buildr, '#artifacts' do
     artifacts('c:test').first.should be_kind_of(String)
   end
 
+  it 'should accept any object responding to :to_spec' do
+    obj = Object.new
+    class << obj
+      def to_spec; "org.example:artifact:jar:1.1"; end
+    end
+    artifacts(obj).size.should be(1)
+  end
+
   it 'should accept project and return all its packaging tasks' do
     define 'foobar', :group=>'group', :version=>'1.0' do
       package :jar, :id=>'code'
@@ -1032,6 +1040,13 @@ describe Buildr, '#transitive' do
       <version>8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <artifactId>jlib-optional</artifactId>
+      <groupId>jlib</groupId>
+      <version>1.4</version>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>
 XML
@@ -1110,6 +1125,16 @@ XML
   it 'should bring artifact and transitive depenencies' do
     transitive(@transitive).should eql(artifacts(@transitive, @complex, @simple - [@provided]))
   end
+
+  it 'should filter dependencies based on :scopes argument' do
+    specs = [@complex, 'saxon:saxon-dom:jar:8.4']
+    transitive(@complex, :scopes => [:runtime]).should eql(specs.map { |spec| artifact(spec) })
+  end
+
+  it 'should filter dependencies based on :optional argument' do
+    specs = [@complex, 'saxon:saxon-dom:jar:8.4', 'jlib:jlib-optional:jar:1.4']
+    transitive(@complex, :scopes => [:runtime], :optional => true).should eql(specs.map { |spec| artifact(spec) })
+  end
 end
 
 def modified?(old_mtime, spec)