ruboto 0.10.1 → 0.10.2.rc.0

data/lib/ruboto/version.rb

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

data/test/activity/call_super_activity.rb

@@ -1,10 +1,9 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 
-ruboto_import_widgets :Button, :LinearLayout, :TextView
+ruboto_import_widgets :LinearLayout, :TextView
 
 class CallSuperActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     setTitle 'Default'
     setTitle 'With Super', true

data/test/activity/dir_and_file_activity.rb

@@ -0,0 +1,18 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class DirAndFileActivity
+  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 do
+          text_view :id => 42, :text => __FILE__
+          text_view :id => 43, :text => File.dirname(__FILE__)
+          text_view :id => 44, :text => Dir["#{File.dirname(__FILE__)}/*"][0].to_s
+          text_view :id => 45, :text => Dir.foreach(File.dirname(__FILE__)).to_a[2].to_s
+        end
+  end
+end

data/test/activity/dir_and_file_activity_test.rb

@@ -0,0 +1,20 @@
+activity org.ruboto.test_app.DirAndFileActivity
+
+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('__FILE__ is set OK') do |activity|
+  assert_matches %r{jar:file:/data/app/org.ruboto.test_app-[12].apk!/dir_and_file_activity.rb},
+                 activity.find_view_by_id(42).text.to_s
+  assert_matches %r{jar:file:/data/app/org.ruboto.test_app-[12].apk!},
+                 activity.find_view_by_id(43).text.to_s
+  assert_matches %r{file:/data/app/org.ruboto.test_app-[12].apk!/AndroidManifest.xml},
+                 activity.find_view_by_id(44).text.to_s
+end

data/test/activity/image_button_and_button_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 
 ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
@@ -10,12 +9,12 @@ class ImageButtonAndButtonActivity
 
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER_HORIZONTAL do
-          @text_view = text_view :text  => 'What hath Matz wrought?', :id => 42, :text_size => 48.0,
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :text_size => 48.0,
                                  :width => :fill_parent, :gravity => android.view.Gravity::CENTER
-          button :text              => 'Button', :id => 44, :text_size => 48.0,
-                 :width             => :fill_parent, :gravity => android.view.Gravity::CENTER,
+          button :text => 'Button', :id => 44, :text_size => 48.0,
+                 :width => :fill_parent, :gravity => android.view.Gravity::CENTER,
                  :on_click_listener => proc { @text_view.text = 'Button pressed' }
-          image_button :image_resource    => $package.R::drawable::get_ruboto_core, :id => 43, :width => :wrap_content,
+          image_button :image_resource => $package.R::drawable::get_ruboto_core, :id => 43, :width => :wrap_content,
                        :on_click_listener => proc { @text_view.text = 'Image button pressed' }
         end
   end

data/test/activity/json_activity.rb

@@ -0,0 +1,21 @@
+require 'ruboto/util/stack'
+with_large_stack { require 'json' }
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class JsonActivity
+  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 =
+        linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER do
+          text_view :id => 42, :text => with_large_stack { JSON.load('["foo"]')[0] },
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view :id => 43, :text => with_large_stack { JSON.dump(['foo']) },
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view :id => 44, :text => with_large_stack { 'foo'.to_json },
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        end
+  end
+end

data/test/activity/json_activity_test.rb

@@ -0,0 +1,17 @@
+activity org.ruboto.test_app.JsonActivity
+
+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('json encode decode') do |activity|
+  assert_equal 'foo', activity.find_view_by_id(42).text.to_s
+  assert_equal '["foo"]', activity.find_view_by_id(43).text.to_s
+  assert_equal '"foo"', activity.find_view_by_id(44).text.to_s
+end

data/test/activity/location_activity.rb

@@ -0,0 +1,30 @@
+require 'ruboto/widget'
+
+java_import android.location.Location
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class LocationActivity
+  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 =
+        linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER do
+          @distance_text = text_view :id => 42,
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          @start_bearing_text = text_view :id => 43,
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          @end_bearing_text = text_view :id => 44,
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        end
+  end
+
+  def onResume
+    super
+    result = Array.new(3, 0.0).to_java(:float)
+    Location.distanceBetween(59.0, 11.0, 59.1, 11.1, result)
+    @distance_text.text = result[0].to_s
+    @start_bearing_text.text = result[1].to_s
+    @end_bearing_text.text = result[2].to_s
+  end
+end

data/test/activity/location_activity_test.rb

@@ -0,0 +1,17 @@
+activity org.ruboto.test_app.LocationActivity
+
+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('distanceBetween') do |activity|
+  assert_equal '12531.119140625', activity.find_view_by_id(42).text.to_s
+  assert_equal '27.2149505615234', activity.find_view_by_id(43).text.to_s
+  assert_equal '27.3007125854492', activity.find_view_by_id(44).text.to_s
+end

data/test/activity/margins_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 
 ruboto_import_widgets :LinearLayout, :TextView

data/test/activity/option_menu_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 require 'ruboto/util/toast'
 

data/test/activity/psych_activity.rb

@@ -9,14 +9,20 @@ end
 # ODOT
 
 require 'ruboto/util/stack'
-with_large_stack { require 'psych.rb' }
+with_large_stack {require 'psych'}
+
+# TODO(uwe): Remove when we stop supporting psych with Ruby 1.8 mode
+if RUBY_VERSION < '1.9'
+  $LOAD_PATH.delete File.join(Config::CONFIG['libdir'], 'ruby/1.9')
+end
+# ODOT
 
 Psych::Parser
 Psych::Handler
 
 require 'ruboto/widget'
 
-ruboto_import_widgets :Button, :LinearLayout, :TextView
+ruboto_import_widgets :LinearLayout, :TextView
 
 class PsychActivity
   def on_create(bundle)

data/test/activity/ssl_activity.rb

@@ -0,0 +1,31 @@
+require 'ruboto/util/stack'
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class SslActivity
+  def onCreate(bundle)
+    super
+    puts 'start thread'
+    @thread = Thread.with_large_stack { require 'net/https' }
+    puts 'thread started'
+    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 => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER do
+          @text_view = text_view :id => 42, :text => 'net/https loading...',
+                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        end
+  end
+
+  def onResume
+    super
+    puts 'on resume my lord'
+    Thread.start do
+      puts 'joining thread'
+      @thread.join
+      puts 'thread joined'
+      run_on_ui_thread{@text_view.text = 'net/https loaded OK!'}
+      puts 'text updated'
+    end
+  end
+end

data/test/activity/ssl_activity_test.rb

@@ -0,0 +1,22 @@
+activity org.ruboto.test_app.SslActivity
+
+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('load net/https', :ui => false) do |activity|
+  start = Time.now
+  expected = 'net/https loaded OK'
+  loop do
+    result = activity.run_on_ui_thread { activity.find_view_by_id(42).text.to_s }
+    break if result == expected || (Time.now - start > 120)
+    sleep 5
+  end
+  assert_equal expected, result
+end

data/test/activity/stack_activity.rb

@@ -2,7 +2,6 @@ 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

data/test/activity/stack_activity_test.rb

@@ -15,9 +15,8 @@ end
 # ANDROID: 16, PLATFORM: 0.4.8.dev, JRuby: 1.7.0.preview2 '[29, 34, 47, 64]' expected, but got '[28, 33, 47, 64]'
 test('stack depth') do |activity|
   os_offset = {
-      13 => [1]*4,
-      15 => [0, 0, 1, 1],
-      16 => [0, 0, 1, 1],
+      10 => [0, 0, -1, -1],
+      13 => [1, 1, 0, 0],
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
@@ -32,8 +31,8 @@ test('stack depth') do |activity|
   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 [28 + os_offset[0] + jruby_offset[0],
                 33 + os_offset[1] + jruby_offset[1],
-                46 + os_offset[2] + jruby_offset[2],
-                63 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
+                47 + os_offset[2] + jruby_offset[2],
+                64 + os_offset[3] + 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

data/test/activity/subclass_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 
 ruboto_import_widgets :LinearLayout, :ListView, :TextView

data/test/activity/view_constants_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView

data/test/app_test_methods.rb

@@ -1,4 +1,4 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 module AppTestMethods
   include RubotoTest
@@ -6,8 +6,8 @@ module AppTestMethods
   def test_activity_tests
     if ENV['ACTIVITY_TEST_PATTERN']
       Dir.chdir APP_DIR do
-        FileUtils.rm "src/ruboto_test_app_activity.rb"
-        FileUtils.rm "test/src/ruboto_test_app_activity_test.rb"
+        FileUtils.rm 'src/ruboto_test_app_activity.rb'
+        FileUtils.rm 'test/src/ruboto_test_app_activity_test.rb'
       end
     else
       assert_code 'Base64Loads', "require 'base64'"
@@ -30,7 +30,7 @@ module AppTestMethods
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
       s = File.read(filename)
-      raise "Code injection failed!" unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")
+      raise 'Code injection failed!' unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")
       File.open(filename, 'w') { |f| f << s }
     end
   end
@@ -39,6 +39,19 @@ module AppTestMethods
     Dir[File.expand_path("#{activity_dir}/*", File.dirname(__FILE__))].each do |file|
       # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.0.rc1
       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
+
+      # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.4.dev
+      next if file =~ /dir_and_file/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.4.dev'))
+      # EMXIF
 
       if file =~ /_test.rb$/
         next unless file =~ /#{ENV['ACTIVITY_TEST_PATTERN']}/
@@ -47,8 +60,8 @@ module AppTestMethods
         activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join
         Dir.chdir APP_DIR do
           system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}"
-          FileUtils.cp "#{snake_name}.rb", "src/"
-          FileUtils.cp file, "test/src/"
+          FileUtils.cp "#{snake_name}.rb", 'src/'
+          FileUtils.cp file, 'test/src/'
         end
       elsif !File.exists? "#{file.chomp('.rb')}'_test.rb'"
         Dir.chdir APP_DIR do

data/test/minimal_app_test.rb

@@ -13,13 +13,13 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
-    # APK was larger than 3.2MB: 3.5MB.  JRuby: 1.6.7,          ANDROID_TARGET: 15.
-    # APK was larger than 3.2MB: 3.3MB.  JRuby: 1.6.7.2,        ANDROID_TARGET: 10.
-    # APK was larger than 4.4MB: 4.7MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 10.
-    # APK was larger than 4.6MB: 4.9MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 15.
-    # APK was larger than 3.2MB: 4.7MB.  JRuby: 1.7.0,          ANDROID_TARGET: 15.
-    # APK was larger than 4.9MB: 7.2MB.  JRuby: 1.7.2.dev,      ANDROID_TARGET: 10.
-
+    # APK was 3.5MB.  JRuby: 1.6.7,     ANDROID_TARGET: 15.
+    # APK was 3.3MB.  JRuby: 1.6.7.2,   ANDROID_TARGET: 10.
+    # APK was 4.7MB.  JRuby: 1.7.0,     ANDROID_TARGET: 15.
+    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 10.
+    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 15.
+    # APK was 4.6MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 10.
+    # APK was 4.5MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 15.
     def test_minimal_apk_is_less_than_3_mb
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
@@ -27,9 +27,9 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.6.7.2' => 3.5,
           '1.6.8' => 3.5,
           '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.1.dev' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.2.dev' => 7.2,
-      }[JRUBY_JARS_VERSION.to_s] || 4.9
+          '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+          '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
+      }[JRUBY_JARS_VERSION.to_s] || 4.7
       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

@@ -1,4 +1,4 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class RakeTest < Test::Unit::TestCase
   def setup
@@ -11,18 +11,18 @@ class RakeTest < Test::Unit::TestCase
 
   # FIXME(uwe): Remove condition when we stop supporting android-7
   if ANDROID_OS == 7
-    puts "Skipping sdcard test since files on sdcard are not removed on android-7 on app uninstall"
+    puts 'Skipping sdcard test since files on sdcard are not removed on android-7 on app uninstall'
   else
     def test_that_update_scripts_task_copies_files_to_sdcard_and_are_read_by_activity
       Dir.chdir APP_DIR do
-        activity_filename = "src/ruboto_test_app_activity.rb"
+        activity_filename = 'src/ruboto_test_app_activity.rb'
         s = File.read(activity_filename)
-        s.gsub!(/What hath Matz wrought\?/, "This text was changed by script!")
+        s.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
         File.open(activity_filename, 'w') { |f| f << s }
 
-        test_filename = "test/src/ruboto_test_app_activity_test.rb"
+        test_filename = 'test/src/ruboto_test_app_activity_test.rb'
         s2 = File.read(test_filename)
-        s2.gsub!(/What hath Matz wrought\?/, "This text was changed by script!")
+        s2.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
         File.open(test_filename, 'w') { |f| f << s2 }
 
         apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
@@ -41,7 +41,7 @@ class RakeTest < Test::Unit::TestCase
     Dir.chdir APP_DIR do
       system 'rake install'
       apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
-      FileUtils.touch "src/ruboto_test_app_activity.rb"
+      FileUtils.touch 'src/ruboto_test_app_activity.rb'
       system 'rake install'
       assert_not_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should have been rebuilt'
     end
@@ -53,7 +53,7 @@ class RakeTest < Test::Unit::TestCase
       assert_equal "android:minSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:minSdkVersion='\d+'/)
       assert_equal "android:targetSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:targetSdkVersion='\d+'/)
       prop_file = File.read('project.properties')
-      File.open('project.properties', 'w'){|f| f << prop_file.sub(/target=android-#{ANDROID_TARGET}/, "target=android-6")}
+      File.open('project.properties', 'w'){|f| f << prop_file.sub(/target=android-#{ANDROID_TARGET}/, 'target=android-6')}
       system 'rake debug'
       manifest = File.read('AndroidManifest.xml')
       assert_equal "android:minSdkVersion='6'", manifest.slice(/android:minSdkVersion='\d+'/)