ruboto 0.10.2 → 0.11.0.rc.0

data/assets/src/ruboto/util/stack.rb

@@ -24,9 +24,17 @@ class Thread
   def self.with_large_stack(opts = {}, &block)
     opts = {:size => opts} if opts.is_a? Integer
     stack_size_kb = opts.delete(:size) || 64
-    name = opts.delete(:name) || "Thread with large stack"
+    name = opts.delete(:name) || 'Thread with large stack'
     raise "Unknown option(s): #{opts.inspect}" unless opts.empty?
-    t = java.lang.Thread.new(nil, block, name, stack_size_kb * 1024)
+    block_with_logging = proc do
+      begin
+        block.call
+      rescue Exception
+        STDERR.puts "Exception in #{name}: #{$!}\n#{$!.backtrace.join("\n")}"
+        raise
+      end
+    end
+    t = java.lang.Thread.new(nil, block_with_logging, name, stack_size_kb * 1024)
     t.start
     t
   end

data/assets/src/ruboto/widget.rb

@@ -75,7 +75,7 @@ end
 # Load ViewGroup constants
 #
 
-java_import "android.view.ViewGroup"
+java_import 'android.view.ViewGroup'
 ViewGroup::LayoutParams.constants.each do |i|
   View.add_constant_conversion i.downcase.to_sym, ViewGroup::LayoutParams.const_get(i)
 end
@@ -84,7 +84,7 @@ end
 # Load Gravity constants
 #
 
-java_import "android.view.Gravity"
+java_import 'android.view.Gravity'
 Gravity.constants.each do |i|
   View.add_constant_conversion i.downcase.to_sym, Gravity.const_get(i)
 end
@@ -97,7 +97,7 @@ def ruboto_import_widgets(*widgets)
   widgets.each { |i| ruboto_import_widget i }
 end
 
-def ruboto_import_widget(class_name, package_name="android.widget")
+def ruboto_import_widget(class_name, package_name='android.widget')
   if class_name.is_a?(String) or class_name.is_a?(Symbol)
     klass = java_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
   else
@@ -165,6 +165,7 @@ def setup_image_button
 end
 
 def setup_list_view
+  Java::android.widget.ListView.__persistent__ = true
   Java::android.widget.ListView.class_eval do
     def configure(context, params = {})
       if list = params.delete(:list)
@@ -186,6 +187,7 @@ def setup_list_view
 end
 
 def setup_spinner
+  Java::android.widget.Spinner.__persistent__ = true
   Java::android.widget.Spinner.class_eval do
     attr_reader :adapter, :adapter_list
 

data/lib/ruboto/sdk_versions.rb

@@ -13,7 +13,7 @@ module Ruboto
     }
     MINIMUM_SUPPORTED_SDK_LEVEL = 7
     MINIMUM_SUPPORTED_SDK = "android-#{MINIMUM_SUPPORTED_SDK_LEVEL}"
-    DEFAULT_TARGET_SDK_LEVEL = 8
+    DEFAULT_TARGET_SDK_LEVEL = 10
     DEFAULT_TARGET_SDK = "android-#{DEFAULT_TARGET_SDK_LEVEL}"
     if ENV['ANDROID_HOME']
       ANDROID_HOME = ENV['ANDROID_HOME']

data/lib/ruboto/util/update.rb

@@ -36,7 +36,7 @@ module Ruboto
           puts "\nGenerating Android test project #{name} in #{root}..."
           system %Q{android create test-project -m "#{root.gsub('"', '\"')}" -n "#{name}Test" -p "#{root.gsub('"', '\"')}/test"}
           FileUtils.rm_rf File.join(root, 'test', 'src', verify_package.split('.'))
-          puts "Done"
+          puts 'Done'
         end
 
         Dir.chdir File.join(root, 'test') do
@@ -67,7 +67,7 @@ module Ruboto
           #   puts 'Added external permission tag'
           # end
 
-          File.open("AndroidManifest.xml", 'w') { |f| REXML::Formatters::OrderedAttributes.new(4).write(test_manifest.document, f) }
+          File.open('AndroidManifest.xml', 'w') { |f| REXML::Formatters::OrderedAttributes.new(4).write(test_manifest.document, f) }
 
           run_tests_override = <<-EOF
 <!-- BEGIN added by Ruboto -->
@@ -120,14 +120,14 @@ module Ruboto
           # EMXIF
 
           ant_script.gsub!(/\s*<!-- BEGIN added by Ruboto -->.*?<!-- END added by Ruboto -->\s*/m, '')
-          raise "Bad ANT script" unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{run_tests_override}\n\n\\1")
+          raise 'Bad ANT script' unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{run_tests_override}\n\n\\1")
           File.open('build.xml', 'w') { |f| f << ant_script }
         end
       end
 
       def update_jruby(force=nil, explicit = false)
-        jruby_core = Dir.glob("libs/jruby-core-*.jar")[0]
-        jruby_stdlib = Dir.glob("libs/jruby-stdlib-*.jar")[0]
+        jruby_core = Dir.glob('libs/jruby-core-*.jar')[0]
+        jruby_stdlib = Dir.glob('libs/jruby-stdlib-*.jar')[0]
 
         unless force
           if !jruby_core || !jruby_stdlib
@@ -145,7 +145,7 @@ module Ruboto
         new_jruby_version = JRubyJars::VERSION
 
         unless force
-          current_jruby_version = jruby_core ? jruby_core[16..-5] : "None"
+          current_jruby_version = jruby_core ? jruby_core[16..-5] : 'None'
           if current_jruby_version == new_jruby_version
             puts "JRuby is up to date at version #{new_jruby_version}. Make sure you 'gem update jruby-jars' if there is a new version."
             return false
@@ -155,11 +155,11 @@ module Ruboto
           puts "New jruby version: #{new_jruby_version}"
         end
 
-        copier = AssetCopier.new Ruboto::ASSETS, File.expand_path(".")
-        log_action("Removing #{jruby_core}") { File.delete *Dir.glob("libs/jruby-core-*.jar") } if jruby_core
-        log_action("Removing #{jruby_stdlib}") { File.delete *Dir.glob("libs/jruby-stdlib-*.jar") } if jruby_stdlib
-        log_action("Copying #{JRubyJars::core_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::core_jar_path, "libs" }
-        log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs" }
+        copier = AssetCopier.new Ruboto::ASSETS, File.expand_path('.')
+        log_action("Removing #{jruby_core}") { File.delete *Dir.glob('libs/jruby-core-*.jar') } if jruby_core
+        log_action("Removing #{jruby_stdlib}") { File.delete *Dir.glob('libs/jruby-stdlib-*.jar') } if jruby_stdlib
+        log_action("Copying #{JRubyJars::core_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::core_jar_path, 'libs' }
+        log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, 'libs' }
 
         unless File.read('project.properties') =~ /^dex.force.jumbo=/
           log_action('Setting JUMBO dex file format') do
@@ -182,17 +182,17 @@ module Ruboto
         FileUtils.rm(Dir['libs/dexmaker*.jar'])
         # EMXIF
 
-        jar_file = Dir.glob("libs/dx.jar")[0]
+        jar_file = Dir.glob('libs/dx.jar')[0]
 
         # FIXME(uwe): Remove when we stop updating from Ruboto 0.10.0 and older.
-        jruby_present = !!Dir.glob("libs/jruby-core-*.jar")[0]
+        jruby_present = !!Dir.glob('libs/jruby-core-*.jar')[0]
         log_action("Removing #{jar_file}") { File.delete jar_file } if jar_file && !jruby_present
         # EMXIF
 
         return if !jar_file && !force
 
-        copier = AssetCopier.new Ruboto::ASSETS, File.expand_path(".")
-        log_action("Copying dx.jar to libs") { copier.copy 'libs' }
+        copier = AssetCopier.new Ruboto::ASSETS, File.expand_path('.')
+        log_action('Copying dx.jar to libs') { copier.copy 'libs' }
       end
 
       def update_assets
@@ -229,9 +229,9 @@ module Ruboto
 
       def update_classes(old_version, force = nil)
         copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.'
-        log_action("Ruboto java classes") { copier.copy "src/org/ruboto/*.java" }
-        log_action("Ruboto java test classes") { copier.copy "src/org/ruboto/test/*.java", "test" }
-        Dir["src/**/*.java"].each do |f|
+        log_action('Ruboto java classes') { copier.copy 'src/org/ruboto/*.java' }
+        log_action('Ruboto java test classes') { copier.copy 'src/org/ruboto/test/*.java', 'test' }
+        Dir['src/**/*.java'].each do |f|
           source_code = File.read(f)
           if source_code =~ /^\s*package\s+org.ruboto\s*;/
             next
@@ -241,7 +241,7 @@ module Ruboto
             generate_inheriting_file(class_name, subclass_name, verify_package)
 
             # FIXME(uwe): Remove when we stop supporting upgrading from ruboto 0.7.0 and ruboto 0.8.0
-            if (old_version == '0.7.0' || old_version == '0.8.0')
+            if old_version == '0.7.0' || old_version == '0.8.0'
               puts "Ruboto version #{old_version.inspect} detected."
               script_file = File.expand_path("#{SCRIPTS_DIR}/#{underscore(subclass_name)}.rb")
               puts "Adding explicit super call in #{script_file}"
@@ -272,8 +272,8 @@ module Ruboto
       def update_manifest(min_sdk, target, force = false)
         log_action("\nAdding RubotoActivity, RubotoDialog, RubotoService, and SDK versions to the manifest") do
           if sdk_element = verify_manifest.elements['uses-sdk']
-            min_sdk ||= sdk_element.attributes["android:minSdkVersion"]
-            target ||= sdk_element.attributes["android:targetSdkVersion"]
+            min_sdk ||= sdk_element.attributes['android:minSdkVersion']
+            target ||= sdk_element.attributes['android:targetSdkVersion']
           else
             min_sdk ||= MINIMUM_SUPPORTED_SDK_LEVEL
             target ||= MINIMUM_SUPPORTED_SDK_LEVEL
@@ -295,30 +295,30 @@ module Ruboto
             app_element.attributes['android:largeHeap'] ||= 'true'
           end
 
-          if !app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
-            app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoActivity", 'android:exported' => 'false'}
+          unless app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
+            app_element.add_element 'activity', {'android:name' => 'org.ruboto.RubotoActivity', 'android:exported' => 'false'}
           end
 
-          if !app_element.elements["activity[@android:name='org.ruboto.RubotoDialog']"]
-            app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoDialog", 'android:exported' => 'false', "android:theme" => "@android:style/Theme.Dialog"}
+          unless app_element.elements["activity[@android:name='org.ruboto.RubotoDialog']"]
+            app_element.add_element 'activity', {'android:name' => 'org.ruboto.RubotoDialog', 'android:exported' => 'false', 'android:theme' => '@android:style/Theme.Dialog'}
           end
 
-          if !app_element.elements["service[@android:name='org.ruboto.RubotoService']"]
-            app_element.add_element 'service', {"android:name" => "org.ruboto.RubotoService", 'android:exported' => 'false'}
+          unless app_element.elements["service[@android:name='org.ruboto.RubotoService']"]
+            app_element.add_element 'service', {'android:name' => 'org.ruboto.RubotoService', 'android:exported' => 'false'}
           end
 
           if sdk_element
-            sdk_element.attributes["android:minSdkVersion"] = min_sdk
-            sdk_element.attributes["android:targetSdkVersion"] = target
+            sdk_element.attributes['android:minSdkVersion'] = min_sdk
+            sdk_element.attributes['android:targetSdkVersion'] = target
           else
-            verify_manifest.add_element 'uses-sdk', {"android:minSdkVersion" => min_sdk, "android:targetSdkVersion" => target}
+            verify_manifest.add_element 'uses-sdk', {'android:minSdkVersion' => min_sdk, 'android:targetSdkVersion' => target}
           end
           save_manifest
         end
       end
 
       def update_core_classes(force = nil)
-        generate_core_classes(:class => "all", :method_base => "on", :method_include => "", :method_exclude => "", :force => force, :implements => "")
+        generate_core_classes(:class => 'all', :method_base => 'on', :method_include => '', :method_exclude => '', :force => force, :implements => '')
       end
 
       def read_ruboto_version
@@ -327,13 +327,13 @@ module Ruboto
       end
 
       def update_ruboto(force=nil)
-        log_action("Copying ruboto/version.rb") do
-          from = File.expand_path(Ruboto::GEM_ROOT + "/lib/ruboto/version.rb")
+        log_action('Copying ruboto/version.rb') do
+          from = File.expand_path(Ruboto::GEM_ROOT + '/lib/ruboto/version.rb')
           to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/version.rb")
           FileUtils.mkdir_p File.dirname(to)
           FileUtils.cp from, to
         end
-        log_action("Copying additional ruboto script components") do
+        log_action('Copying additional ruboto script components') do
           Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/**/*.rb").each do |from|
             to = File.expand_path("./#{from.slice /#{SCRIPTS_DIR}\/ruboto\/.*\.rb/}")
             FileUtils.mkdir_p File.dirname(to)
@@ -357,14 +357,13 @@ module Ruboto
             FileUtils.rm_rf 'tmp'
             Dir.mkdir 'tmp'
             Dir.chdir 'tmp' do
-              FileUtils.move "../#{jruby_core}", "."
+              FileUtils.move "../#{jruby_core}", '.'
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
               if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3.dev')
                 excluded_core_packages = [
                     '**/*Darwin*',
-                    '**/*Ruby20*',
                     '**/*Solaris*',
                     '**/*windows*',
                     '**/*Windows*',
@@ -375,8 +374,11 @@ module Ruboto
                     'com/kenai/jnr/x86asm',
                     'com/martiansoftware',
                     'jline', 'jni',
-                    'jnr/constants/platform/darwin', 'jnr/constants/platform/fake', 'jnr/constants/platform/freebsd',
-                    'jnr/constants/platform/openbsd', 'jnr/constants/platform/sunos',
+                    'jnr/constants/platform/darwin',
+                    'jnr/constants/platform/fake',
+                    'jnr/constants/platform/freebsd',
+                    'jnr/constants/platform/openbsd',
+                    'jnr/constants/platform/sunos',
                     'jnr/ffi/annotations',
                     'jnr/ffi/byref',
                     'jnr/ffi/provider',
@@ -572,20 +574,35 @@ module Ruboto
               #end
 
               # Add our proxy class factory
-              `javac -source 1.6 -target 1.6 -cp .:#{Ruboto::ASSETS}/libs/dx.jar -bootclasspath #{Dir["#{Ruboto::SdkVersions::ANDROID_HOME}/platforms/android-*/android.jar"][0]} -d . #{Ruboto::GEM_ROOT}/lib/*.java`
-              raise "Compile failed" unless $? == 0
+              android_jar = Dir["#{Ruboto::SdkVersions::ANDROID_HOME}/platforms/*/android.jar"][0]
+              unless android_jar
+                puts
+                puts '*' * 80
+                puts "    Could not find any Android platforms in #{Ruboto::SdkVersions::ANDROID_HOME}/platforms."
+                puts '    At least one Android Platform SDK must be installed to compile the Ruboto classes.'
+                puts '    Please install an Android Platform SDK using the "android" package manager.'
+                puts '*' * 80
+                puts
+                exit 1
+              end
+              android_jar.gsub!(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+              class_path = ['.', "#{Ruboto::ASSETS}/libs/dx.jar"].join(File::PATH_SEPARATOR).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+              sources = "#{Ruboto::GEM_ROOT}/lib/*.java".gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+              `javac -source 1.6 -target 1.6 -cp #{class_path} -bootclasspath #{android_jar} -d . #{sources}`
+              raise 'Compile failed' unless $? == 0
 
-              `jar -cf ../#{jruby_core} .`
+              `jar -cf ..#{File::ALT_SEPARATOR || File::SEPARATOR}#{jruby_core} .`
               raise "Creating repackaged jruby-core jar failed: #$?" unless $? == 0
             end
-            FileUtils.remove_dir "tmp", true
+            FileUtils.remove_dir 'tmp', true
           end
         end
       end
 
       # - Moves ruby stdlib to the root of the jruby-stdlib jar
       def reconfigure_jruby_stdlib
-        min_sdk_version = verify_manifest.elements['uses-sdk'].attributes["android:minSdkVersion"].to_i
+        min_sdk_version = verify_manifest.elements['uses-sdk'].attributes['android:minSdkVersion'].to_i
+        included_stdlibs = verify_ruboto_config[:included_stdlibs]
         excluded_stdlibs = [*verify_ruboto_config[:excluded_stdlibs]].compact
         Dir.chdir 'libs' do
           jruby_stdlib = JRubyJars::stdlib_jar_path.split('/')[-1]
@@ -604,13 +621,41 @@ module Ruboto
               raise "Unrecognized JRuby stdlib jar: #{jruby_stdlib}" unless jruby_stdlib =~ /jruby-stdlib-(.*).jar/
               jruby_stdlib_version = Gem::Version.new($1)
 
+              if included_stdlibs
+
+                # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
+                if jruby_stdlib_version < Gem::Version.new('1.7.0.preview1')
+                  lib_dirs = %w(1.8 1.9 site_ruby/1.8 site_ruby/1.9 site_ruby/shared)
+                else
+                  lib_dirs = %w(1.8 1.9 shared)
+                end
+                # ODOT
+
+                print 'excluded...'
+
+                lib_dirs.each do |ld|
+                  Dir.chdir "new/jruby.home/lib/ruby/#{ld}" do
+                    libs = Dir['*'].map{|d|d.sub /\.(rb|jar)$/, ''}.uniq
+                    libs.each do |d|
+                      next if included_stdlibs.include? d
+                      FileUtils.rm_rf d if File.exists? d
+                      file = "#{d}.rb"
+                      FileUtils.rm_rf file if File.exists? file
+                      jarfile = "#{d}.jar"
+                      FileUtils.rm_rf jarfile if File.exists? jarfile
+                      print "#{d}..."
+                    end
+                  end
+                end
+              end
+
               if excluded_stdlibs.any?
 
                 # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
                 if jruby_stdlib_version < Gem::Version.new('1.7.0.preview1')
-                  lib_dirs = ['1.8', '1.9', 'site_ruby/1.8', 'site_ruby/1.9', 'site_ruby/shared']
+                  lib_dirs = %w(1.8 1.9 site_ruby/1.8 site_ruby/1.9 site_ruby/shared)
                 else
-                  lib_dirs = ['1.8', '1.9', 'shared']
+                  lib_dirs = %w(1.8 1.9 shared)
                 end
                 # ODOT
 
@@ -708,22 +753,22 @@ module Ruboto
             FileUtils.rm_rf 'tmp'
             Dir.mkdir 'tmp'
             Dir.chdir 'tmp' do
-              FileUtils.move "../#{dx_jar}", "."
+              FileUtils.move "../#{dx_jar}", '.'
               `jar -xf #{dx_jar}`
               raise "Unpacking dx.jar jar failed: #$?" unless $? == 0
               File.delete dx_jar
-                excluded_core_packages = [
-                    'com/android/dx/command',
-                    # 'com/android/dx/ssa', # Tests run OK without this package, but we may loose some optimizations.
-                    'junit',
-                ]
+              excluded_core_packages = [
+                  'com/android/dx/command',
+                  # 'com/android/dx/ssa', # Tests run OK without this package, but we may loose some optimizations.
+                  'junit',
+              ]
               excluded_core_packages.each do |i|
                 FileUtils.remove_dir(i, true) rescue puts "Failed to remove package: #{i} (#{$!})"
               end
               `jar -cf ../#{dx_jar} .`
               raise "Creating repackaged dx.jar failed: #$?" unless $? == 0
             end
-            FileUtils.remove_dir "tmp", true
+            FileUtils.remove_dir 'tmp', true
           end
         end
       end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.10.2'
+  VERSION = '0.11.0.rc.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/lib/ruboto.rb

@@ -10,5 +10,5 @@ require 'ruboto/util/main_fix'
 
 module Ruboto
   GEM_ROOT = File.dirname(File.dirname(__FILE__))
-  ASSETS = File.join(GEM_ROOT, "assets")
+  ASSETS = File.join(GEM_ROOT, 'assets')
 end

data/test/activity/image_button_activity.rb

@@ -4,7 +4,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 
 class ImageButtonActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 

data/test/activity/image_button_and_button_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
 
 class ImageButtonAndButtonActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 

data/test/activity/json_activity.rb

@@ -1,5 +1,5 @@
 require 'ruboto/util/stack'
-with_large_stack { require 'json' }
+require 'json'
 require 'ruboto/widget'
 
 ruboto_import_widgets :LinearLayout, :TextView

data/test/activity/margins_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :LinearLayout, :TextView
 
 class MarginsActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 

data/test/activity/navigation_activity.rb

@@ -4,7 +4,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class NavigationActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
@@ -51,7 +51,7 @@ class NavigationActivity
 
   def start_inline_activity
     start_ruboto_activity do
-      def on_create(bundle)
+      def onCreate(bundle)
         super
         set_title 'Inline Activity'
         self.content_view =
@@ -65,7 +65,7 @@ class NavigationActivity
 
   def start_inline_activity_with_options
     start_ruboto_activity(:class_name => 'InlineActivity') do
-      def on_create(bundle)
+      def onCreate(bundle)
         super
         set_title 'Inline Activity'
         self.content_view =
@@ -104,7 +104,7 @@ class NavigationActivity
 end
 
 class InfileActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title 'Infile Activity'
     self.content_view =

data/test/activity/navigation_target_activity.rb

@@ -1,5 +1,5 @@
 class NavigationTargetActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title 'Navigation Target Activity'
 

data/test/activity/option_menu_activity.rb

@@ -4,7 +4,7 @@ require 'ruboto/util/toast'
 ruboto_import_widgets :LinearLayout, :TextView
 
 class OptionMenuActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
@@ -15,7 +15,7 @@ class OptionMenuActivity
         end
   end
 
-  def on_create_options_menu(menu)
+  def onCreateOptionsMenu(menu)
     mi = menu.add('Test')
     # mi.icon = $package.R::drawable::get_ruboto_core
     mi.setIcon($package.R::drawable::get_ruboto_core)

data/test/activity/psych_activity.rb

@@ -25,7 +25,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :LinearLayout, :TextView
 
 class PsychActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
     self.content_view =

data/test/activity/ruby_file_activity.rb

@@ -1,5 +1,5 @@
 class RubyFileActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title 'Ruby file Activity'
 

data/test/activity/stack_activity.rb

@@ -8,7 +8,7 @@ ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class StackActivity
   STACK_DEPTH_CLASS = java.lang.Thread.current_thread.stack_trace.length.to_s
-  def on_create(bundle)
+  def onCreate(bundle)
     stack_depth_on_create = java.lang.Thread.current_thread.stack_trace.length.to_s
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')

data/test/activity/startup_exception_activity.rb

@@ -0,0 +1,31 @@
+require 'ruboto/widget'
+
+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(' ')
+
+    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
+        end
+    intent = android.content.Intent.new
+    intent.setClassName($package_name, 'com.example.android.lunarlander.LunarLander')
+    startActivity(intent)
+  rescue Exception
+    puts "************************ Exception creating activity: #{$!}"
+    puts $!.backtrace.join("\n")
+  end
+
+  def onResume
+    super
+    @text_view.text = 'Startup OK'
+  end
+
+  def onPause
+    super
+    @text_view.text = 'Paused'
+  end
+end

data/test/activity/startup_exception_activity_test.rb

@@ -0,0 +1,15 @@
+activity org.ruboto.test_app.StartupExceptionActivity
+
+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('super called correctly') do |activity|
+  assert_equal 'Startup OK', activity.find_view_by_id(42).text.to_s
+end

data/test/activity/subclass_activity.rb

@@ -4,7 +4,7 @@ ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
 class SubclassOfArrayAdapter < Java::AndroidWidget::ArrayAdapter
   def getView(position, convert_view, parent)
-    puts "IN get_view!!!"
+    puts 'IN get_view!!!'
     @inflater ||= context.getSystemService(Context::LAYOUT_INFLATER_SERVICE)
     row = convert_view ? convert_view : @inflater.inflate(mResource, nil)
     row.findViewById(mFieldId).text = "[#{get_item(position)}]"
@@ -21,7 +21,7 @@ class Java::AndroidWidget::ArrayAdapter
 end
 
 class SubclassActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 

data/test/activity/view_constants_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class ViewConstantsActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     $ruboto_test_app_activity = self
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')

data/test/app_test_methods.rb

@@ -13,7 +13,7 @@ module AppTestMethods
       assert_code 'Base64Loads', "require 'base64'"
 
       # FIXME(uwe):  We should try using YAML as well
-      assert_code 'YamlLoads', "require 'ruboto/util/stack' ; with_large_stack{require 'yaml'}"
+      assert_code 'YamlLoads', "require 'yaml'"
 
       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)}'
@@ -41,10 +41,6 @@ module AppTestMethods
       next if file =~ /subclass/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.1.dev'))
       # EMXIF
 
-      # FIXME(uwe):  Remove when we stop testing RubotoCore <= 0.5.2 and android-10
-      next if file =~ /json/ && (RUBOTO_PLATFORM == 'CURRENT' || ANDROID_OS <= 10)
-      # EMXIF
-
       # FIXME(uwe):  Remove when we include jopenssl and bouncycastle
       next if file =~ /ssl/
       # EMXIF