ruboto 0.5.4 → 0.6.0

data/lib/ruboto/util/verify.rb

@@ -10,9 +10,10 @@ module Ruboto
       #
 
       def verify_manifest
+        return @manifest if @manifest
         abort "cannot find your AndroidManifest.xml to extract info from it. Make sure you're in the root directory of your app" unless
         File.exists? 'AndroidManifest.xml'
-        @manifest ||= REXML::Document.new(File.read('AndroidManifest.xml')).root
+        @manifest = REXML::Document.new(File.read('AndroidManifest.xml')).root
       end
 
       def save_manifest
@@ -54,10 +55,11 @@ module Ruboto
       end
 
       def verify_target_sdk
+        return @target_sdk if @target_sdk
         verify_sdk_versions
-        @target_sdk ||= @uses_sdk.attribute('android:targetSdkVersion').value
-        abort "you must specify a target sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless @target_sdk
-        @target_sdk
+        target_sdk_attr ||= @uses_sdk.attribute('android:targetSdkVersion').value
+        abort "you must specify a target sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless target_sdk_attr
+        @target_sdk = target_sdk_attr.to_i
       end
 
       def verify_strings

data/lib/ruboto/util/xml_element.rb

@@ -185,7 +185,7 @@ module Ruboto
           (attribute("return") ? attribute("return") : "void"),
           attribute("name"), parameters,
           if_else(
-              "callbackProcs[#{constant_string}] != null",
+              "callbackProcs != null && callbackProcs[#{constant_string}] != null",
               [super_string] + ruby_call,
               [super_return]
           )
@@ -197,4 +197,4 @@ module Ruboto
       end
     end
   end
-end
+end

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

data/test/activity/option_menu_activity.rb

@@ -1,4 +1,8 @@
-require 'ruboto'
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/legacy'
+require 'ruboto/menu'
+require 'ruboto/util/toast'
 
 ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 

data/test/activity/psych_activity.rb

@@ -1,9 +1,14 @@
-require 'jruby'
-require 'rbconfig'
-org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
-$LOADED_FEATURES << 'psych.so'
-$LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
-require 'psych.rb'
+# TODO(uwe): Remove when we stop supporting Ruby 1.8 mode
+if RUBY_VERSION < "1.9"
+  require 'jruby'
+  require 'rbconfig'
+  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  $LOADED_FEATURES << 'psych.so'
+  $LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
+end
+# TODO end
+
+with_large_stack{require 'psych.rb'}
 
 Psych::Parser
 Psych::Handler

data/test/activity/stack_activity_test.rb

@@ -11,11 +11,19 @@ setup do |activity|
 end
 
 test('stack depth') do |activity|
-  os_offset = {13 => 1}[android.os.Build::VERSION::SDK_INT].to_i
-  jruby_offset = {
-      '1.5.6'     => [-2, -5, -6, -8],
-  }[org.jruby.runtime.Constants::VERSION] || [0,0,0,0]
-  version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
+  os_offset = {13 => 1, 15 => 1}[android.os.Build::VERSION::SDK_INT].to_i
+  if org.ruboto.Script.uses_platform_apk?
+    jruby_offset = {
+        '0.4.7' => [0, 0, 0, 0],
+        '0.4.8.dev' => [0, -1, -1, -1],
+    }[org.ruboto.Script.platform_version_name] || [0, 0, 0, 0]
+  else
+    jruby_offset = {
+        '1.5.6' => [-2, -5, -6, -8],
+        '1.7.0.dev' => [0, -1, -1, -1],
+    }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
+  end
+  version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.Script.uses_platform_apk ? org.ruboto.Script.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
   assert_equal 44 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message
   assert_equal 68 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
   assert_equal 77 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message

data/test/app_test_methods.rb

@@ -5,18 +5,19 @@ module AppTestMethods
 
   def test_activity_tests
     # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
-    if ON_JRUBY_JARS_1_5_6
+    if Test::Unit::TestCase::ON_JRUBY_JARS_1_5_6
       puts "Skipping YAML tests on jruby-jars-1.5.6"
     else
       assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
     end
 
-    assert_code 'ReadSourceFile', "File.read(__FILE__)"
+    assert_code 'ReadSourceFile', 'File.read(__FILE__)'
     assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
+    assert_code 'RepeatRubotoImport', 'ruboto_import :TextView ; ruboto_import :TextView'
 
     Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
       # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
-      next if ON_JRUBY_JARS_1_5_6 && test_src =~ /psych_activity_test.rb$/
+      next if Test::Unit::TestCase::ON_JRUBY_JARS_1_5_6 && test_src =~ /psych_activity_test.rb$/
 
       snake_name = test_src.chomp('_test.rb')
       activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join

data/test/broadcast_receiver_test.rb

@@ -0,0 +1,86 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+require 'fileutils'
+
+class BroadcastReceiverTest < Test::Unit::TestCase
+  SRC_DIR ="#{APP_DIR}/src"
+
+  def setup
+    generate_app
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_generated_broadcast_receiver
+    action_name ='org.ruboto.example.click_broadcast'
+    message = 'Broadcast received!'
+    Dir.chdir APP_DIR do
+      activity_filename = 'src/ruboto_test_app_activity.rb'
+      activity_content = File.read(activity_filename)
+
+      assert activity_content.sub!(/  def on_create\(bundle\)\n/, <<EOF)
+  def on_create(bundle)
+    @receiver = $package.ClickReceiver.new
+    filter = android.content.IntentFilter.new('#{action_name}')
+    Thread.start do
+      begin
+        android.os.Looper.prepare
+        registerReceiver(@receiver, filter, nil, android.os.Handler.new)
+        android.os.Looper.loop
+      rescue
+        puts "Exception starting receiver"
+        puts $!.message
+        puts $!.backtrace.join("\n")
+      end
+    end
+EOF
+
+      assert activity_content.sub!(/  @handle_click = proc do \|view\|\n.*?  end\n/m, <<EOF)
+  @handle_click = proc do |view|
+    intent = android.content.Intent.new
+    intent.set_action '#{action_name}'
+    send_broadcast(intent)
+  end
+EOF
+      File.open(activity_filename, 'w') { |f| f << activity_content }
+
+      system "#{RUBOTO_CMD} gen class BroadcastReceiver --name ClickReceiver"
+      FileUtils.rm 'test/src/click_receiver_test.rb'
+      receiver_filename = 'src/click_receiver.rb'
+      receiver_content = File.read(receiver_filename)
+
+      assert receiver_content.sub!(/  def on_receive\(context, intent\)\n.*?  end\n/m, <<EOF)
+  def on_receive(context, intent)
+    Log.d "RUBOTO TEST", "Changing UI text"
+    context.run_on_ui_thread{$activity.find_view_by_id(42).text = '#{message}'}
+    Log.d "RUBOTO TEST", "UI text changed OK!"
+  rescue
+    Log.e "RUBOTO TEST", "Exception changing UI text: \#{$!.message}"
+    Log.e "RUBOTO TEST", $!.message
+    Log.e "RUBOTO TEST", $!.backtrace.join("\n")
+  end
+EOF
+      File.open(receiver_filename, 'w') { |f| f << receiver_content }
+
+      test_filename = 'test/src/ruboto_test_app_activity_test.rb'
+      test_content = File.read(test_filename)
+
+      assert test_content.sub!(/'button changes text'/, "'button changes text', :ui => false")
+      assert test_content.sub!(/  button.performClick/, <<EOF)
+  clicked_at = nil
+  activity.run_on_ui_thread do
+    button.performClick
+    clicked_at = Time.now
+  end
+
+  sleep 0.1 until clicked_at && (@text_view.text == '#{message}' || (Time.now - clicked_at) > 10)
+EOF
+      assert test_content.sub!(/What hath Matz wrought!/, message)
+      File.open(test_filename, 'w') { |f| f << test_content }
+    end
+
+    run_app_tests
+  end
+
+end

data/test/minimal_app_test.rb

@@ -1,26 +1,34 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
-require 'bigdecimal'
 
-class MinimalAppTest < Test::Unit::TestCase
-  def setup
-    generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss
+if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
+  require 'bigdecimal'
+
+  class MinimalAppTest < Test::Unit::TestCase
+    def setup
+      generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss
         rubygems runit shell soap test uri webrick win32 wsdl xmlrpc xsd ../1.9}
-  end
+    end
 
-  def teardown
-    cleanup_app
-  end
+    def teardown
+      cleanup_app
+    end
 
-  def test_minimal_apk_is_less_than_3_mb
-    apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
-    upper_limit = 3.0
-    lower_limit = upper_limit * 0.85
-    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB"
-    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit."
-  end
+    def test_minimal_apk_is_less_than_3_mb
+      apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
+      upper_limit = {
+          # '1.5.6' => 3.7,
+          '1.6.7' => 3.2,
+          '1.7.0.dev' => ANDROID_TARGET < 15 ? 3.4 : 3.8, # Without dexmaker for Android < 4.0.3
+      }[JRUBY_JARS_VERSION.to_s] || 3.2
+      lower_limit = upper_limit * 0.9
+      version_message ="JRuby: #{JRUBY_JARS_VERSION}"
+      assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"
+      assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit.  #{version_message}"
+    end
 
-  def test_minimal_apk_succeeds_tests
-    run_app_tests
-  end
+    def test_minimal_apk_succeeds_tests
+      run_app_tests
+    end
 
-end
+  end
+end

data/test/rake_test.rb

@@ -9,7 +9,8 @@ class RakeTest < Test::Unit::TestCase
     cleanup_app
   end
 
-  if ANDROID_OS == 'android-7'
+  # FIXME(uwe): Remove condition when we stop supporting android-7
+  if ANDROID_OS == 7
     puts "Skipping sdcard test since files on sdcard are not removed on android-7 on app uninstall"
   else
     def test_that_update_scripts_task_copies_files_to_sdcard_and_are_read_by_activity
@@ -32,9 +33,19 @@ class RakeTest < Test::Unit::TestCase
         # assert_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
         # FIXME end
 
-        assert `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp =~ %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}
+        assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
       end
     end
   end
 
+  def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
+    Dir.chdir APP_DIR do
+      system 'rake install'
+      apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
+      FileUtils.touch "src/ruboto_test_app_activity.rb"
+      system 'rake install'
+      assert_not_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should have been rebuilt'
+    end
+  end
+
 end

data/test/ruboto_gen_test.rb

@@ -32,10 +32,24 @@ class RubotoGenTest < Test::Unit::TestCase
 
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
-    upper_limit = 54.0
+    version = "  PLATFORM: #{RUBOTO_PLATFORM}"
+    if RUBOTO_PLATFORM == 'STANDALONE'
+      upper_limit = {
+          '1.6.7' => 5800.0,
+          '1.7.0.dev' => 6666.0,
+      }[JRUBY_JARS_VERSION.to_s] || 4200.0
+      version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
+    else
+      upper_limit = {
+          7 => 56.0,
+          10 => 60.0,
+          15 => 65.0,
+      }[ANDROID_TARGET] || 64.0
+      version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
+    end
     lower_limit = upper_limit * 0.9
-    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB"
-    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.  You should lower the limit."
+    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"
+    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.floor(1)}KB.  You should lower the limit.#{version}"
   end
 
 end

data/test/ruboto_update_test.rb

@@ -1,5 +1,27 @@
-require File.expand_path("update_test_methods", File.dirname(__FILE__))
+require File.expand_path('updated_example_test_methods', File.dirname(__FILE__))
+require File.expand_path('update_test_methods', File.dirname(__FILE__))
 
-class RubotoUpdateTest < Test::Unit::TestCase
+# TODO(uwe): Delete obsolete examples when we stop supporting updating from them.
+
+Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
+  Dir["#{RubotoTest::APP_NAME}_*_tools_r*.tgz"].each do |f|
+    next unless f =~ /^#{RubotoTest::APP_NAME}_(.*)_tools_r(.*)\.tgz$/
+    ruboto_version = $1
+    tools_version = $2
+    self.class.class_eval <<EOF
+class RubotoUpdatedExample#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Test::Unit::TestCase
+  include UpdatedExampleTestMethods
+  def setup
+    super('#{ruboto_version}', '#{tools_version}')
+  end
+end
+
+class RubotoUpdate#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Test::Unit::TestCase
   include UpdateTestMethods
+  def setup
+    super('#{ruboto_version}', '#{tools_version}')
+  end
+end
+EOF
+  end
 end

data/test/service_test.rb

@@ -19,7 +19,7 @@ class ServiceTest < Test::Unit::TestCase
       assert File.exists? service_filename
       File.open(service_filename, 'w'){|f| f << <<EOF}
 require 'ruboto'
-    
+
 $service.handle_create do
   Thread.start do
     loop do

data/test/test_helper.rb

@@ -1,9 +1,13 @@
+$:.unshift('lib') unless $:.include?('lib')
 require 'test/unit'
 require 'rubygems'
 require 'fileutils'
 require 'yaml'
+require 'ruboto/sdk_versions'
 
 module RubotoTest
+  include Ruboto::SdkVersions
+
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
@@ -11,21 +15,28 @@ module RubotoTest
   FileUtils.mkdir_p GEM_PATH
   ENV['GEM_HOME'] = GEM_PATH
   ENV['GEM_PATH'] = GEM_PATH
-  system 'gem install bundler'
-  system 'bundle'
-
-  PACKAGE        = 'org.ruboto.test_app'
-  APP_NAME       = 'RubotoTestApp'
-  TMP_DIR        = File.join PROJECT_DIR, 'tmp'
-  APP_DIR        = File.join TMP_DIR, APP_NAME
-  ANDROID_TARGET = ENV['ANDROID_TARGET'] || 'android-7'
+  ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
+  Gem.path << GEM_PATH
+  Gem.refresh
+  `gem query -i -n bundler`
+  system 'gem install bundler' unless $? == 0
+  system 'bundle --system'
+  lib_path = File.expand_path('lib', File.dirname(File.dirname(__FILE__)))
+  $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+  require 'ruboto'
+  require 'ruboto/version'
 
+  PACKAGE = 'org.ruboto.test_app'
+  APP_NAME = 'RubotoTestApp'
+  TMP_DIR = File.join PROJECT_DIR, 'tmp'
+  APP_DIR = File.join TMP_DIR, APP_NAME
+  ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
   VERSION_TO_API_LEVEL = {
-      '2.1'   => 'android-7', '2.1-update1' => 'android-7', '2.2' => 'android-8',
-      '2.3'   => 'android-9', '2.3.1' => 'android-9', '2.3.2' => 'android-9',
+      '2.1' => 'android-7', '2.1-update1' => 'android-7', '2.2' => 'android-8',
+      '2.3' => 'android-9', '2.3.1' => 'android-9', '2.3.2' => 'android-9',
       '2.3.3' => 'android-10', '2.3.4' => 'android-10',
-      '3.0'   => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
-      '4.0.1' => 'android-14', '4.0.3' => 'android-15',
+      '3.0' => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
+      '4.0.1' => 'android-14', '4.0.3' => 'android-15', '4.0.4' => 'android-15'
   }
 
   def self.version_from_device
@@ -34,7 +45,7 @@ module RubotoTest
     start = Time.now
     IO.popen('adb bugreport').each_line do |line|
       if line =~ /sdk-eng (.*?) .*? .*? test-keys/
-        version   = $1
+        version = $1
         api_level = VERSION_TO_API_LEVEL[version]
         raise "Unknown version: #{version}" if api_level.nil?
         puts "Getting version from device/emulator took #{(Time.now - start).to_i}s"
@@ -47,21 +58,44 @@ module RubotoTest
     raise "Unable to read device/emulator apilevel"
   end
 
-  def install_jruby_jars_gem
-    system "gem install jruby-jars #{"-v #{ENV['JRUBY_JARS_VERSION']}" if ENV['JRUBY_JARS_VERSION']}"
+  def self.install_jruby_jars_gem
+    version_requirement = "-v #{ENV['JRUBY_JARS_VERSION']}" if ENV['JRUBY_JARS_VERSION']
+    `gem query -i -n jruby-jars #{version_requirement}`
+    system "gem install jruby-jars #{version_requirement}" unless $? == 0
     raise "install of jruby-jars failed with return code #$?" unless $? == 0
-    system %Q{gem uninstall jruby-jars --all -v "!=#{ENV['JRUBY_JARS_VERSION']}"} if ENV['JRUBY_JARS_VERSION']
+    if ENV['JRUBY_JARS_VERSION']
+      exclusion_clause = %Q{-v "!=#{ENV['JRUBY_JARS_VERSION']}"}
+      `gem query -u -n jruby-jars #{exclusion_clause}`
+      system %Q{gem uninstall jruby-jars --all #{exclusion_clause}"} unless $? == 0
+      raise "Uninstall of jruby-jars failed with return code #$?" unless $? == 0
+    end
   end
 
-  ANDROID_OS = ENV['ANDROID_OS'] || version_from_device
-  RUBOTO_CMD = "ruby -rubygems -I #{PROJECT_DIR}/lib #{PROJECT_DIR}/bin/ruboto"
+  def install_jruby_jars_gem
+    RubotoTest::install_jruby_jars_gem
+  end
 
+  def uninstall_jruby_jars_gem
+    `gem query --no-installed -n jruby-jars`
+    system 'gem uninstall jruby-jars --all' if $? != 0
+    assert_equal 0, $?, "uninstall of jruby-jars failed with return code #$?"
+  end
+
+  def install_ruboto_gem(version)
+    version_requirement = "-v #{version}"
+    `gem query -i -n ^ruboto$ #{version_requirement}`
+    system "gem install ruboto #{version_requirement}" unless $? == 0
+    raise "install of ruboto #{version} failed with return code #$?" unless $? == 0
+  end
+
+  ANDROID_OS = (ENV['ANDROID_OS'] || version_from_device).slice(/\d+/).to_i
   puts "ANDROID_OS: #{ANDROID_OS}"
-end
+  puts "ANDROID_TARGET: #{ANDROID_TARGET}"
 
-class Test::Unit::TestCase
-  include RubotoTest
-  extend RubotoTest
+  RUBOTO_CMD = "ruby -rubygems -I #{PROJECT_DIR}/lib #{PROJECT_DIR}/bin/ruboto"
+
+  puts "ANDROID_HOME: #{ANDROID_HOME}"
+  puts "ANDROID_SDK_TOOLS_REVISION: #{ANDROID_TOOLS_REVISION}"
 
   install_jruby_jars_gem
 
@@ -74,10 +108,19 @@ class Test::Unit::TestCase
   # FIXME end
 
   raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
-  JRUBY_JARS_VERSION  = gem_spec.version
+  JRUBY_JARS_VERSION = gem_spec.version
+  puts "JRUBY_JARS_VERSION: #{JRUBY_JARS_VERSION}"
+
+  RUBOTO_PLATFORM = ENV['RUBOTO_PLATFORM'] || 'CURRENT'
+  puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
 
   # FIXME(uwe): Remove when we stop supporting JRuby 1.5.6
   ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
+end
+
+class Test::Unit::TestCase
+  include RubotoTest
+  extend RubotoTest
 
   alias old_run run
 
@@ -97,7 +140,8 @@ class Test::Unit::TestCase
 
   def mark_test_end(test_name)
     log
-    log "Ended test #{test_name}: #{passed? ? 'PASSED' : 'FAILED'} after #{(Time.now - @start_time).to_i}s"
+    duration = (Time.now - @start_time).to_i
+    log "Ended test #{test_name}: #{passed? ? 'PASSED' : 'FAILED'} after #{duration / 60}:#{'%02d' % (duration % 60)}"
     log '=' * 80
     log
   end
@@ -108,86 +152,114 @@ class Test::Unit::TestCase
   end
 
   def generate_app(options = {})
-    update           = options.delete(:update) || false
+    example = options.delete(:example) || false
+    update = options.delete(:update) || false
     excluded_stdlibs = options.delete(:excluded_stdlibs)
+    standalone = options.delete(:standalone) || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
 
-    if excluded_stdlibs
-      system 'rake platform:uninstall'
-    else
-      system 'rake platform:install'
-    end
-    if $? != 0
-      FileUtils.rm_rf 'tmp/RubotoCore'
-      fail 'Error (un)installing RubotoCore'
-    end
-
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
-    template_dir = "#{APP_DIR}_template_#{$$}#{'_updated' if update}#{"_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs}"
+    template_dir = "#{APP_DIR}_template_#{$$}"
+    template_dir << "_example_#{example}" if example
+    template_dir << '_updated' if update
+    template_dir << '_standalone' if standalone
+    template_dir << "_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs
     if File.exists?(template_dir)
       puts "Copying app from template #{template_dir}"
       FileUtils.cp_r template_dir, APP_DIR, :preserve => true
     else
       install_jruby_jars_gem
 
-      if update
+      if example
         Dir.chdir TMP_DIR do
-          system "tar xzf #{PROJECT_DIR}/examples/RubotoTestApp_0.1.0_jruby_1.6.3.dev.tgz"
-        end
-        if ENV['ANDROID_HOME']
-          android_home = ENV['ANDROID_HOME']
-        else
-          android_home = File.dirname(File.dirname(`which adb`))
+          system "tar xzf #{PROJECT_DIR}/examples/#{APP_NAME}_#{example}.tgz"
         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}" }
-          exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
-          system "#{RUBOTO_CMD} update app"
-          assert_equal 0, $?, "update app failed with return code #$?"
+          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
+            exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
+            FileUtils.touch 'libs/jruby-core-x.x.x.jar'
+            FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
+          else
+            FileUtils.rm(Dir['libs/{jruby-*.jar,dexmaker*.jar}'])
+          end
+          update_app if update
         end
       else
-        unless excluded_stdlibs
-          system 'gem uninstall jruby-jars --all'
-          assert_equal 0, $?, "uninstall of jruby-jars failed with return code #$?"
-        end
+        uninstall_jruby_jars_gem unless standalone
         puts "Generating app #{APP_DIR}"
-        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target #{ANDROID_TARGET}"
+        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target android-#{ANDROID_TARGET}"
         if $? != 0
           FileUtils.rm_rf APP_DIR
           raise "gen app failed with return code #$?"
         end
-        if excluded_stdlibs
+        if standalone
           Dir.chdir APP_DIR do
-            exclude_stdlibs(excluded_stdlibs)
+            exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
             system "#{RUBOTO_CMD} update jruby --force"
             raise "update jruby failed with return code #$?" if $? != 0
           end
         end
       end
-      Dir.chdir APP_DIR do
-        system 'rake debug'
-        assert_equal 0, $?
+
+      # FIXME(uwe): Installation with dexmaker fails on Android < 4.0.3 due to complex interface structure
+      # Fixme(uwe): Remove when solved
+      if standalone && ANDROID_OS < 15
+        Dir.chdir APP_DIR do
+          puts "Removing dexmaker jar for android-#{ANDROID_OS}"
+          FileUtils.rm(Dir['libs/dexmaker*.jar'])
+        end
+      end
+      # FIXME end
+
+      unless example && !update
+        Dir.chdir APP_DIR do
+          system 'rake debug'
+          assert_equal 0, $?
+        end
       end
       puts "Storing app as template #{template_dir}"
       FileUtils.cp_r APP_DIR, template_dir, :preserve => true
     end
   end
 
+  def update_app
+    system "#{RUBOTO_CMD} update app"
+    assert_equal 0, $?, "update app failed with return code #$?"
+  end
+
   def cleanup_app
     # FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
   end
 
   def run_app_tests
-    if ['android-7', 'android-8'].include? ANDROID_OS
+    if [7, 8].include? ANDROID_OS
       puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
+      return
+    end
+    check_platform_installation(Dir['libs/jruby-core-*.jar'].any?)
+    Dir.chdir APP_DIR do
+      system 'rake test:quick'
+      assert_equal 0, $?, "tests failed with return code #$?"
+    end
+  end
+
+  def check_platform_installation(standalone)
+    if standalone
+      system 'rake platform:uninstall'
     else
-      Dir.chdir APP_DIR do
-        system 'rake test:quick'
-        assert_equal 0, $?, "tests failed with return code #$?"
+      if RUBOTO_PLATFORM == 'CURRENT'
+        system "rake platform:current platform:install"
+      elsif RUBOTO_PLATFORM == 'MASTER'
+        system "rake platform:install"
       end
     end
+    if $? != 0
+      FileUtils.rm_rf 'tmp/RubotoCore'
+      fail 'Error (un)installing RubotoCore'
+    end
   end
 
   def exclude_stdlibs(excluded_stdlibs)