ruboto 1.1.2 → 1.2.0

data/lib/ruboto/util/xml_element.rb

@@ -232,9 +232,11 @@ module Ruboto
       def service_super_guard(class_name, method_name)
         if class_name == 'RubotoService'
           if method_name == 'onCreate'
-            'preOnCreate();'
-          elsif method_name == 'onStartCommand' || method_name == 'onBind'
-            '' # Trigger adding of load_script
+            "preOnCreate();\n"
+          elsif method_name == 'onStartCommand'
+            "preOnStartCommand(intent);\n"
+          elsif method_name == 'onBind'
+            "preOnBind(intent);\n"
           end
         end
       end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/call_super_activity.rb

@@ -10,8 +10,8 @@ class CallSuperActivity
     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
+        linear_layout orientation: :vertical, gravity: :center do
+          text_view id: 42, text: title, text_size: 48.0, gravity: :center
         end
   end
 

data/test/activity/constants_activity.rb

@@ -0,0 +1,51 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+import android.util.TypedValue
+
+class ConstantsActivity
+  def onCreate(bundle)
+    super
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').
+        map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+    # FIXME(uwe): Remove condition when we stop testing Android 2.3
+    if android.os.Build::VERSION::SDK_INT > 10
+      attr = android.R.attr.actionBarSize
+      tv = TypedValue.new
+      if theme.resolveAttribute(attr, tv, true)
+        action_bar_height = TypedValue.
+            complexToDimensionPixelSize(tv.data, resources.display_metrics).
+            inspect
+      else
+        action_bar_height = 'N/A'
+      end
+    else
+      action_bar_height = 'N/A'
+    end
+    # EMXIF
+
+    self.content_view = linear_layout orientation: :vertical, gravity: :center do
+      i = 41
+
+      text_view id: i += 1, hint: 'actionBarHeight', tag: action_bar_height, text: action_bar_height
+      text_view id: i += 1, hint: 'anim.fade_in', tag: '17432576', text: android.R.anim.fade_in.to_s
+
+      # FIXME(uwe): Remove condition when we stop testing Android 2.3
+      if android.os.Build::VERSION::SDK_INT > 10
+        text_view id: i += 1, hint: 'attr.actionBarSize', tag: '16843499', text: android.R.attr.actionBarSize.to_s
+        text_view id: i += 1, hint: 'color.holo_green', tag: '17170452', text: android.R.color.holo_green_light.to_s
+      end
+      # EMXIF
+
+      text_view id: i += 1, hint: 'id.text1', tag: '16908308', text: android.R.id.text1.to_s
+      text_view id: i += 1, hint: 'layout.simple_list_item1', tag: '17367043', text: android.R.layout.simple_list_item_1.to_s
+      text_view id: i += 1, hint: 'style::Theme_Dialog', tag: '16973835', text: android.R.style::Theme_Dialog.to_s
+
+      text_view id: i += 1, hint: 'R.attr', tag: 'Java::OrgRubotoTest_app::R::attr', text: R.attr.to_s
+      text_view id: i += 1, hint: 'R.layout.dummy_layout', tag: 0x7f030000.to_s, text: R.layout.dummy_layout.to_s
+      text_view id: i += 1, hint: 'R.layout.get_ruboto_core', tag: 0x7f030001.to_s, text: R.layout.get_ruboto_core.to_s
+      text_view id: i += 1, hint: 'R.id.my_text', tag: 0x7f050000.to_s, text: R.id.my_text.to_s
+    end
+  end
+end

data/test/activity/constants_activity_test.rb

@@ -0,0 +1,18 @@
+activity org.ruboto.test_app.ConstantsActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    break if activity.findViewById(42)
+    fail 'Text view not found.' if (Time.now - start > 60)
+    sleep 0.5
+  end
+end
+
+test('R inner class constants') do |activity|
+  layout = activity.findViewById(android.R.id.content).get_child_at(0)
+  layout.child_count.times do |n|
+    child = layout.get_child_at(n)
+    assert_equal child.tag, child.text, child.hint
+  end
+end

data/test/activity/margins_activity.rb

@@ -5,13 +5,18 @@ ruboto_import_widgets :LinearLayout, :TextView
 class MarginsActivity
   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 => 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
+    self.content_view = linear_layout orientation: :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_layout = text_view text: 'What hath Matz wrought?', id: 44,
+          layout: {margins: [100, 0, 0, 0]}
+      @text_view_fieldset = text_view text: 'What hath Matz wrought?', id: 45,
+          layout: {left_margin: 100}
+    end
   end
 end

data/test/activity/margins_activity_test.rb

@@ -4,13 +4,17 @@ 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)
+    @text_view_layout_setter = activity.findViewById(43)
+    @text_view_layout_attribute_setter = activity.findViewById(44)
+    @text_view_fieldset = activity.findViewById(45)
+    break if (@text_view_margins && @text_view_layout_setter &&
+        @text_view_layout_attribute_setter && @text_view_fieldset) ||
+        (Time.now - start > 60)
     sleep 1
   end
   assert @text_view_margins
-  assert @text_view_layout
+  assert @text_view_layout_setter
+  assert @text_view_layout_attribute_setter
   assert @text_view_fieldset
 end
 
@@ -18,8 +22,8 @@ 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|  
+%w(margins layout_setter layout_attribute_setter 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/padding_activity.rb

@@ -0,0 +1,15 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class PaddingActivity
+  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 id: 41, padding: [10, 20, 30, 40] do
+      text_view text: 'Text with padding', id: 42, padding: [1, 2, 4, 8]
+    end
+  end
+end

data/test/activity/padding_activity_test.rb

@@ -0,0 +1,41 @@
+activity Java::org.ruboto.test_app.PaddingActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @layout = activity.findViewById(41)
+    @text_view = activity.findViewById(42)
+    break if (@layout && @text_view) || Time.now - start > 60
+    sleep 0.5
+  end
+  assert @layout
+  assert @text_view
+end
+
+test('padding is set') do |activity|
+  assert_equal 40, @layout.padding_bottom
+
+  # FIXME(uwe): Remove condition when we stop testing api level < 17
+  assert_equal(30, @layout.padding_end) if android.os.Build::VERSION::SDK_INT >= 17
+
+  assert_equal 10, @layout.padding_left
+  assert_equal 30, @layout.padding_right
+
+  # FIXME(uwe): Remove condition when we stop testing api level < 17
+  assert_equal(10, @layout.padding_start) if android.os.Build::VERSION::SDK_INT >= 17
+
+  assert_equal 20, @layout.padding_top
+
+  assert_equal 8, @text_view.padding_bottom
+
+  # FIXME(uwe): Remove condition when we stop testing api level < 17
+  assert_equal(4, @text_view.padding_end) if android.os.Build::VERSION::SDK_INT >= 17
+
+  assert_equal 1, @text_view.padding_left
+  assert_equal 4, @text_view.padding_right
+
+  # FIXME(uwe): Remove condition when we stop testing api level < 17
+  assert_equal(1, @text_view.padding_start) if android.os.Build::VERSION::SDK_INT >= 17
+
+  assert_equal 2, @text_view.padding_top
+end

data/test/activity/rss_activity.rb

@@ -0,0 +1,42 @@
+require 'ruboto/util/stack'
+require 'rss'
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+class RssActivity
+  attr_reader :list
+
+  def onCreate(bundle)
+    super
+    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').
+        map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+    @list = []
+    self.content_view = linear_layout orientation: :vertical, gravity: :center do
+      @status = text_view id: 42, text: 'Activity created...'
+      @list_view = list_view id: 43, list: @list
+    end
+  end
+
+  def onResume
+    super
+    @status.text = 'Resuming activity...'
+    Thread.with_large_stack do
+      begin
+        run_on_ui_thread { @status.text = 'Started update thread...' }
+        subjects = []
+        rss = RSS::Parser.parse('http://www.feedforall.com/sample.xml')
+        rss.items.each do |item|
+          subject = item.title.to_s
+          subjects << subject
+        end
+        run_on_ui_thread { @list_view.adapter.add_all subjects }
+        run_on_ui_thread { @status.text = 'List updated' }
+      rescue Exception
+        msg = "#{$!.message}\n#{$!.backtrace.join("\n")}"
+        run_on_ui_thread { @status.text = "Thread: Exception: #{msg}" }
+      end
+    end
+    @status.text = 'Resume...OK'
+  end
+end

data/test/activity/rss_activity_test.rb

@@ -0,0 +1,35 @@
+activity org.ruboto.test_app.RssActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    @list_view = activity.findViewById(43)
+    break if (@text_view && @list_view) || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view && @list_view
+end
+
+test('fetch rss feed', ui: false) do |activity|
+  start = Time.now
+  loop do
+    break if activity.findViewById(42).text.to_s == 'List updated'
+    break if Time.now - start > 90
+    sleep 0.5
+  end
+  assert_equal 'List updated', activity.findViewById(42).text.to_s
+  # assert_equal [],activity.findViewById(43).adapter.list.to_a
+  assert_equal [
+          "RSS Solutions for Restaurants",
+          "RSS Solutions for Schools and Colleges",
+          "RSS Solutions for Computer Service Companies",
+          "RSS Solutions for Governments",
+          "RSS Solutions for Politicians",
+          "RSS Solutions for Meteorologists",
+          "RSS Solutions for Realtors & Real Estate Firms",
+          "RSS Solutions for Banks / Mortgage Companies",
+          "RSS Solutions for Law Enforcement"
+      ],
+      activity.list
+end

data/test/activity/spinner_activity.rb

@@ -17,7 +17,7 @@ class SpinnerActivity
           spinner :layout => {:width => :match_parent}, :id => 42
           plain_spinner = spinner :layout => {:width => :match_parent}, :id => 43,
                                   :on_item_selected_listener => click_handler
-          plain_spinner.adapter = android.widget.ArrayAdapter.new(self, R::layout::simple_spinner_item)
+          plain_spinner.adapter = android.widget.ArrayAdapter.new(self, android.R::layout::simple_spinner_item)
 
           # FIXME(uwe): Simplify when we stop supporting Android < 4.0.3
           if android.os.Build::VERSION::SDK_INT < 11
@@ -31,19 +31,19 @@ class SpinnerActivity
 
           spinner :layout => {:width => :match_parent}, :id => 44,
                   :on_item_selected_listener => click_handler,
-                  :adapter => android.widget.ArrayAdapter.new(self, R::layout::simple_spinner_item, ['Adapter Spinner', 'Adapter Item'])
+                  :adapter => android.widget.ArrayAdapter.new(self, android.R::layout::simple_spinner_item, ['Adapter Spinner', 'Adapter Item'])
           spinner :layout => {:width => :match_parent}, :id => 45  ,
                   :on_item_selected_listener => click_handler,
                   :list => ['List Spinner', 'List Item']
           spinner :layout => {:width => :match_parent}, :id => 46  ,
                   :on_item_selected_listener => click_handler,
                   :list => ['List Spinner', 'List Item'],
-                  :item_layout => R::layout::simple_spinner_dropdown_item
+                  :item_layout => android.R::layout::simple_spinner_dropdown_item
           spinner :layout => {:width => :match_parent}, :id => 47  ,
                   :on_item_selected_listener => click_handler,
                   :list => ['List Spinner', 'List Item'],
-                  :item_layout => R::layout::simple_spinner_dropdown_item,
-                  :dropdown_layout => R::layout::simple_spinner_item
+                  :item_layout => android.R::layout::simple_spinner_dropdown_item,
+                  :dropdown_layout => android.R::layout::simple_spinner_item
           @text_view = text_view :text => 'Spinning?', :id => 69, 
                                  :layout => {:width => :match_parent},
                                  :gravity => :center, :text_size => 48.0

data/test/activity/spinner_activity_test.rb

@@ -33,18 +33,18 @@ 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 android.R::layout::simple_spinner_item, spinner.adapter.mResource
+    assert_equal android.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 android.R::layout::simple_spinner_dropdown_item, spinner.adapter.mResource
+    assert_equal android.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 android.R::layout::simple_spinner_dropdown_item, spinner.adapter.mResource
+    assert_equal android.R::layout::simple_spinner_item, spinner.adapter.mDropDownResource
     assert_equal 0, spinner.adapter.mFieldId
   end
 end

data/test/activity/stack_activity.rb

@@ -1,7 +1,5 @@
 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/widget'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
@@ -11,15 +9,16 @@ class StackActivity
   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(' ')
+    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
+        linear_layout orientation: :vertical, gravity: :center do
           stack_depth_linear_layout = java.lang.Thread.current_thread.stack_trace.length.to_s
-          text_view :id => 42, :text => STACK_DEPTH_SCRIPT, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
-          text_view :id => 43, :text => STACK_DEPTH_CLASS, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
-          text_view :id => 44, :text => stack_depth_on_create, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
-          text_view :id => 45, :text => stack_depth_linear_layout, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view id: 42, text: STACK_DEPTH_SCRIPT, text_size: 48.0, gravity: :center
+          text_view id: 43, text: STACK_DEPTH_CLASS, text_size: 48.0, gravity: :center
+          text_view id: 44, text: stack_depth_on_create, text_size: 48.0, gravity: :center
+          text_view id: 45, text: stack_depth_linear_layout, text_size: 48.0, gravity: :center
         end
   end
 end

data/test/activity/stack_activity_test.rb

@@ -10,15 +10,17 @@ setup do |activity|
   assert @text_view
 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.5.6,      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]'
+# 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: 15, PLATFORM: STANDALONE, JRuby: 1.7.0    '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
+# ANDROID: 16, PLATFORM: 0.5.6,      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: 20, PLATFORM: 1.0.2,      JRuby: 1.7.12   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
 test('stack depth') do |activity|
   os_offset = {
       10 => [0, 0, -1, -1],
       13 => [1, 1, 0, 0],
+      20 => [0, 0, -1, -1],
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
   jruby_offset = {
       /^1\.7/ => [0, 0, 0, -1],

data/test/activity/subclass_activity.rb

@@ -16,7 +16,7 @@ class SubclassOfArrayAdapter < Java::AndroidWidget::ArrayAdapter
 end
 
 class Java::AndroidWidget::ArrayAdapter
-   field_reader :mResource, :mFieldId
+  field_reader :mResource, :mFieldId
 end
 
 class SubclassActivity
@@ -24,13 +24,13 @@ class SubclassActivity
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
-    adapter = SubclassOfArrayAdapter.new(self, android.R.layout.simple_list_item_1, AndroidIds::text1, ['Record one', 'Record two'])
+    adapter = SubclassOfArrayAdapter.new(self, android.R.layout.simple_list_item_1, android.R.id.text1, ['Record one', 'Record two'])
 
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL do
-          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
-          @list_view = list_view :adapter => adapter, :id => 43,
-              :on_item_click_listener => proc{|_,view,_,_| @text_view.text = view.findViewById(AndroidIds::text1).text}
+          @text_view = text_view text: 'What hath Matz wrought?', id: 42
+          @list_view = list_view adapter: adapter, id: 43,
+              on_item_click_listener: ->(_, view, _, _) { @text_view.text = view.findViewById(android.R.id.text1).text }
         end
   end
 end