svn commit: r1433269 - in /buildr/trunk: CHANGELOG lib/buildr/java/tests.rb

[donaldp]

Author: donaldp
Date: Tue Jan 15 02:54:31 2013
New Revision: 1433269

URL: http://svn.apache.org/viewvc?rev=1433269&view=rev
Log:
BUILDR-612 - Support the TestNG 6.x versions and default to 6.8.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/java/tests.rb

Modified: buildr/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1433269&r1=1433268&r2=1433269&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Jan 15 02:54:31 2013
@@ -1,4 +1,6 @@
 1.4.10 (Pending)
+* Change: BUILDR-612 - Support the TestNG 6.x versions and default
+          to 6.8.
 * Added:  BUILDR-599 - Support the passing of arguments to testng
           test runner.
 * Fixed:  Observer the per-project source version when generating

Modified: buildr/trunk/lib/buildr/java/tests.rb
URL: 
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/tests.rb?rev=1433269&r1=1433268&r2=1433269&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/tests.rb (original)
+++ buildr/trunk/lib/buildr/java/tests.rb Tue Jan 15 02:54:31 2013
@@ -296,7 +296,7 @@ module Buildr
   # * :args -- Arguments passed to the TestNG command line runner.
   class TestNG < TestFramework::Java
 
-    VERSION = '5.10'
+    VERSION = '6.8'
 
     class << self
       def version
@@ -304,7 +304,8 @@ module Buildr
       end
 
       def dependencies
-        ["org.testng:testng:jar:jdk15:#{version}"]+ JMock.dependencies
+        return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies 
if version < "6.0"
+        ["org.testng:testng:jar:#{version}",'com.beust:jcommander:jar:1.27'] + 
JMock.dependencies
       end
 
     private
@@ -322,7 +323,10 @@ module Buildr
     end
 
     def run(tests, dependencies) #:nodoc:
-      cmd_args = ['-log', '2', '-sourcedir', task.compile.sources.join(';'), 
'-suitename', task.project.id ]
+      cmd_args = []
+      cmd_args << '-suitename' << task.project.id
+      cmd_args << '-sourcedir' << task.compile.sources.join(';') if 
TestNG.version < "6.0"
+      cmd_args << '-log' << '2'
       cmd_args << '-d' << task.report_to.to_s
       exclude_args = options[:excludegroups] || []
       if !exclude_args.empty?