ruboto 1.1.2 → 1.2.0

data/test/activity/subclass_activity_test.rb

@@ -12,9 +12,11 @@ setup do |activity|
   assert @list_view
 end
 
-test('item click sets text') do |activity|
-  activity.run_on_ui_thread { @list_view.performItemClick(@list_view, 1, 1) }
-  assert_equal '[Record one]', @text_view.text
+test('item click sets text', ui: false) do |activity|
+  activity.run_on_ui_thread do
+    @list_view.performItemClick(@list_view, 1, 1)
+    assert_equal '[Record one]', @text_view.text
+  end
 end
 
 class MyObject < java.lang.Object
@@ -30,12 +32,12 @@ class MyObject < java.lang.Object
   end
 end
 
-test('add constructor with parameter') do
+test('add constructor with parameter', ui: false) do
   o = MyObject.new('It works!')
   assert_equal 'It works!', o.my_param
 end
 
-test('call instance method super') do
+test('call instance method super', ui: false) do
   o = MyObject.new('It works!')
   assert !o.equals(o)
 end
@@ -46,7 +48,7 @@ class MyJRubyAdapter < org.ruboto.JRubyAdapter
   end
 end
 
-test('call super from static subclass method') do
+test('call super from static subclass method', ui: false) do
   a = org.ruboto.JRubyAdapter
   b = MyJRubyAdapter
   assert a.isDebugBuild != b.isDebugBuild

data/test/app_test_methods.rb

@@ -38,6 +38,14 @@ module AppTestMethods
 
   def run_activity_tests(activity_dir)
     Dir[File.expand_path("#{activity_dir}/*", File.dirname(__FILE__))].each do |file|
+      # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.14
+      next if file =~ /rss/ && (JRUBY_JARS_VERSION < Gem::Version.new('1.7.14.dev'))
+      # EMXIF
+
+      # FIXME(uwe):  Remove when we release RubotoCore based on JRuby 1.7.14
+      next if file =~ /rss/ && (RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM')
+      # EMXIF
+
       # FIXME(uwe):  Remove when we stop testing api level < 16
       # FIXME(uwe):  Remove when we release RubotoCore with SSL included
       next if file =~ /ssl/ && (ANDROID_OS < 16 ||

data/test/arjdbc_test.rb

@@ -41,7 +41,7 @@ class RubotoTestAppActivity
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "\#{s[0..0].upcase}\#{s[1..-1]}" }.join(' ')
 
-    @adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , AndroidIds::text1, [])
+    @adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , android.R.id.text1, [])
 
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL do

data/test/minimal_app_test.rb

@@ -12,17 +12,18 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
-    # APK was 4.4MB.  JRuby: 1.7.4, ANDROID_TARGET: 10
-    # APK was 4.3MB.  JRuby: 1.7.4, ANDROID_TARGET: 16
-    # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 10
-    # APK was 4.2MB.  JRuby: 1.7.5, ANDROID_TARGET: 15
-    # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 16
-    # APK was 8.4MB.  JRuby: 1.7.8, ANDROID_TARGET: 10
-    # APK was 4.3MB.  JRuby: 1.7.8, ANDROID_TARGET: 16
+    # APK was 4.4MB.  JRuby: 1.7.4,  ANDROID_TARGET: 10
+    # APK was 4.3MB.  JRuby: 1.7.4,  ANDROID_TARGET: 16
+    # APK was 4.3MB.  JRuby: 1.7.5,  ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 1.7.5,  ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 1.7.5,  ANDROID_TARGET: 16
+    # APK was 8.4MB.  JRuby: 1.7.8,  ANDROID_TARGET: 10
+    # APK was 4.3MB.  JRuby: 1.7.8,  ANDROID_TARGET: 16
     # APK was 4.4MB.  JRuby: 1.7.12, ANDROID_TARGET: 19
+    # APK was 4.4MB.  JRuby: 1.7.14.SNAPSHOT, ANDROID_TARGET: 19
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
-    # APK was 4.5MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
+    # APK was 4.6MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
     def test_minimal_apk_is_within_limits
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
@@ -32,8 +33,9 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.7.10' => 4.4,
           '1.7.11' => 4.4,
           '1.7.12' => 4.4,
-          '9000.dev' => 4.5,
-      }[JRUBY_JARS_VERSION.to_s] || 4.3
+          '1.7.14.dev' => 4.4,
+          '9000.dev' => 4.6,
+      }[JRUBY_JARS_VERSION.to_s] || 4.4
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
       assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"

data/test/rake_test.rb

@@ -36,7 +36,6 @@ class RakeTest < Test::Unit::TestCase
   # source file instead of rebuilding the apk.
   def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
-      system 'rake debug'
       apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
       sleep 1
       FileUtils.touch 'src/ruboto_test_app_activity.rb'
@@ -49,7 +48,6 @@ class RakeTest < Test::Unit::TestCase
 
   def test_that_apk_is_built_if_only_one_non_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
-      system 'rake debug'
       apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
       FileUtils.touch 'src/not_ruby_source.properties'
       system 'rake debug'
@@ -61,8 +59,8 @@ class RakeTest < Test::Unit::TestCase
   def test_that_manifest_is_updated_when_project_properties_are_changed
     Dir.chdir APP_DIR do
       manifest = File.read('AndroidManifest.xml')
-      assert_equal "android:minSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:minSdkVersion='\d+'/)
-      assert_equal "android:targetSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:targetSdkVersion='\d+'/)
+      assert_equal "android:minSdkVersion='#{ANDROID_TARGET}'", manifest[/android:minSdkVersion='[^']+'/]
+      assert_equal "android:targetSdkVersion='#{ANDROID_TARGET}'", manifest[/android:targetSdkVersion='[^']+'/]
       prop_file = File.read('project.properties')
       File.open('project.properties', 'w') { |f| f << prop_file.sub(/target=android-#{ANDROID_TARGET}/, 'target=android-6') }
       system 'rake debug'

data/test/ruboto_gen_test.rb

@@ -49,7 +49,7 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
-  # APK was    59.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
+  # APK was    66.3KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
   # APK was    66.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
   # APK was    74.9KB.  PLATFORM: CURRENT, ANDROID_TARGET: 16
   # APK was    80.4KB.  PLATFORM: CURRENT, ANDROID_TARGET: 19
@@ -69,10 +69,11 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was  8793.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.11
   # APK was  9743.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.12
   # APK was  9123.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.12
+  # APK was  9745.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.14.dev
   # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
   # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
   # APK was  8015.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 9000.dev
-  # APK was  7386.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 9000.dev
+  # APK was  8232.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 9000.dev
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -87,19 +88,20 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.10' => 8800.0,
           '1.7.11' => 8800.0,
           '1.7.12' => 9800.0,
-          '9000.dev' => 8100.0,
-      }[JRUBY_JARS_VERSION.to_s] || 0.0
+          '1.7.14.dev' => 9800.0,
+          '9000.dev' => 8300.0,
+      }[JRUBY_JARS_VERSION.to_s] || 9800.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
-          10 => 66.0,
+          10 => 67.0,
           15 => 67.0,
           16 => 82.0,
           17 => 81.0,
           19 => 81.0,
       }[ANDROID_TARGET] || 75.0
     end
-    lower_limit = upper_limit * 0.7
+    lower_limit = upper_limit * 0.8
     assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"
     assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.floor(1)}KB.  You should lower the limit.#{version}"
   end
@@ -144,7 +146,7 @@ class RubotoTestAppActivity
     set_title 'ListView Example'
 
     records = [{:text1 => 'First row'}, {:image => resources.get_drawable($package.R::drawable::get_ruboto_core), :text1 => 'Second row'}, 'Third row']
-    adapter = $package.RubotoArrayAdapter.new(self, $package.R::layout::list_item, AndroidIds::text1, records)
+    adapter = $package.RubotoArrayAdapter.new(self, $package.R::layout::list_item, android.R.id.text1, records)
 puts "adapter: \#{adapter.inspect}"
     self.content_view =
         linear_layout :orientation => :vertical do
@@ -196,7 +198,7 @@ class RubotoArrayAdapter
     if convert_view
       row = convert_view
       row.findViewById(Ruboto::Id.image).image_drawable = nil
-      row.findViewById(AndroidIds.text1).text = nil
+      row.findViewById(android.R.id.text1).text = nil
     else
       row = @inflater.inflate(mResource, nil)
     end
@@ -207,7 +209,7 @@ class RubotoArrayAdapter
       model.each do |field, value|
         begin
           field_id = Ruboto::Id.respond_to?(field) && Ruboto::Id.send(field) ||
-              AndroidIds.respond_to?(field) && AndroidIds.send(field)
+              android.R.id.respond_to?(field) && android.R.id.send(field)
           field_view = row.findViewById(field_id)
           case value
           when String

data/test/service_block_test.rb

@@ -0,0 +1,112 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+require 'fileutils'
+
+class ServiceBlockTest < Test::Unit::TestCase
+  SRC_DIR = "#{APP_DIR}/src"
+
+  def setup
+    generate_app
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_service_startup
+    # FIXME(uwe):  Remove when Android L is released or service start is fixed
+    return if ANDROID_OS == 21
+    # EMXIF
+
+    Dir.chdir APP_DIR do
+      activity_filename = "#{SRC_DIR}/ruboto_test_app_activity.rb"
+      assert File.exists? activity_filename
+      File.open(activity_filename, 'w') { |f| f << <<EOF }
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/service'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class RubotoTestAppActivity
+  def onCreate(bundle)
+    super
+    $ruboto_test_app_activity = self
+    set_title 'Domo arigato, Mr Ruboto!'
+
+    self.content_view =
+        linear_layout :orientation => :vertical do
+          @text_view = text_view :text    => 'What hath Matz wrought?', :id => 42, 
+                                 :layout => {:width => :fill_parent},
+                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
+          button :text => 'M-x butterfly', :layout => {:width => :fill_parent}, 
+                 :id => 43, :on_click_listener => proc { butterfly }
+        end
+  rescue
+    puts "Exception creating activity: \#{$!}"
+    puts $!.backtrace.join("\\n")
+  end
+
+  def set_text(text)
+    @text_view.text = text
+  end
+
+  private
+
+  def butterfly
+    puts 'butterfly'
+    Thread.start do
+      begin
+        start_ruboto_service do
+          def onStartCommand(intent, flags, start_id)
+            puts "service on_start_command(\#{intent}, \#{flags}, \#{start_id})"
+            $ruboto_test_app_activity.set_title 'on_start_command'
+            $ruboto_test_app_activity.set_text 'What hath Matz wrought!'
+
+            android.app.Service::START_STICKY
+          end
+        end
+      rescue Exception
+        puts "Exception starting the service: \#{$!}"
+        puts $!.backtrace.join("\\n")
+      end
+    end
+    puts 'butterfly OK'
+  end
+
+end
+EOF
+
+      service_test_filename = "#{APP_DIR}/test/src/ruboto_test_app_activity_test.rb"
+      assert File.exists? service_test_filename
+      File.open(service_test_filename, 'w') { |f| f << <<EOF }
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test 'button changes text', :ui => false do |activity|
+  button = activity.findViewById(43)
+  puts 'Clicking...'
+  activity.run_on_ui_thread{button.performClick}
+  puts 'Clicked!'
+  start = Time.now
+  loop do
+    break if @text_view.text == 'What hath Matz wrought!' || (Time.now - start > 60)
+    sleep 1
+  end
+  assert_equal 'What hath Matz wrought!', @text_view.text
+end
+EOF
+
+    end
+    run_app_tests
+  end
+
+end

data/test/{service_test.rb → service_gen_class_test.rb}

@@ -1,7 +1,7 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
-class ServiceTest < Test::Unit::TestCase
+class ServiceGenClassTest < Test::Unit::TestCase
   SRC_DIR = "#{APP_DIR}/src"
 
   def setup
@@ -13,6 +13,10 @@ class ServiceTest < Test::Unit::TestCase
   end
 
   def test_service_startup
+    # FIXME(uwe):  Remove when Android L is released or service start is fixed
+    return if ANDROID_OS == 21
+    # EMXIF
+
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Service --name RubotoTestService"
 
@@ -21,6 +25,7 @@ class ServiceTest < Test::Unit::TestCase
       File.open(activity_filename, 'w') { |f| f << <<EOF }
 require 'ruboto/activity'
 require 'ruboto/widget'
+require 'ruboto/service'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
@@ -53,7 +58,9 @@ class RubotoTestAppActivity
     puts 'butterfly'
     Thread.start do
       begin
-        startService(android.content.Intent.new(application_context, $package.RubotoTestService.java_class))
+        puts 'activity start service...'
+        start_ruboto_service("RubotoTestService")
+        puts 'activity start service...OK'
       rescue Exception
         puts "Exception starting the service: \#{$!}"
         puts $!.backtrace.join("\\n")
@@ -68,8 +75,6 @@ EOF
       service_filename = "#{SRC_DIR}/ruboto_test_service.rb"
       assert File.exists? service_filename
       File.open(service_filename, 'w') { |f| f << <<EOF }
-require 'ruboto/service'
-
 class RubotoTestService
   TARGET_TEXT = 'What hath Matz wrought!'
 

data/test/service_infile_class_test.rb

@@ -0,0 +1,114 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+require 'fileutils'
+
+class ServiceInfileClassTest < Test::Unit::TestCase
+  SRC_DIR = "#{APP_DIR}/src"
+
+  def setup
+    generate_app
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_service_startup
+    # FIXME(uwe):  Remove when Android L is released or service start is fixed
+    return if ANDROID_OS == 21
+    # EMXIF
+
+    Dir.chdir APP_DIR do
+      activity_filename = "#{SRC_DIR}/ruboto_test_app_activity.rb"
+      assert File.exists? activity_filename
+      File.open(activity_filename, 'w') { |f| f << <<EOF }
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/service'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class RubotoServiceClass
+  def onStartCommand(intent, flags, start_id)
+    puts "service on_start_command(\#{intent}, \#{flags}, \#{start_id})"
+    $ruboto_test_app_activity.set_title 'on_start_command'
+    $ruboto_test_app_activity.set_text 'What hath Matz wrought!'
+
+    android.app.Service::START_STICKY
+  end
+end
+
+class RubotoTestAppActivity
+  def onCreate(bundle)
+    super
+    $ruboto_test_app_activity = self
+    set_title 'Domo arigato, Mr Ruboto!'
+
+    self.content_view =
+        linear_layout :orientation => :vertical do
+          @text_view = text_view :text    => 'What hath Matz wrought?', :id => 42, 
+                                 :layout => {:width => :fill_parent},
+                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
+          button :text => 'M-x butterfly', :layout => {:width => :fill_parent}, 
+                 :id => 43, :on_click_listener => proc { butterfly }
+        end
+  rescue
+    puts "Exception creating activity: \#{$!}"
+    puts $!.backtrace.join("\\n")
+  end
+
+  def set_text(text)
+    @text_view.text = text
+  end
+
+  private
+
+  def butterfly
+    puts 'butterfly'
+    Thread.start do
+      begin
+        start_ruboto_service "RubotoServiceClass"
+      rescue Exception
+        puts "Exception starting the service: \#{$!}"
+        puts $!.backtrace.join("\\n")
+      end
+    end
+    puts 'butterfly OK'
+  end
+
+end
+EOF
+
+      service_test_filename = "#{APP_DIR}/test/src/ruboto_test_app_activity_test.rb"
+      assert File.exists? service_test_filename
+      File.open(service_test_filename, 'w') { |f| f << <<EOF }
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test 'button changes text', :ui => false do |activity|
+  button = activity.findViewById(43)
+  puts 'Clicking...'
+  activity.run_on_ui_thread{button.performClick}
+  puts 'Clicked!'
+  start = Time.now
+  loop do
+    break if @text_view.text == 'What hath Matz wrought!' || (Time.now - start > 60)
+    sleep 1
+  end
+  assert_equal 'What hath Matz wrought!', @text_view.text
+end
+EOF
+
+    end
+    run_app_tests
+  end
+
+end