ruboto 0.7.0 → 0.8.0

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/test/activity/call_super_activity.rb

@@ -0,0 +1,28 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class CallSuperActivity
+  def on_create(bundle)
+    super
+    setTitle 'Default'
+    setTitle 'With Super', true
+    setTitle 'Without Super', false
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => android.view.Gravity::CENTER do
+          text_view :id => 42, :text => title, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        end
+  end
+
+  def setTitle(title, call_super = true)
+    super(title) if call_super
+  end
+
+  # FIXME(uwe):  We should test that super is not called implicitly
+  # def on_resume
+  #   super
+  # end
+
+end

data/test/activity/call_super_activity_test.rb

@@ -0,0 +1,15 @@
+activity org.ruboto.test_app.CallSuperActivity
+
+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 'With Super', activity.find_view_by_id(42).text.to_s
+end

data/test/activity/image_button_activity.rb

@@ -1,10 +1,9 @@
-require 'ruboto/activity'
+require 'ruboto/util/toast'
+require 'ruboto/widget'
 
 ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 
 class ImageButtonActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
     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

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

data/test/activity/margins_activity.rb

@@ -0,0 +1,17 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class MarginsActivity
+  def on_create(bundle)
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view_margins = text_view :text => 'What hath Matz wrought?', :id => 42, :margins => [100,0,0,0]
+          @text_view_layout = text_view :text => 'What hath Matz wrought?', :id => 43, :layout => {:set_margins => [100,0,0,0]}
+          @text_view_fieldset = text_view :text => 'What hath Matz wrought?', :id => 44, :layout => {:left_margin= => 100}
+        end
+  end
+end

data/test/activity/margins_activity_test.rb

@@ -0,0 +1,25 @@
+activity Java::org.ruboto.test_app.MarginsActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view_margins = activity.findViewById(42)
+    @text_view_layout = activity.findViewById(43)
+    @text_view_fieldset = activity.findViewById(44)
+    break if (@text_view_margins && @text_view_layout && @text_view_fieldset) || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view_margins
+  assert @text_view_layout
+  assert @text_view_fieldset
+end
+
+def left_margin(view)
+  view.get_layout_params.leftMargin
+end
+
+%w(margins layout fieldset).each do |view_type|
+  test("margins are set through #{view_type}") do |activity|  
+    assert_equal 100, left_margin(instance_variable_get("@text_view_#{view_type}"))
+  end
+end

data/test/activity/navigation_activity.rb

@@ -0,0 +1,85 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class NavigationActivity
+  def on_create(bundle)
+    set_title 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 => :center_horizontal do
+          text_view :text => 'What hath Matz wrought?', :id => 42, :width => :match_parent,
+                    :gravity => :center, :text_size => 48.0
+          button :text => 'Next by Java class', :width => :match_parent, :id => 43, :on_click_listener => proc { start_next_java_activity }
+          button :text => 'Next by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { start_next_ruby_activity }
+          button :text => 'Next by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { start_activity_by_script_name }
+          button :text => 'Inline block', :width => :match_parent, :id => 46, :on_click_listener => proc { start_inline_activity }
+          button :text => 'Infile class', :width => :match_parent, :id => 47, :on_click_listener => proc { start_infile_activity }
+        end
+  end
+
+  private
+
+  def start_next_java_activity
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.test_app.NavigationActivity')
+    startActivity(i)
+  end
+
+  def start_next_ruby_activity
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
+    configBundle = android.os.Bundle.new
+    configBundle.put_string('ClassName', 'NavigationActivity')
+    i.putExtra('RubotoActivity Config', configBundle)
+    startActivity(i)
+  end
+
+  def start_activity_by_script_name
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
+    configBundle = android.os.Bundle.new
+    configBundle.put_string('Script', 'navigation_activity.rb')
+    i.putExtra('RubotoActivity Config', configBundle)
+    startActivity(i)
+  end
+
+  def start_inline_activity
+    start_ruboto_activity('$inline_activity') do
+      def on_create(bundle)
+        set_title 'Inline Activity'
+
+        self.content_view =
+            linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+              text_view :text => 'This is an inline activity.', :id => 42, :width => :match_parent,
+                        :gravity => :center, :text_size => 48.0
+            end
+      end
+    end
+  end
+
+  def start_infile_activity
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
+    configBundle = android.os.Bundle.new
+    configBundle.put_string('ClassName', 'InfileActivity')
+    i.putExtra('RubotoActivity Config', configBundle)
+    startActivity(i)
+  end
+
+end
+
+class InfileActivity
+  include Ruboto::Activity
+
+  def on_create(bundle)
+    set_title 'Infile Activity'
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+          text_view :text => 'This is an infile activity.', :id => 42, :width => :match_parent,
+                    :gravity => :center, :text_size => 48.0
+        end
+  end
+end

data/test/activity/navigation_activity_test.rb

@@ -0,0 +1,98 @@
+activity Java::org.ruboto.test_app.NavigationActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.find_view_by_id(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test('button starts Java activity', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  monitor = add_monitor('org.ruboto.test_app.NavigationActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(43).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    assert current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  ensure
+    puts "Removing monitor"
+    removeMonitor(monitor)
+  end
+end
+
+test('button starts Ruby activity', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(44).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    assert current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  ensure
+    puts "Removing monitor"
+    removeMonitor(monitor)
+  end
+end
+
+test('button starts activity by script name', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(45).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    assert current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  ensure
+    puts "Removing monitor"
+    removeMonitor(monitor)
+  end
+end
+
+test('button starts inline activity', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  activity.run_on_ui_thread { activity.find_view_by_id(46).perform_click }
+  start = Time.now
+  loop do
+    @text_view = activity.find_view_by_id(42)
+    break if (@text_view && @text_view.text == 'This is an inline activity.') || (Time.now - start > 10)
+    puts 'wait for text'
+    sleep 0.5
+  end
+  assert @text_view
+  assert_equal 'This is an inline activity.', @text_view.text
+end
+
+test('button starts infile class activity', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(47).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+  ensure
+    removeMonitor(monitor)
+  end
+  assert current_activity
+  puts "new activity: #{current_activity}"
+  start = Time.now
+  loop do
+    @text_view = current_activity.find_view_by_id(42)
+    break if @text_view || (Time.now - start > 10)
+    puts 'wait for text'
+    sleep 1
+  end
+  assert @text_view
+  assert_equal 'This is an infile activity.', @text_view.text
+  current_activity.run_on_ui_thread { current_activity.finish }
+  # FIXME(uwe):  Replace sleep with proper monitor
+  sleep 3
+end

data/test/activity/option_menu_activity.rb

@@ -5,8 +5,6 @@ require 'ruboto/util/toast'
 ruboto_import_widgets :LinearLayout, :TextView
 
 class OptionMenuActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 

data/test/activity/psych_activity.rb

@@ -8,18 +8,17 @@ if RUBY_VERSION < '1.9'
 end
 # TODO end
 
-require 'ruboto/activity'
 require 'ruboto/util/stack'
 with_large_stack { require 'psych.rb' }
 
 Psych::Parser
 Psych::Handler
 
+require 'ruboto/widget'
+
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class PsychActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
     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/stack_activity.rb

@@ -1,13 +1,14 @@
 STACK_DEPTH_SCRIPT = java.lang.Thread.current_thread.stack_trace.length.to_s
 
+raise "Stack level: #{STACK_DEPTH_SCRIPT}" rescue puts $!.backtrace.join("\n")
+
 require 'ruboto/activity'
+require 'ruboto/widget'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class StackActivity
   STACK_DEPTH_CLASS = java.lang.Thread.current_thread.stack_trace.length.to_s
-  include Ruboto::Activity
-
   def on_create(bundle)
     stack_depth_on_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(' ')

data/test/activity/stack_activity_test.rb

@@ -15,18 +15,20 @@ test('stack depth') do |activity|
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
         '0.4.7' => [0, 0, 0, 0],
-        '0.4.8.dev' => [0, 0, 0, 0],
+        '0.4.8.dev' => [0, 0, -4, -4],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.dev' => [1, 1, 1, 1],
-        '1.7.0.preview1' => [0, -1, -1, -1],
-        '1.7.0.preview2.dev' => [0, 0, 0, 0],
+        '1.7.0.preview2' => [0, 0, -4, -4],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   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 43 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message
-  assert_equal 48 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
-  assert_equal 46 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message
-  assert_equal 79 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
+  assert_equal [43 + os_offset + jruby_offset[0],
+                48 + os_offset + jruby_offset[1],
+                49 + os_offset + jruby_offset[2],
+                66 + os_offset + 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/block_def_activity/margins_activity.rb

@@ -0,0 +1,17 @@
+require 'ruboto'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+$activity.start_ruboto_activity do
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  def on_create(bundle)
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view_margins = text_view :text => 'What hath Matz wrought?', :id => 42, :margins => [100,0,0,0]
+          @text_view_layout = text_view :text => 'What hath Matz wrought?', :id => 43, :layout => {:set_margins => [100,0,0,0]}
+          @text_view_fieldset = text_view :text => 'What hath Matz wrought?', :id => 44, :layout => {:left_margin= => 100}
+        end
+  end
+end
+

data/test/block_def_activity/margins_activity_test.rb

@@ -0,0 +1,25 @@
+activity Java::org.ruboto.test_app.MarginsActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view_margins = activity.findViewById(42)
+    @text_view_layout = activity.findViewById(43)
+    @text_view_fieldset = activity.findViewById(44)
+    break if @text_view_margins || @text_view_layout || @text_view_fieldset || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view_margins
+  assert @text_view_layout
+  assert @text_view_fieldset
+end
+
+def left_margin(view)
+  view.get_layout_params.leftMargin
+end
+
+%w(margins layout fieldset).each do |view_type|
+  test("margins are set through #{view_type}") do |activity|  
+    assert_equal 100, left_margin(instance_variable_get("@text_view_#{view_type}"))
+  end
+end

data/test/block_def_activity/option_menu_activity_test.rb

@@ -13,6 +13,5 @@ end
 test('option_menu changes text') do |activity|
   assert_equal "What hath Matz wrought?", @text_view.text
   activity.window.performPanelIdentifierAction(android.view.Window::FEATURE_OPTIONS_PANEL, 0, 0)
-  # FIXME(rscottm): Does not work in Ruby 1.9 mode
-  assert_equal("What hath Matz wrought!", @text_view.text) if RUBY_VERSION < '1.9'
+  assert_equal("What hath Matz wrought!", @text_view.text)
 end

data/test/block_def_activity/stack_activity_test.rb

@@ -20,12 +20,15 @@ test('stack depth') do |activity|
   else # STANDALONE
     jruby_offset = {
         '1.7.0.preview1' => [0, -1, -1, -1],
-        '1.7.0.preview2.dev' => [0, -1, 0, 0],
+        '1.7.0.preview2' => [0, -1, 0, 0],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   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 43 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message
-  assert_equal 78 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
-  assert_equal 61 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message
-  assert_equal 78 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
+  assert_equal [43 + os_offset + jruby_offset[0],
+                78 + os_offset + jruby_offset[1],
+                61 + os_offset + jruby_offset[2],
+                78 + os_offset + 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