ruboto 0.15.0 → 0.16.0

data/test/activity/spinner_activity_test.rb

@@ -0,0 +1,65 @@
+activity Java::org.ruboto.test_app.SpinnerActivity
+
+class Java::AndroidWidget::ArrayAdapter
+  field_reader :mResource, :mDropDownResource, :mFieldId
+end
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(69)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test('default', :ui => false) do |activity|
+  assert_spinner_selection(activity, 42, 'List Spinner')
+end
+
+test('plain', :ui => false) do |activity|
+  assert_spinner_selection(activity, 43, 'Plain Item')
+end
+
+test('adapter', :ui => false) do |activity|
+  assert_spinner_selection(activity, 44, 'Adapter Item')
+end
+
+test('list', :ui => false) do |activity|
+  assert_spinner_selection(activity, 45, 'List Item')
+end
+
+test('list spinner view resources') do |activity|
+  activity.run_on_ui_thread do
+    spinner = activity.findViewById(45)
+    assert_equal R::layout::simple_spinner_item, spinner.adapter.mResource
+    assert_equal R::layout::simple_spinner_item, spinner.adapter.mDropDownResource
+    assert_equal 0, spinner.adapter.mFieldId
+
+    spinner = activity.findViewById(46)
+    assert_equal R::layout::simple_spinner_dropdown_item, spinner.adapter.mResource
+    assert_equal R::layout::simple_spinner_dropdown_item, spinner.adapter.mDropDownResource
+    assert_equal 0, spinner.adapter.mFieldId
+
+    spinner = activity.findViewById(47)
+    assert_equal R::layout::simple_spinner_dropdown_item, spinner.adapter.mResource
+    assert_equal R::layout::simple_spinner_item, spinner.adapter.mDropDownResource
+    assert_equal 0, spinner.adapter.mFieldId
+  end
+end
+
+def assert_spinner_selection(activity, spinner_id, expected_text)
+  activity.run_on_ui_thread do
+    activity.findViewById(spinner_id).setSelection(1, true)
+  end
+  start_time = Time.now
+  text = nil
+  loop do
+    activity.run_on_ui_thread { text = @text_view.text }
+    break if text == expected_text || (Time.now - start_time) > 4
+    sleep 0.1
+  end
+  activity.run_on_ui_thread { assert_equal expected_text, text }
+end
+

data/test/activity/stack_activity_test.rb

@@ -12,18 +12,25 @@ end
 
 # ANDROID: 10, PLATFORM: 0.5.3,      JRuby: 1.7.3          '[28, 33, 46, 63]' expected, but got '[43, 48, 45, 62]'
 # ANDROID: 10, PLATFORM: 0.5.4,      JRuby: 1.7.3          '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
+# ANDROID: 16, PLATFORM: 0.6.0,      JRuby: 9000.dev       '[28, 33, 45, 62]' expected, but got '[28, 33, 45, 63]'
 # ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0          '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 test('stack depth') do |activity|
   os_offset = {
       10 => [0, 0, -1, -1],
       13 => [1, 1, 0, 0],
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
+  jruby_offset = {
+      /^1\.7/ => [0, 0, 0, -1],
+      /^9000/ => [0, 0, 0, 0],
+      // => [0, 0, 0, 0],
+  }.find { |k, v| org.jruby.runtime.Constants::VERSION =~ k }[1]
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
-  assert_equal [28 + os_offset[0],
-                33 + os_offset[1],
-                45 + os_offset[2],
-                62 + os_offset[3]], [activity.find_view_by_id(42).text.to_i,
-                                     activity.find_view_by_id(43).text.to_i,
-                                     activity.find_view_by_id(44).text.to_i,
-                                     activity.find_view_by_id(45).text.to_i], version_message
+  assert_equal [28 + os_offset[0] + jruby_offset[0],
+                33 + os_offset[1] + jruby_offset[1],
+                45 + os_offset[2] + jruby_offset[2],
+                63 + os_offset[3] + jruby_offset[3]], [
+                   activity.find_view_by_id(42).text.to_i,
+                   activity.find_view_by_id(43).text.to_i,
+                   activity.find_view_by_id(44).text.to_i,
+                   activity.find_view_by_id(45).text.to_i], version_message
 end

data/test/activity/startup_exception_activity.rb

@@ -5,17 +5,19 @@ ruboto_import_widgets :LinearLayout, :TextView
 class StartupExceptionActivity
   def onCreate(bundle)
     super
-    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').
+                 map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =
-        linear_layout :orientation => :vertical, :gravity => android.view.Gravity::CENTER do
-          @text_view = text_view :id => 42, :text => title, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        linear_layout :orientation => :vertical, :gravity => :center do
+          @text_view = text_view :id => 42, :text => title, :text_size => 48.0,
+                                 :gravity => :center
         end
     intent = android.content.Intent.new
-    intent.setClassName($package_name, 'com.example.android.lunarlander.LunarLander')
+    intent.setClassName($package_name, 'com.example.UndeclaredActivity')
     startActivity(intent)
   rescue Exception
-    puts "************************ Exception creating activity: #{$!}"
+    puts "Expected exception creating activity: #{$!}"
     puts $!.backtrace.join("\n")
   end
 

data/test/activity/startup_exception_activity_test.rb

@@ -10,6 +10,6 @@ setup do |activity|
   assert @text_view
 end
 
-test('super called correctly') do |activity|
-  assert_equal 'Startup OK', activity.find_view_by_id(42).text.to_s
+test('activity starts with caught exception') do |activity|
+  assert_equal 'Startup OK', @text_view.text.to_s
 end

data/test/app_test_methods.rb

@@ -45,6 +45,10 @@ module AppTestMethods
       next if file =~ /dir_and_file/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.4.dev'))
       # EMXIF
 
+      # FIXME(uwe):  Remove when we stop testing api level < 11
+      next if file =~ /fragment/ && ANDROID_OS < 11
+      # EMXIF
+
       if file =~ /_test.rb$/
         next unless file =~ /#{ENV['ACTIVITY_TEST_PATTERN']}/
         snake_name = file.chomp('_test.rb')

data/test/git_based_gem_test.rb

@@ -0,0 +1,64 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+require 'bigdecimal'
+require 'test/app_test_methods'
+
+class GitBasedGemTest < Test::Unit::TestCase
+  def setup
+    generate_app
+    Dir.chdir APP_DIR do
+      File.open('Gemfile.apk', 'w') do |f|
+        f << "source 'http://rubygems.org/'\n\n"
+        f << "gem 'uri_shortener', :git => 'https://github.com/Nyangawa/UriShortener.git'"
+      end
+    end
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_uri_shortener
+    Dir.chdir APP_DIR do
+      File.open('src/ruboto_test_app_activity.rb', 'w') { |f| f << <<EOF }
+require 'ruboto/widget'
+require 'uri_shortener'
+
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+class RubotoTestAppActivity
+  def onCreate(bundle)
+    super
+    setTitle 'uri_shortener loaded OK!'
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center do
+          text_view :id => 42, :text => title, :text_size => 48.0, :gravity => :center
+        end
+  end
+end
+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|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test("activity starts") do |activity|
+  assert_equal 'uri_shortener loaded OK!', @text_view.text.to_s
+end
+EOF
+
+    end
+
+    run_app_tests
+  end
+
+end

data/test/minimal_app_test.rb

@@ -12,24 +12,23 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
-    # APK was 4.7MB.  JRuby: 1.7.0, ANDROID_TARGET: 15
-    # APK was 4.5MB.  JRuby: 1.7.2, ANDROID_TARGET: 10
-    # APK was 4.5MB.  JRuby: 1.7.2, ANDROID_TARGET: 15
-    # APK was 4.3MB.  JRuby: 1.7.3, ANDROID_TARGET: 10
-    # APK was 4.2MB.  JRuby: 1.7.3, ANDROID_TARGET: 15
     # APK was 4.4MB.  JRuby: 1.7.4, ANDROID_TARGET: 10
-    # APK was 4.3MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 10
-    # APK was 4.2MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 15
-    # APK was 4.3MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 16
+    # APK was 4.3MB.  JRuby: 1.7.4, ANDROID_TARGET: 16
+    # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 1.7.5, ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 16
+    # 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.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
     def test_minimal_apk_is_within_limits
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
-          '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
-          '1.7.3' => ANDROID_TARGET < 15 ? 4.3 : 4.4,
           '1.7.4' => 4.4,
-      }[JRUBY_JARS_VERSION.to_s] || {10 => 4.3, 16 => 4.3}[ANDROID_TARGET] || 4.3
+          '1.7.8' => 4.3,
+          '9000.dev' => 4.3,
+      }[JRUBY_JARS_VERSION.to_s] || 4.3
       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

@@ -73,6 +73,7 @@ class RakeTest < Test::Unit::TestCase
       system 'rake install'
       raise "'rake install' exited with code #$?" unless $? == 0
     end
+    system 'adb logcat >> adb_logcat.log&' if File.exists?('adb_logcat.log')
   end
 
 end

data/test/ruboto_gen_test.rb

@@ -49,21 +49,24 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
-  # APK was    58.3KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
-  # APK was    58.3KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
-  # APK was    73.1KB.  PLATFORM: CURRENT, ANDROID_TARGET: 16
+  # APK was    59.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
+  # APK was    60.2KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
+  # APK was    74.9KB.  PLATFORM: CURRENT, ANDROID_TARGET: 16
   # APK was    57.1KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 10
   # APK was  7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0
   # APK was  7310.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.2
   # APK was  7337.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.2
   # APK was  7317.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.3
   # APK was  7332.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.3
-  # APK was  8428.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.4.dev
-  # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4.dev
-  # APK was  7420.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.4.dev
-  # APK was  8755.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.5.dev
-  # APK was  8770.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.5.dev
-
+  # APK was  8428.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.4
+  # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4
+  # APK was  7420.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.4
+  # APK was  8755.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.5
+  # APK was  8770.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.5
+  # APK was  8766.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.6
+  # APK was  8781.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.8
+  # APK was  6337.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
+  # APK was  6556.7KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
   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}"
@@ -75,15 +78,18 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.2' => 7400.0,
           '1.7.3' => 7400.0,
           '1.7.4' => 8500.0,
-          '1.7.5.dev' => 8800.0,
-      }[JRUBY_JARS_VERSION.to_s] || 8800.0
+          '1.7.5' => 8800.0,
+          '1.7.6' => 8800.0,
+          '1.7.8' => 8800.0,
+          '9000.dev' => 6600.0,
+      }[JRUBY_JARS_VERSION.to_s] || 6600.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
-          10 => 59.0,
-          15 => 59.1,
-          16 => 74.2,
-      }[ANDROID_TARGET] || 74.2
+          10 => 60.0,
+          15 => 62.0,
+          16 => 75.0,
+      }[ANDROID_TARGET] || 75.0
     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.#{version}"

data/test/ruboto_update_test.rb

@@ -11,23 +11,23 @@ require File.expand_path('update_test_methods', File.dirname(__FILE__))
 # TODO(uwe): Delete obsolete examples when we stop supporting updating from them.
 Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
   example_archives = Dir["#{RubotoTest::APP_NAME}_*_tools_r*.tgz"]
-  example_archives = example_archives.sort_by{|a| Gem::Version.new(a[RubotoTest::APP_NAME.size + 1..-1].slice(/(.*)(?=_tools_)/).gsub('_', '.'))}
+  example_archives = example_archives.sort_by { |a| Gem::Version.new(a[RubotoTest::APP_NAME.size + 1..-1].slice(/(.*)(?=_tools_)/).gsub('_', '.')) }
   example_archives = example_archives.last(example_limit) if example_limit
 
   # TODO(gf): Track APIs compatible with update examples
-  EXAMPLE_COMPATIBLE_APIS = { (Gem::Version.new('0.7.0')..Gem::Version.new('0.10.99')) => [8],
-                              (Gem::Version.new('0.11.0')..Gem::Version.new('0.13.0')) => [10,11,12,13,14,15,16,17] }
+  EXAMPLE_COMPATIBLE_APIS = {(Gem::Version.new('0.7.0')..Gem::Version.new('0.10.99')) => [8],
+                             (Gem::Version.new('0.11.0')..Gem::Version.new('0.13.0')) => [10, 11, 12, 13, 14, 15, 16, 17]}
 
   installed_apis = `android list target --compact`.lines.grep(/^android-/) { |s| s.match(/\d+/).to_s.to_i }
   examples = example_archives.collect { |f| f.match /^#{RubotoTest::APP_NAME}_(?<ruboto_version>.*)_tools_r(?<tools_version>.*)\.tgz$/ }.compact
 
   missing_apis = false
   puts "Backward compatibility update tests: #{examples.size}"
-  examples.each_with_index do |m,i|
+  examples.each_with_index do |m, i|
     example_gem_version = Gem::Version.new m[:ruboto_version]
-    compatible_apis = EXAMPLE_COMPATIBLE_APIS[ EXAMPLE_COMPATIBLE_APIS.keys.detect { |gem_range| gem_range.cover? example_gem_version } ]
+    compatible_apis = EXAMPLE_COMPATIBLE_APIS[EXAMPLE_COMPATIBLE_APIS.keys.detect { |gem_range| gem_range.cover? example_gem_version }]
     if compatible_apis
-      if ( installed_apis & compatible_apis ).empty?
+      if (installed_apis & compatible_apis).empty?
         puts "Update test #{example_archives[i]} needs a missing compatible API: #{compatible_apis.join(',')}"
         missing_apis = true
       end
@@ -66,3 +66,20 @@ EOF
   end
 
 end
+
+class RubotoUpdateTest < Test::Unit::TestCase
+  def setup
+    generate_app :heap_alloc => 16, :update => true
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_jruby_adapter_heap_alloc
+    Dir.chdir APP_DIR do
+      assert_match /^\s*byte\[\] arrayForHeapAllocation = new byte\[16 \* 1024 \* 1024\];/,
+                     File.read('src/org/ruboto/JRubyAdapter.java')
+    end
+  end
+end

data/test/sqldroid_test.rb

@@ -15,7 +15,6 @@ class SqldroidTest < Test::Unit::TestCase
   def test_sqldroid
     Dir.chdir APP_DIR do
       File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
-require 'ruboto/activity'
 require 'ruboto/widget'
 require 'sqldroid'
 

data/test/test_helper.rb

@@ -147,20 +147,28 @@ class Test::Unit::TestCase
   end
 
   def generate_app(options = {})
-    package = options.delete(:package) || PACKAGE
+    bundle = options.delete(:bundle)
     example = options.delete(:example) || false
-    update = options.delete(:update) || false
+
     # FIXME(uwe): Remove exclusion feature
     excluded_stdlibs = options.delete(:excluded_stdlibs)
+    # EMXIF
+
+    heap_alloc = options.delete(:heap_alloc)
     included_stdlibs = options.delete(:included_stdlibs)
-    standalone = options.delete(:standalone) || !!included_stdlibs  || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
-    bundle = options.delete(:bundle)
+    package = options.delete(:package) || PACKAGE
+    standalone = options.delete(:standalone) || !!included_stdlibs || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
+    update = options.delete(:update) || false
     raise "Unknown options: #{options.inspect}" unless options.empty?
+
+    raise "Inclusion/exclusion of libs requires standalone mode." if (included_stdlibs || excluded_stdlibs) && !standalone
+
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
 
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
     template_dir = "#{APP_DIR}_template_#{$$}"
     template_dir << "_package_#{package}" if package != PACKAGE
+    template_dir << "_heap_alloc_#{heap_alloc}" if heap_alloc
     template_dir << "_example_#{example}" if example
     template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
     template_dir << '_updated' if update
@@ -179,14 +187,13 @@ class Test::Unit::TestCase
           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
+            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc) if included_stdlibs || excluded_stdlibs || heap_alloc
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
             FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
             install_jruby_jars_gem
           else
             FileUtils.rm(Dir['libs/{jruby-*.jar,dx.jar}'])
           end
-          update_app if update
         end
       else
         if standalone
@@ -202,9 +209,8 @@ class Test::Unit::TestCase
         end
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
+          write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc) if included_stdlibs || excluded_stdlibs || heap_alloc
           if standalone
-            include_stdlibs(included_stdlibs) if included_stdlibs
-            exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
             system "#{RUBOTO_CMD} gen jruby"
             raise "update jruby failed with return code #$?" if $? != 0
           end
@@ -221,8 +227,11 @@ class Test::Unit::TestCase
       #end
       # EMXIF
 
-      unless example && !update
-        Dir.chdir APP_DIR do
+      Dir.chdir APP_DIR do
+        if update
+          update_app
+        end
+        if update || !example
           system 'rake patch_dex' # Ensure dx heap space is sufficient.
           assert_equal 0, $?
           Dir.chdir 'test' do
@@ -247,10 +256,19 @@ class Test::Unit::TestCase
 
   def run_app_tests
     check_platform_installation
+    test_completed = false
+    Thread.start do
+      loop do
+        sleep 60
+        break if test_completed
+        print '-'
+      end
+    end
     Dir.chdir APP_DIR do
       system 'rake test:quick'
       assert_equal 0, $?, "tests failed with return code #$?"
     end
+    test_completed = true
   end
 
   def check_platform_installation
@@ -269,14 +287,14 @@ class Test::Unit::TestCase
     end
   end
 
-  def include_stdlibs(included_stdlibs)
-    puts "Adding ruboto.yml: #{included_stdlibs.join(' ')}"
-    File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:included_stdlibs => included_stdlibs}) }
-  end
-
-  def exclude_stdlibs(excluded_stdlibs)
-    puts "Adding ruboto.yml: #{excluded_stdlibs.join(' ')}"
-    File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:excluded_stdlibs => excluded_stdlibs}) }
+  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc)
+    yml = YAML.dump({'included_stdlibs' => included_stdlibs,
+                     'excluded_stdlibs' => excluded_stdlibs,
+                     'heap_alloc' => heap_alloc})
+    puts "Adding ruboto.yml:\n#{yml}"
+    File.open('ruboto.yml', 'w') do |f|
+      f << yml
+    end
   end
 
   def write_gemfile(bundle)
@@ -284,7 +302,7 @@ class Test::Unit::TestCase
     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}'\n"}
+      gems.each { |g| f << "gem '#{g}'\n" }
     end
   end