ruboto-core 0.3.3 → 0.4.0

data/assets/src/org/ruboto/test/InstrumentationTestRunner.java

@@ -22,15 +22,11 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.JavaEmbedUtils;
-import org.jruby.RubyClass;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.ruboto.Script;
 
 public class InstrumentationTestRunner extends android.test.InstrumentationTestRunner {
     private Class activityClass;
-    private IRubyObject setup;
+    private Object setup;
     private TestSuite suite;
     
     public TestSuite getAllTests() {
@@ -38,28 +34,31 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         suite = new TestSuite("Sweet");
         
         try {
-            Script.setUpJRuby(getTargetContext());
-            Script.defineGlobalVariable("$runner", this);
-            Script.defineGlobalVariable("$test", this);
-            Script.defineGlobalVariable("$suite", suite);
+            if (Script.setUpJRuby(getTargetContext())) {
+                Script.defineGlobalVariable("$runner", this);
+                Script.defineGlobalVariable("$test", this);
+                Script.defineGlobalVariable("$suite", suite);
 
-            // TODO(uwe):  Why doesn't this work?
-            // Script.copyScriptsIfNeeded(getContext());
+                // TODO(uwe):  Why doesn't this work?
+                // Script.copyScriptsIfNeeded(getContext());
 
-            loadScript("test_helper.rb");
+                loadScript("test_helper.rb");
 
-            // TODO(uwe):  Why doesn't this work?
-            // String[] scripts = new File(Script.scriptsDirName(getContext())).list();
+                // TODO(uwe):  Why doesn't this work?
+                // String[] scripts = new File(Script.scriptsDirName(getContext())).list();
 
-            String[] scripts = getContext().getResources().getAssets().list("scripts");
-            for (String f : scripts) {
-                if (f.equals("test_helper.rb")) continue;
-                Log.i(getClass().getName(), "Found script: " + f);
-                loadScript(f);
+                String[] scripts = getContext().getResources().getAssets().list("scripts");
+                for (String f : scripts) {
+                    if (f.equals("test_helper.rb")) continue;
+                    Log.i(getClass().getName(), "Found script: " + f);
+                    loadScript(f);
+                }
+            } else {
+                addError(suite, new RuntimeException("Ruboto Core platform is missing"));
             }
         } catch (IOException e) {
           addError(suite, e);
-        } catch (RaiseException e) {
+        } catch (RuntimeException e) {
           addError(suite, e);
         }
         return suite;
@@ -69,15 +68,15 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         this.activityClass = activityClass;
     }
 
-    public void setup(IRubyObject block) {
+    public void setup(Object block) {
         this.setup = block;
     }
 
-    public void test(String name, IRubyObject block) {
+    public void test(String name, Object block) {
         if (android.os.Build.VERSION.SDK_INT <= 8) {
           name ="runTest";
         }
-        Test test = new ActivityTest(activityClass, Script.getRuby().getScriptFilename(), setup, name, block);
+        Test test = new ActivityTest(activityClass, Script.getScriptFilename(), setup, name, block);
         suite.addTest(test);
         Log.d(getClass().getName(), "Made test instance: " + test);
     }
@@ -106,12 +105,12 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         buffer.close();
 
         Log.d(getClass().getName(), "Loading test script: " + f);
-        String oldFilename = Script.getRuby().getScriptFilename();
-        Script.getRuby().setScriptFilename(f);
-        Script.getRuby().put("$script_code", source.toString());
-        Script.getRuby().setScriptFilename(f);
-        Script.getRuby().runScriptlet("$test.instance_eval($script_code)");
-        Script.getRuby().setScriptFilename(oldFilename);
+        String oldFilename = Script.getScriptFilename();
+        Script.setScriptFilename(f);
+        Script.put("$script_code", source.toString());
+        Script.setScriptFilename(f);
+        Script.execute("$test.instance_eval($script_code)");
+        Script.setScriptFilename(oldFilename);
         Log.d(getClass().getName(), "Test script " + f + " loaded");
     }
 

data/assets/{assets/scripts → src}/ruboto.rb

@@ -9,7 +9,8 @@
 #
 #######################################################
 
-$RUBOTO_VERSION = 8
+require 'ruboto/version'
+$RUBOTO_VERSION = 9
 
 def confirm_ruboto_version(required_version, exact=true)
   raise "requires $RUBOTO_VERSION=#{required_version} or greater, current version #{$RUBOTO_VERSION}" if $RUBOTO_VERSION < required_version and not exact
@@ -44,9 +45,11 @@ class Object
   def with_large_stack(opts = {}, &block)
     opts = {:size => opts} if opts.is_a? Integer
     opts = {:name => 'Block with large stack'}.update(opts)
+    exception = nil
     result = nil
-    t = Thread.with_large_stack(opts, &proc{result = block.call})
+    t = Thread.with_large_stack(opts, &proc{result = block.call rescue exception = $!})
     t.join
+    raise exception if exception
     result
   end
 end
@@ -79,7 +82,7 @@ def setup_activity
     def start_ruboto_activity(remote_variable, klass=RubotoActivity, theme=nil, &block)
       $activity_init_block = block
 
-      if @initialized or self == $activity
+      if @initialized or (self == $activity && !$activity.kind_of?(RubotoActivity))
         b = Java::android.os.Bundle.new
         b.putInt("Theme", theme) if theme
         b.putString("Remote Variable", remote_variable)
@@ -257,17 +260,19 @@ end
 # Ruboto Set up for all app types (Activity, Service, BroadcastReceiver)
 #
 
-def ruboto_setup(klass, init_method="create")
+def ruboto_setup(klass, init_method = true)
   # Setup ability to handle callbacks
   ruboto_allow_handlers(klass)
 
-  klass.class_eval do
-    eval %Q{
-      def handle_#{init_method}(&block)
+  if init_method
+    klass.class_eval do
+      eval %Q{
+      def handle_create(&block)
         instance_exec &block
         #{klass == Java::org.ruboto.RubotoActivity ? "on_create(nil)" : ""}
       end
     }
+    end
   end
 end
 
@@ -613,4 +618,4 @@ ruboto_setup(RubotoService)
 
 # setup broadcast receiver support
 java_import "org.ruboto.RubotoBroadcastReceiver"
-ruboto_setup(RubotoBroadcastReceiver, "receive")
+ruboto_setup(RubotoBroadcastReceiver, false)

data/assets/test/assets/scripts/test_helper.rb

@@ -1,9 +1,13 @@
 require 'java'
 
-def assert(value, message = "#{value.inspect} expected to be true")
-  raise message unless value
+def assert(value, message = nil)
+  raise "#{"#{message}\n" if message}#{value.inspect} expected to be true" unless value
 end
 
-def assert_equal(expected, actual, message = "'#{expected}' expected, but got '#{actual}'")
-  raise message unless expected == actual
+def assert_equal(expected, actual, message = nil)
+  raise "#{"#{message}\n" if message}'#{expected}' expected, but got '#{actual}'" unless expected == actual
+end
+
+def assert_less_than_or_equal(limit, actual, message = nil)
+  raise "#{"#{message}\n" if message}Expected '#{actual}' to be less than or equal to '#{limit}'" unless actual <= limit
 end

data/lib/ruboto/commands/base.rb

@@ -51,7 +51,10 @@ module Ruboto
                 argument :required
                 description "Minimum android version supported. Must begin with 'android-'."
               }
-
+              option("with-jruby") {
+                description "Generate the JRuby jars jar"
+                cast :boolean
+              }
               option("with-psych") {
                 description "Generate the Psych YAML parser jar"
                 cast :boolean
@@ -76,6 +79,10 @@ module Ruboto
                   exit_failure!
                 end
                 Dir.chdir path do
+                  FileUtils.rm_f "src/#{package.gsub '.', '/'}/#{activity}.java"
+                  puts "Removed file #{"src/#{package.gsub '.', '/'}/#{activity}"}.java"
+                  FileUtils.rm_f 'res/layout/main.xml'
+                  puts 'Removed file res/layout/main.xml'
                   verify_strings.root.elements['string'].text = name.gsub(/([A-Z]+)([A-Z][a-z])/,'\1 \2').gsub(/([a-z\d])([A-Z])/,'\1 \2')
                   File.open("res/values/strings.xml", 'w') {|f| verify_strings.document.write(f, 4)}
                 end
@@ -84,15 +91,16 @@ module Ruboto
                 Dir.chdir root do
                   update_test true
                   update_assets
+                  update_ruboto true
                   update_icons true
                   update_classes true
-                  update_jruby true, params['with-psych'].value
+                  update_jruby true, params['with-psych'].value if params['with-jruby'].value || params['with-psych'].value
                   update_build_xml
                   update_manifest min_sdk[/\d+/], target[/\d+/], true
                   update_core_classes "exclude"
 
                   log_action("Generating the default Activity and script") do
-                    generate_inheriting_file "Activity", activity, package, "#{underscore(activity)}.rb"
+                    generate_inheriting_file "Activity", activity, package
                   end
                 end
 
@@ -100,6 +108,24 @@ module Ruboto
               end
             end
 
+            mode "jruby" do
+              include Ruboto::Util::LogAction
+              include Ruboto::Util::Build
+              include Ruboto::Util::Update
+              include Ruboto::Util::Verify
+
+              option("with-psych") {
+                description "Generate the Psych YAML parser jar"
+                cast :boolean
+              }
+
+              def run
+                Dir.chdir root do
+                  update_jruby true, params['with-psych'].value
+                end
+              end
+            end
+
             mode "class" do
               include Ruboto::Util::Build
               include Ruboto::Util::Verify
@@ -113,7 +139,7 @@ module Ruboto
 
               option("script_name"){
                 argument :required
-                description "name of the ruby script in assets/scripts/ that this class will execute. should end in .rb. optional"
+                description "name of the ruby script that this class will execute. Should end in .rb.  Optional."
               }
 
               option("name"){
@@ -314,11 +340,12 @@ module Ruboto
             def run
               case params['what'].value
               when "jruby" then
-                update_jruby(params['force'].value) || abort
+                update_jruby(params['force'].value, params['with-psych'].value) || abort
               when "app" then
                 force = params['force'].value
                 update_test force
                 update_assets
+                update_ruboto force
                 update_icons force
                 update_classes force
                 update_jruby force, params['with-psych'].value
@@ -337,7 +364,16 @@ module Ruboto
 
           # just running `ruboto`
           def run
-            version = Gem.searcher.find('ruboto').version.version
+            # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
+            if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
+              gem_spec = Gem::Specification.find_by_path 'ruboto'
+            else
+              gem_spec = Gem.searcher.find('ruboto')
+            end
+            # FIXME end
+
+            version = gem_spec.version.version
+
             if params['version'].value
               puts version
             else

data/lib/ruboto/util/build.rb

@@ -2,6 +2,8 @@ module Ruboto
   module Util
     module Build
       include Verify
+      SCRIPTS_DIR = 'src'
+      
       ###########################################################################
       #
       # Build Subclass or Interface:
@@ -101,7 +103,7 @@ module Ruboto
       def generate_subclass_or_interface(params)
         defaults = {:template => "InheritingClass", :method_base => "all", :method_include => "", :method_exclude => "", :force => nil, :implements => ""}
         params = defaults.merge(params)
-        params[:package] = verify_package unless params[:package]
+        params[:package] ||= verify_package
 
         class_desc = get_class_or_interface(params[:class] || params[:interface], params[:force])
 
@@ -141,7 +143,7 @@ module Ruboto
 
         hash = {:package => "org.ruboto"}
         %w(method_base method_include implements force).inject(hash) {|h, i| h[i.to_sym] = params[i.to_sym]; h}
-        hash[:method_exclude] = params[:method_exclude].split(",").push("onCreate").push("onReceive").join(",")
+        hash[:method_exclude] = params[:method_exclude].split(",").push("onCreate").join(",")
 
         %w(android.app.Activity android.app.Service android.content.BroadcastReceiver android.view.View).each do |i|
           name = i.split(".")[-1]
@@ -164,30 +166,35 @@ module Ruboto
       # generate_inheriting_file:
       #   Builds a script based subclass of Activity, Service, or BroadcastReceiver
       #
-
-      def generate_inheriting_file(klass, name, package, script_name, dest='.', filename = name)
-        file = File.expand_path File.join(dest, "src/#{package.gsub('.', '/')}", "#{filename}.java")
+      def generate_inheriting_file(klass, name, package, script_name = "#{underscore(name)}.rb")
+        dest = '.'
+        file = File.expand_path File.join(dest, "src/#{package.gsub('.', '/')}", "#{name}.java")
         text = File.read(File.join(Ruboto::ASSETS, "src/Inheriting#{klass}.java"))
+        file_existed = File.exists?(file)
         File.open(file, 'w') do |f|
           f << text.gsub("THE_PACKAGE", package).gsub("Inheriting#{klass}", name).gsub("start.rb", script_name)
         end
-        puts "Added file #{file}."
-
-        sample_source = File.read(File.join(Ruboto::ASSETS, "samples/sample_#{underscore klass}.rb")).gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name).gsub("start.rb", script_name)
-        FileUtils.mkdir_p File.join(dest, 'assets/scripts')
-        script_file = File.expand_path("assets/scripts/#{script_name}", dest)
-        File.open script_file, "a" do |f|
-          f << sample_source
+        puts "#{file_existed ? 'Updated' : 'Added'} file #{file}."
+
+        script_file = File.expand_path("#{SCRIPTS_DIR}/#{script_name}", dest)
+        if !File.exists? script_file
+          sample_source = File.read(File.join(Ruboto::ASSETS, "samples/sample_#{underscore klass}.rb")).gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name).gsub("start.rb", script_name)
+          FileUtils.mkdir_p File.join(dest, SCRIPTS_DIR)
+          File.open script_file, "a" do |f|
+            f << sample_source
+          end
+          puts "Added file #{script_file}."
         end
-        puts "Added file #{script_file}."
 
-        sample_test_source = File.read(File.join(Ruboto::ASSETS, "samples/sample_#{underscore klass}_test.rb")).gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name)
-        FileUtils.mkdir_p File.join(dest, 'test/assets/scripts')
         test_file = File.expand_path("test/assets/scripts/#{script_name.chomp('.rb')}_test.rb", dest)
-        File.open test_file, "a" do |f|
-          f << sample_test_source
+        if !File.exists? test_file
+          sample_test_source = File.read(File.join(Ruboto::ASSETS, "samples/sample_#{underscore klass}_test.rb")).gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name)
+          FileUtils.mkdir_p File.join(dest, 'test/assets/scripts')
+          File.open test_file, "a" do |f|
+            f << sample_test_source
+          end
+          puts "Added file #{test_file}."
         end
-        puts "Added file #{test_file}."
       end
     end
   end

data/lib/ruboto/util/update.rb

@@ -8,15 +8,15 @@ module Ruboto
       #
       def update_test(force = nil)
         root = Dir.getwd
-        if force || !File.exists?("#{root}/test")
+        if !File.exists?("#{root}/test")
           name = verify_strings.root.elements['string'].text.gsub(' ', '')
           puts "\nGenerating Android test project #{name} in #{root}..."
-          system "android create test-project -m #{root} -n #{name}Test -p #{root}/test"
+          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"
         else
-          # TODO(uwe): Run "android update test"
-          puts "Test project already exists.  Use --force to overwrite."
+          puts "\nUpdating Android test project #{name} in #{root}..."
+          system "android update test-project -m #{root} -p #{root}/test"
         end
 
         Dir.chdir File.join(root, 'test') do
@@ -132,9 +132,18 @@ EOF
         puts "\nCopying files:"
         copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.'
 
-        %w{.gitignore Rakefile assets test}.each do |f|
+        %w{.gitignore Rakefile assets res/layout test}.each do |f|
           log_action(f) {copier.copy f}
         end
+
+        # FIXME(uwe):  Remove when we stop supporting upgrades from ruboto-core 0.3.3 and older
+        old_scripts_dir = 'assets/scripts'
+        if File.exists? old_scripts_dir
+          FileUtils.mv Dir["#{old_scripts_dir}/**/*"], SCRIPTS_DIR
+          FileUtils.rm_rf old_scripts_dir
+        end
+        # FIXME end
+        
       end
 
       def update_icons(force = nil)
@@ -149,6 +158,29 @@ EOF
         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/#{verify_package.gsub('.', '/')}/*.java"].each do |f|
+          if File.read(f) =~ /public class (.*?) extends org.ruboto.Ruboto(Activity|BroadcastReceiver|Service) \{/
+            subclass_name, class_name = $1, $2
+            puts "Regenerating #{subclass_name}"
+            generate_inheriting_file(class_name, subclass_name, verify_package)
+
+            # FIXME(uwe): Remove when we stop supporting upgrading from ruboto-core 0.3.3 and older
+            if class_name == 'BroadcastReceiver'
+              script_file = File.expand_path("#{SCRIPTS_DIR}/#{underscore(subclass_name)}.rb")
+              script_content = File.read(script_file)
+              if script_content !~ /\$broadcast_receiver.handle_receive do \|context, intent\|/
+                puts "Putting receiver script in a block in #{script_file}"
+                File.open(script_file, 'w') do |of|
+                  of.puts '$broadcast_receiver.handle_receive do |context, intent|'
+                  of << script_content
+                  of.puts 'end'
+                end
+              end
+            end
+            # FIXME end
+
+          end
+        end
       end
 
       def update_manifest(min_sdk, target, force = false)
@@ -165,12 +197,12 @@ EOF
           if app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
             puts 'found activity tag'
           else
-            app_element.add_element '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']"]
             puts 'found dialog tag'
           else
-            app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoDialog", "android:theme" => "@android:style/Theme.Dialog"}
+            app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoDialog", 'android:exported' => 'false', "android:theme" => "@android:style/Theme.Dialog"}
           end
           if sdk_element
             sdk_element.attributes["android:minSdkVersion"] = min_sdk
@@ -187,28 +219,17 @@ EOF
       end
 
       def update_ruboto(force=nil)
-        verify_manifest
-
-        from = File.expand_path(Ruboto::GEM_ROOT + "/assets/assets/scripts/ruboto.rb")
-        to = File.expand_path("./assets/scripts/ruboto.rb")
-
-        from_text = File.read(from)
-        to_text = File.read(to) if File.exists?(to)
-
-        unless force
-          puts "New version: #{from_text[/\$RUBOTO_VERSION = (\d+)/, 1]}"
-          puts "Old version: #{to_text ? to_text[/\$RUBOTO_VERSION = (\d+)/, 1] : 'none'}"
-
-          if from_text[/\$RUBOTO_VERSION = (\d+)/, 1] == to_text[/\$RUBOTO_VERSION = (\d+)/, 1]
-            puts "The ruboto.rb version has not changed. Use --force to force update."
-            return false
-          end
-        end
-
         log_action("Copying ruboto.rb") do
-          File.open(to, 'w') {|f| f << from_text}
+          from = File.expand_path(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto.rb")
+          to = File.expand_path("./#{SCRIPTS_DIR}/ruboto.rb")
+          FileUtils.cp from, to
+        end
+        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
-        true
       end
 
       def reconfigure_jruby_libs(jruby_core_version, with_psych=nil)
@@ -222,13 +243,15 @@ EOF
         jruby_core = JRubyJars::core_jar_path.split('/')[-1]
         Dir.chdir 'libs' do
           log_action("Removing unneeded classes from #{jruby_core}") do
-            Dir.mkdir "tmp"
-            Dir.chdir "tmp" do
+            FileUtils.rm_rf 'tmp'
+            Dir.mkdir 'tmp'
+            Dir.chdir 'tmp' do
               FileUtils.move "../#{jruby_core}", "."
               `jar -xf #{jruby_core}`
               File.delete jruby_core
               excluded_core_packages = [
-                'META-INF', 'cext', 'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware', 'ext', 'jline', 'jni',
+                'META-INF', 'cext', 'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware', 'ext', 'java',
+                '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/windows',
                 'org/apache', 'org/jruby/ant', 'org/jruby/compiler/ir', 'org/jruby/demo', 'org/jruby/embed/bsf',

data/lib/ruboto/util/xml_element.rb

@@ -176,7 +176,7 @@ module Ruboto
           convert_return = ", #{return_class}.class"
         end
 
-        rv << "#{return_cast}getRuby().callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return});"
+        rv << "#{return_cast}Script.callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return});"
         rv
       end
 
@@ -186,7 +186,7 @@ module Ruboto
           attribute("name"), parameters,
           if_else(
               "callbackProcs[#{constant_string}] != null",
-              [super_string] + try_catch(ruby_call, ["re.printStackTrace();", default_return]),
+              [super_string] + ruby_call,
               [super_return]
           )
         ).indent.join("\n")

data/lib/ruboto/version.rb

@@ -0,0 +1,3 @@
+module Ruboto
+  VERSION = '0.4.0'
+end

data/test/activity/image_button_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto'
 ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 
 $activity.handle_create do |bundle|
-  setTitle 'This is the Title'
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
   setup_content do
     linear_layout :orientation => LinearLayout::VERTICAL do

data/test/activity/image_button_and_button_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto'
 ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
 
 $activity.handle_create do |bundle|
-  setTitle 'This is the Title'
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
   setup_content do
     linear_layout :orientation => LinearLayout::VERTICAL do

data/test/activity/stack_activity.rb

@@ -0,0 +1,21 @@
+STACK_DEPTH_SCRIPT = java.lang.Thread.current_thread.stack_trace.length.to_s
+require 'ruboto'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+$activity.handle_create do |bundle|
+  STACK_DEPTH_HANDLE_CREATE = java.lang.Thread.current_thread.stack_trace.length.to_s
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  setup_content do
+    STACK_DEPTH_SETUP_CONTENT = java.lang.Thread.current_thread.stack_trace.length.to_s
+    linear_layout :orientation => LinearLayout::VERTICAL do
+      STACK_DEPTH_LINEAR_LAYOUT = java.lang.Thread.current_thread.stack_trace.length.to_s
+      @script_view        = text_view :id => 42, :text => STACK_DEPTH_SCRIPT
+      @handle_create_view = text_view :id => 43, :text => STACK_DEPTH_HANDLE_CREATE
+      @setup_content_view = text_view :id => 44, :text => STACK_DEPTH_SETUP_CONTENT
+      @linear_layout_view = text_view :id => 45, :text => STACK_DEPTH_LINEAR_LAYOUT
+    end
+  end
+
+end

data/test/activity/stack_activity_test.rb

@@ -0,0 +1,24 @@
+activity org.ruboto.test_app.StackActivity
+
+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('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],
+      '1.7.0.dev' => [ 0,  2,  5,  5],
+  }[org.jruby.runtime.Constants::VERSION] || [0,0,0,0]
+  version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, 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
+  assert_equal 96 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
+end