ruboto 1.2.0 → 1.3.0

data/test/broadcast_receiver_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'fileutils'
 
-class BroadcastReceiverTest < Test::Unit::TestCase
+class BroadcastReceiverTest < Minitest::Test
   SRC_DIR ="#{APP_DIR}/src"
 
   def setup

data/test/gem_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 
-class GemTest < Test::Unit::TestCase
+class GemTest < Minitest::Test
   def test_rake_gem
     gem_file = "ruboto-#{Ruboto::VERSION}.gem"
     File.delete(gem_file) if File.exists?(gem_file)

data/test/git_based_gem_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'bigdecimal'
 require 'test/app_test_methods'
 
-class GitBasedGemTest < Test::Unit::TestCase
+class GitBasedGemTest < Minitest::Test
   def setup
     generate_app
     Dir.chdir APP_DIR do

data/test/minimal_app_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
   require 'bigdecimal'
 
-  class MinimalAppTest < Test::Unit::TestCase
+  class MinimalAppTest < Minitest::Test
     def setup
       generate_app :included_stdlibs => []
     end
@@ -20,7 +20,8 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     # APK was 8.4MB.  JRuby: 1.7.8,  ANDROID_TARGET: 10
     # APK was 4.3MB.  JRuby: 1.7.8,  ANDROID_TARGET: 16
     # APK was 4.4MB.  JRuby: 1.7.12, ANDROID_TARGET: 19
-    # APK was 4.4MB.  JRuby: 1.7.14.SNAPSHOT, ANDROID_TARGET: 19
+    # APK was 4.4MB.  JRuby: 1.7.14, ANDROID_TARGET: 19
+    # APK was 4.6MB.  JRuby: 1.7.20.dev, ANDROID_TARGET: 19
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
     # APK was 4.6MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
@@ -33,9 +34,10 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.7.10' => 4.4,
           '1.7.11' => 4.4,
           '1.7.12' => 4.4,
-          '1.7.14.dev' => 4.4,
-          '9000.dev' => 4.6,
-      }[JRUBY_JARS_VERSION.to_s] || 4.4
+          '1.7.14' => 4.4,
+          '1.7.20.dev' => 4.6,
+          '9.0.0.0.dev' => 4.6,
+      }[JRUBY_JARS_VERSION.to_s] || 4.6
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
       assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"

data/test/rake_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
-class RakeTest < Test::Unit::TestCase
+class RakeTest < Minitest::Test
   def setup
     generate_app
   end
@@ -41,7 +41,7 @@ class RakeTest < Test::Unit::TestCase
       FileUtils.touch 'src/ruboto_test_app_activity.rb'
       sleep 1
       system 'rake debug'
-      assert_not_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"),
+      assert apk_timestamp != File.mtime("bin/#{APP_NAME}-debug.apk"),
           'APK should have been rebuilt'
     end
   end
@@ -51,7 +51,7 @@ class RakeTest < Test::Unit::TestCase
       apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
       FileUtils.touch 'src/not_ruby_source.properties'
       system 'rake debug'
-      assert_not_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"),
+      assert apk_timestamp != File.mtime("bin/#{APP_NAME}-debug.apk"),
           'APK should have been rebuilt'
     end
   end

data/test/ruboto_activity_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
-class RubotoActivityTest < Test::Unit::TestCase
+class RubotoActivityTest < Minitest::Test
   def setup
     generate_app
   end

data/test/ruboto_gen_test.rb

@@ -2,11 +2,11 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'bigdecimal'
 require 'test/app_test_methods'
 
-class RubotoGenTest < Test::Unit::TestCase
+class RubotoGenTest < Minitest::Test
   include AppTestMethods
 
   def setup
-    generate_app
+    generate_app heap_alloc: 50
   end
 
   def teardown
@@ -53,6 +53,7 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was    66.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
   # APK was    74.9KB.  PLATFORM: CURRENT, ANDROID_TARGET: 16
   # APK was    80.4KB.  PLATFORM: CURRENT, ANDROID_TARGET: 19
+  # APK was    75.1KB.  PLATFORM: CURRENT, ANDROID_TARGET: 22
   # APK was    65.0KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 10
   # APK was    81.0KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 16
   # APK was    80.2KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 17
@@ -69,11 +70,18 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was  8793.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.11
   # APK was  9743.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.12
   # APK was  9123.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.12
-  # APK was  9745.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.14.dev
+  # APK was  9745.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.14
+  # APK was  9985.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.17
+  # APK was 10052.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 1.7.18
+  # APK was 10045.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.18
+  # APK was 10109.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 21, JRuby: 1.7.19
+  # APK was 11010.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.20.dev
   # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
   # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
   # APK was  8015.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 9000.dev
   # APK was  8232.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 9000.dev
+  # APK was  7126.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 9.0.0.0.pre1
+  # APK was  8571.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 21, JRuby: 9.0.0.0.pre1
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -88,8 +96,13 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.10' => 8800.0,
           '1.7.11' => 8800.0,
           '1.7.12' => 9800.0,
-          '1.7.14.dev' => 9800.0,
-          '9000.dev' => 8300.0,
+          '1.7.14' => 9800.0,
+          '1.7.17' => 9999.0,
+          '1.7.18' => 10100.0,
+          '1.7.19' => 10200.0,
+          '1.7.20.dev' => 11111.0,
+          '9.0.0.0.dev' => 8300.0,
+          '9.0.0.0.pre1' => 8600.0,
       }[JRUBY_JARS_VERSION.to_s] || 9800.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
@@ -99,7 +112,8 @@ class RubotoGenTest < Test::Unit::TestCase
           16 => 82.0,
           17 => 81.0,
           19 => 81.0,
-      }[ANDROID_TARGET] || 75.0
+          22 => 76.0,
+      }[ANDROID_TARGET] || 76.0
     end
     lower_limit = upper_limit * 0.8
     assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"
@@ -127,13 +141,13 @@ class RubotoGenTest < Test::Unit::TestCase
 
       # FIXME(uwe):  Workaround for Ruboto Issue #246
       java_source = File.read(java_source_file)
-      File.open(java_source_file, 'w'){|f| f << java_source.gsub(/^(public class .*ArrayAdapter) (.*ArrayAdapter)/, '\1<T> \2<T>').gsub(/T.class/, 'Object.class')}
+      File.open(java_source_file, 'w') { |f| f << java_source.gsub(/^(public class .*ArrayAdapter) (.*ArrayAdapter)/, '\1<T> \2<T>').gsub(/T.class/, 'Object.class') }
       # EMXIF
 
       assert File.exists?('src/ruboto_array_adapter.rb')
       assert File.exists?('test/src/ruboto_array_adapter_test.rb')
 
-      File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
+      File.open('src/ruboto_test_app_activity.rb', 'w') { |f| f << <<EOF }
 require 'ruboto/activity'
 require 'ruboto/util/stack'
 require 'ruboto/widget'
@@ -160,7 +174,7 @@ puts "adapter: \#{adapter.inspect}"
 end
 EOF
 
-      File.open('test/src/ruboto_test_app_activity_test.rb', 'w'){|f| f << <<EOF}
+      File.open('test/src/ruboto_test_app_activity_test.rb', 'w') { |f| f << <<EOF }
 activity Java::org.ruboto.test_app.RubotoTestAppActivity
 
 setup do |activity|
@@ -185,7 +199,7 @@ test('Item click changes text') do |activity|
 end
 EOF
 
-      File.open('src/ruboto_array_adapter.rb', 'w'){|f| f << <<EOF}
+      File.open('src/ruboto_array_adapter.rb', 'w') { |f| f << <<EOF }
 class Java::AndroidWidget::ArrayAdapter
    field_reader :mResource, :mFieldId
 end
@@ -238,7 +252,7 @@ class RubotoArrayAdapter
 end
 EOF
 
-      File.open('res/layout/list_item.xml', 'w'){|f| f << <<EOF}
+      File.open('res/layout/list_item.xml', 'w') { |f| f << <<EOF }
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"

data/test/ruboto_setup_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'net/http'
 
-class RubotoSetupTest < Test::Unit::TestCase
+class RubotoSetupTest < Minitest::Test
   SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
 
   def test_if_page_still_exists

data/test/ruboto_update_test.rb

@@ -47,14 +47,14 @@ Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
     tools_version = m[:tools_version]
     ruboto_version_no_dots = ruboto_version.gsub('.', '_')
     self.class.class_eval <<EOF
-class RubotoUpdatedExample#{ruboto_version_no_dots}Tools#{tools_version}Test < Test::Unit::TestCase
+class RubotoUpdatedExample#{ruboto_version_no_dots}Tools#{tools_version}Test < Minitest::Test
   include UpdatedExampleTestMethods
   def setup
     super('#{ruboto_version}', '#{tools_version}')
   end
 end
 
-class RubotoUpdate#{ruboto_version_no_dots}Tools#{tools_version}Test < Test::Unit::TestCase
+class RubotoUpdate#{ruboto_version_no_dots}Tools#{tools_version}Test < Minitest::Test
   include UpdateTestMethods
   def setup
     super('#{ruboto_version}', '#{tools_version}')
@@ -65,7 +65,7 @@ EOF
 
 end
 
-class RubotoUpdateTest < Test::Unit::TestCase
+class RubotoUpdateTest < Minitest::Test
   def setup
     generate_app :heap_alloc => 16, :update => true
   end

data/test/sample_broadcast_receiver_test.rb

@@ -15,7 +15,7 @@ class Log
   end
 end
 
-class SampleBroadcastReceiverTest < Test::Unit::TestCase
+class SampleBroadcastReceiverTest < Minitest::Test
   require 'assets/samples/sample_broadcast_receiver'
 
   def test_on_receive_calls_log_v

data/test/service_block_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
-class ServiceBlockTest < Test::Unit::TestCase
+class ServiceBlockTest < Minitest::Test
   SRC_DIR = "#{APP_DIR}/src"
 
   def setup

data/test/service_gen_class_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
-class ServiceGenClassTest < Test::Unit::TestCase
+class ServiceGenClassTest < Minitest::Test
   SRC_DIR = "#{APP_DIR}/src"
 
   def setup

data/test/service_infile_class_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
-class ServiceInfileClassTest < Test::Unit::TestCase
+class ServiceInfileClassTest < Minitest::Test
   SRC_DIR = "#{APP_DIR}/src"
 
   def setup

data/test/splash_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
-class SplashTest < Test::Unit::TestCase
+class SplashTest < Minitest::Test
   def setup
     generate_app
   end

data/test/sqldroid_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 # FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
 if RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE'
 
-class SqldroidTest < Test::Unit::TestCase
+class SqldroidTest < Minitest::Test
   def setup
     generate_app :bundle => :sqldroid
   end

data/test/test_helper.rb

@@ -1,7 +1,8 @@
 lib = File.dirname(File.dirname(__FILE__)) + '/lib'
 $:.unshift(lib) unless $:.include?(lib)
-require 'test/unit'
 require 'rubygems'
+gem "minitest"
+require 'minitest/autorun'
 require 'fileutils'
 require 'yaml'
 require 'ruboto/sdk_versions'
@@ -107,7 +108,7 @@ module RubotoTest
   puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
 
   if RUBOTO_PLATFORM == 'CURRENT'
-    JRUBY_JARS_VERSION = Gem::Version.new('1.7.12')
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.18')
   elsif ENV['JRUBY_JARS_VERSION']
     JRUBY_JARS_VERSION = Gem::Version.new(ENV['JRUBY_JARS_VERSION'])
   else
@@ -128,16 +129,17 @@ module RubotoTest
   ENV['LOCAL_GEM_DIR'] = Dir.getwd
 end
 
-class Test::Unit::TestCase
+class Minitest::Test
   include RubotoTest
   extend RubotoTest
 
   alias old_run run
 
   def run(*args, &block)
-    mark_test_start("#{self.class.name}\##{respond_to?(:method_name) ? method_name : __name__}")
-    old_run(*args, &block)
-    mark_test_end("#{self.class.name}\##{respond_to?(:method_name) ? method_name : __name__}")
+    mark_test_start("#{self.class.name}\##{name}")
+    result = old_run(*args, &block)
+    mark_test_end("#{self.class.name}\##{name}")
+    result
   end
 
   def mark_test_start(test_name)
@@ -174,7 +176,7 @@ class Test::Unit::TestCase
     package = options.delete(:package) || PACKAGE
     standalone = options.delete(:standalone) || !!included_stdlibs || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
     update = options.delete(:update) || false
-    ruby_version = options.delete(:ruby_version) || (JRUBY_JARS_VERSION.to_s[0..0] == '9' ? 2.1 : 1.9)
+    ruby_version = options.delete(:ruby_version) || (JRUBY_JARS_VERSION.to_s[0..0] == '9' ? '2.2' : '1.9')
 
     raise "Unknown options: #{options.inspect}" unless options.empty?
     raise 'Inclusion/exclusion of libs requires standalone mode.' if (included_stdlibs || excluded_stdlibs) && !standalone
@@ -187,7 +189,7 @@ class Test::Unit::TestCase
     template_dir << "_heap_alloc_#{heap_alloc}" if heap_alloc
     #    template_dir << "_ruby_version_#{ruby_version.to_s.gsub('.', '_')}" if ruby_version
     template_dir << "_example_#{example}" if example
-    template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
+    template_dir << "_bundle_#{[*bundle].map(&:to_s).join('_').gsub(/[{}\[\]'",:=~<>\/ ]+/, '_')}" if bundle
     template_dir << '_updated' if update
     template_dir << '_standalone' if standalone
     template_dir << "_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs
@@ -199,12 +201,13 @@ class Test::Unit::TestCase
       if example
         Dir.chdir TMP_DIR do
           system "tar xzf #{PROJECT_DIR}/examples/#{APP_NAME}_#{example}.tgz"
+          Dir.chdir(APP_NAME) { system '../../bin/ruboto setup -y' }
         end
         Dir.chdir APP_DIR do
           File.open('local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           File.open('test/local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           if standalone
-            if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
+            if included_stdlibs || excluded_stdlibs || heap_alloc
               write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
             end
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
@@ -228,7 +231,7 @@ class Test::Unit::TestCase
         end
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
-          if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
+          if included_stdlibs || excluded_stdlibs || heap_alloc
             sleep 1
             write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
             system 'rake build_xml jruby_adapter'
@@ -265,7 +268,7 @@ class Test::Unit::TestCase
   end
 
   def update_app
-    system "#{RUBOTO_CMD} update app"
+    system "#{RUBOTO_CMD} update app #{"--with-jruby #{JRUBY_JARS_VERSION}" if RUBOTO_PLATFORM == 'STANDALONE'}"
     assert_equal 0, $?, "update app failed with return code #$?"
   end
 
@@ -307,21 +310,22 @@ class Test::Unit::TestCase
   end
 
   def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
-    yml = YAML.dump({'included_stdlibs' => included_stdlibs,
-            'excluded_stdlibs' => excluded_stdlibs,
-            # 'ruby_version' => ruby_version,
-            'heap_alloc' => heap_alloc,
-        })
+    options = {}
+    options['included_stdlibs'] = included_stdlibs if included_stdlibs
+    options['excluded_stdlibs'] = excluded_stdlibs if excluded_stdlibs
+    options['ruby_version'] = ruby_version if ruby_version
+    options['heap_alloc'] = heap_alloc if heap_alloc
+    yml = YAML.dump(options)
     puts "Adding ruboto.yml:\n#{yml}"
     File.open('ruboto.yml', 'w') { |f| f << yml }
   end
 
   def write_gemfile(bundle)
-    gems = [*bundle]
+    gems = [*bundle].map{|g| g.is_a?(Symbol) ? g.to_s : g}
     puts "Adding Gemfile.apk: #{gems.join(' ')}"
     File.open('Gemfile.apk', 'w') do |f|
       f << "source 'http://rubygems.org/'\n\n"
-      gems.each { |g| f << "gem #{[*g].map { |gp| "'#{gp}'" }.join(', ')}\n" }
+      gems.each { |g| f << "gem #{[*g].map { |gp| (gp.is_a?(Symbol) ? gp.to_s : gp).inspect }.join(', ')}\n" }
     end
   end
 

data/test/update_test_methods.rb

@@ -5,7 +5,7 @@ module UpdateTestMethods
 
   def setup(old_ruboto_version, old_tools_version)
     @old_ruboto_version = old_ruboto_version
-    generate_app :example => "#{old_ruboto_version}_tools_r#{old_tools_version}"
+    generate_app example: "#{old_ruboto_version}_tools_r#{old_tools_version}"
   end
 
   def teardown

data/test/updated_example_test_methods.rb

@@ -7,7 +7,7 @@ module UpdatedExampleTestMethods
 
   def setup(old_ruboto_version, old_tools_version)
     @old_ruboto_version = old_ruboto_version
-    generate_app :example => "#{old_ruboto_version}_tools_r#{old_tools_version}", :update => true
+    generate_app example: "#{old_ruboto_version}_tools_r#{old_tools_version}", update: true
   end
 
   def teardown

data/test/uppercase_package_name_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path('test_helper', File.dirname(__FILE__))
+require_relative 'test_helper'
 
-class UppercasePackageNameTest < Test::Unit::TestCase
+class UppercasePackageNameTest < Minitest::Test
 
   def setup
-    generate_app :package => 'org.ruboto.TestApp'
+    generate_app package: 'org.ruboto.TestApp'
   end
 
   def teardown