ruboto 1.2.0 → 1.3.0

data/assets/rakelib/ruboto.stdlib.rake

@@ -163,7 +163,7 @@ def remove_unneeded_parts_of_stdlib
     end
 
     # Corrects bug in krypt that loads FFI.
-    # Only affects JRuby 1.7.11, 1.7.12, and 9000 (until fixed).
+    # Only affects JRuby 1.7.11, 1.7.12, and 9.0.0.0 (until fixed).
     # FIXME(uwe):  Remove when we stop supporting JRuby 1.7.11 and 1.7.12
     Dir['**/provider.rb'].each do |f|
       print "patching #{f}..."

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -126,6 +126,7 @@ public class JRubyAdapter {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static synchronized boolean setUpJRuby(Context appContext, PrintStream out) {
         if (!initialized) {
+            Log.d("Max memory: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + "MB");
             // BEGIN Ruboto HeapAlloc
             // @SuppressWarnings("unused")
             // byte[] arrayForHeapAllocation = new byte[13 * 1024 * 1024];

data/lib/ruboto/sdk_versions.rb

@@ -6,16 +6,17 @@ module Ruboto
         '2.3.3' => 10, '2.3.4' => 10, '2.3.5' => 10, '2.3.6' => 10, '2.3.7' => 10,
         '3.0' => 11, '3.1' => 12, '3.2' => 13, '4.0.1' => 14, '4.0.3' => 15,
         '4.0.4' => 15, '4.1' => 16, '4.1.1' => 16, '4.1.2' => 16, '4.2' => 17,
-        '4.2.2' => 17, '4.3' => 18, '4.4.2' => 19,
+        '4.2.2' => 17, '4.3' => 18, '4.3.1' => 18, '4.4.2' => 19, '5.0.1' => 21, '5.1' => 22
     }
     API_LEVEL_TO_VERSION = {
         10 => '2.3.3', 11 => '3.0', 12 => '3.1', 13 => '3.2', 14 => '4.0',
-        15 => '4.0.3', 16 => '4.1.2', 17 => '4.2.2', 18 => '4.3', 19 => '4.4.2',
+        15 => '4.0.3', 16 => '4.1.2', 17 => '4.2.2', 18 => '4.3.1',
+        19 => '4.4.2', 21 => '5.0.1', 22 => '5.1'
     }
 
-    MINIMUM_SUPPORTED_SDK_LEVEL = 10
+    MINIMUM_SUPPORTED_SDK_LEVEL = 15
     MINIMUM_SUPPORTED_SDK = "android-#{MINIMUM_SUPPORTED_SDK_LEVEL}"
-    DEFAULT_TARGET_SDK_LEVEL = 15
+    DEFAULT_TARGET_SDK_LEVEL = 16
     DEFAULT_TARGET_SDK = "android-#{DEFAULT_TARGET_SDK_LEVEL}"
   end
 end

data/lib/ruboto/util/emulator.rb

@@ -113,20 +113,21 @@ module Ruboto
             if sdk_level.to_i == 10
               abi_opt = '--abi armeabi'
             elsif has_x86 && (ON_MAC_OS_X || ON_WINDOWS)
+              # FIXME(uwe):  Use x86 on Linux?
               abi_opt = '--abi x86'
             else
               abi_opt = '--abi armeabi-v7a'
             end
             # EMXIF
 
-            skin_filename = "#{Ruboto::SdkLocations::ANDROID_HOME}/platforms/android-L/skins/HVGA/hardware.ini"
+            skin_filename = "#{Ruboto::SdkLocations::ANDROID_HOME}/platforms/android-#{sdk_level}/skins/HVGA/hardware.ini"
             if File.exists?(skin_filename)
               old_skin_config = File.read(skin_filename)
               new_skin_config = old_skin_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
               File.write(skin_filename, new_skin_config) if new_skin_config != old_skin_config
             end
 
-            puts `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA -d "Nexus One"`
+            puts `echo no | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA -d "Nexus One"`
 
             if $? != 0
               puts 'Failed to create AVD.'
@@ -134,10 +135,11 @@ module Ruboto
             end
             # avd_config_file_name = "#{avd_home}/config.ini"
             # old_avd_config = File.read(avd_config_file_name)
-            # new_avd_config = old_avd_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
+            # new_avd_config = old_avd_config.dup
+            # new_avd_config.gsub!(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
             # add_property(new_avd_config, 'hw.device.manufacturer', 'Generic')
             # add_property(new_avd_config, 'hw.device.name', '3.2" HVGA slider (ADP1)')
-            # add_property(new_avd_config, 'hw.mainKeys', 'yes')
+            # add_property(new_avd_config, 'hw.mainKeys', 'no')
             # add_property(new_avd_config, 'hw.sdCard', 'yes')
             # File.write(avd_config_file_name, new_avd_config) if new_avd_config != old_avd_config
 

data/lib/ruboto/util/setup.rb

@@ -6,7 +6,7 @@ module Ruboto
     module Setup
       include Ruboto::Util::Verify
       REPOSITORY_BASE = 'http://dl-ssl.google.com/android/repository'
-      REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-8.xml"
+      REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-10.xml"
       SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
 
       RUBOTO_GEM_ROOT = File.expand_path '../../../..', __FILE__
@@ -110,7 +110,7 @@ module Ruboto
         require 'open-uri'
 
         doc = REXML::Document.new(open(REPOSITORY_URL))
-        version = doc.root.elements.to_a("sdk:#{type}/sdk:revision").map do |t|
+        doc.root.elements.to_a("sdk:#{type}/sdk:revision").map do |t|
           major = t.elements['sdk:major']
           minor = t.elements['sdk:minor']
           micro = t.elements['sdk:micro']
@@ -122,7 +122,6 @@ module Ruboto
           version += "_rc#{prev.text}" if prev
           version
         end.compact.sort_by { |v| Gem::Version.new(v.gsub('_', '.')) }.last
-        version
       end
 
       def get_android_sdk_version
@@ -145,7 +144,7 @@ module Ruboto
 
         link = page_content.scan(/#{regex}/)
         raise "SDK link cannot be found on download page: #{SDK_DOWNLOAD_PAGE}" if link.nil?
- 
+
         version = link.to_s.match(/r(\d+.)?(\d+.)?(\d+)/)[0]
         raise "SDK version cannot be determined from download page: #{SDK_DOWNLOAD_PAGE}" if version.nil?
 
@@ -190,9 +189,20 @@ module Ruboto
         when MAC_OS_X
           @haxm_kext_loc = '/System/Library/Extensions/intelhaxm.kext'
           found = File.exists?(@haxm_kext_loc)
-          @haxm_kext_loc = nil unless found
-          puts "#{'%-25s' % 'Intel HAXM'}: #{(found ? 'Found' : 'Not found')}"
+          if found
+            @haxm_kext_version = `kextstat | grep com.intel.kext.intelhaxm`.slice(/\(.*\)/)[1..-2]
+          else
+            @haxm_kext_loc = nil
+          end
+          # FIXME(uwe): Use the system version to choose the right .dmg
+          os_x_version = ENV['_system_version']
           @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM*.dmg')].first
+          @haxm_installer_version = @haxm_installer_loc.slice(/IntelHAXM_1.1.1_/)[10..-2]
+          if @haxm_kext_version == @haxm_installer_version
+            puts "#{'%-25s' % 'Intel HAXM'}: #{(found ? "Found" : 'Not found')}"
+          else
+            puts "#{'%-25s' % 'Intel HAXM'}: Old   #{@haxm_kext_version}/#{@haxm_installer_version}"
+          end
         when LINUX
           @haxm_installer_loc = 'Not supported, yet.'
           @haxm_kext_loc = 'Not supported, yet.'
@@ -213,8 +223,9 @@ module Ruboto
       end
 
       def check_for_build_tools
-        @dx_loc = check_for('dx', 'Android SDK Command dx',
-                            Dir[File.join android_package_directory, 'build-tools', '*', windows? ? 'dx.bat' : 'dx'][-1])
+        dx_locations = Dir[File.join android_package_directory, 'build-tools', '*', windows? ? 'dx.bat' : 'dx']
+        sorted_dx_locations = dx_locations.sort_by { |f| Gem::Version.new f[%r{build-tools/[^/]+/}][12..-2] }
+        @dx_loc = check_for('dx', 'Android SDK Command dx', sorted_dx_locations[-1])
       end
 
       def check_for_android_sdk
@@ -281,19 +292,23 @@ module Ruboto
           puts "#{pretty_name} was not found."
           installer = package_installer
           if installer
-	          unless accept_all
-	            print 'Would you like to and install it? (Y/n): '
-	            a = STDIN.gets.chomp.upcase
-	          end
-	          if accept_all || a == 'Y' || a.empty?
-	            puts "sudo #{installer} install -y #{package_name}"
-	            IO.popen("sudo #{installer} install -y #{package_name}") {|io| while (l = io.gets) do; puts l; end }
-	          else
-	            puts
-	            puts "You can install #{pretty_name} manually by:"
-	            puts "sudo #{installer} install #{package_name}"
-	            puts
-	          end
+            unless accept_all
+              print 'Would you like to and install it? (Y/n): '
+              a = STDIN.gets.chomp.upcase
+            end
+            if accept_all || a == 'Y' || a.empty?
+              puts "sudo #{installer} install -y #{package_name}"
+              IO.popen("sudo #{installer} install -y #{package_name}") do |io|
+                while (l = io.gets)
+                  puts l
+                end
+              end
+            else
+              puts
+              puts "You can install #{pretty_name} manually by:"
+              puts "sudo #{installer} install #{package_name}"
+              puts
+            end
           else
             puts "Package installer not found. You'll need to install #{pretty_name} manually."
           end
@@ -573,8 +588,10 @@ module Ruboto
           if accept_all || a == 'Y' || a.empty?
             case android_package_os_id
             when MAC_OS_X
+              puts "Mounting the HAXM install image"
               system "hdiutil attach #{@haxm_installer_loc}"
               fileName = Dir['/Volumes/IntelHAXM*/IntelHAXM*.mpkg'][0]
+              puts "Starting the HAXM installer.  Sudo password required."
               system "sudo -S installer -pkg #{fileName} -target /"
             when LINUX
               puts '    HAXM installation on Linux is not supported, yet.'
@@ -610,9 +627,9 @@ module Ruboto
 
       def update_sdk(update_cmd, accept_all)
         if accept_all
-          IO.popen(update_cmd, 'r+') do |cmd_io|
+          IO.popen(update_cmd, 'r+', external_encoding: Encoding::BINARY) do |cmd_io|
             begin
-              output = ''
+              output = ''.encode(Encoding::BINARY)
               question_pattern = /.*Do you accept the license '[a-z-]+-[0-9a-f]{8}' \[y\/n\]: /m
               STDOUT.sync = true
               cmd_io.each_char do |text|

data/lib/ruboto/util/update.rb

@@ -463,7 +463,7 @@ module Ruboto
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
               gem_version = Gem::Version.new(jruby_core_version.to_s.tr('-', '.'))
-              if gem_version >= Gem::Version.new('9000.dev')
+              if gem_version >= Gem::Version.new('9.0.0.0.SNAPSHOT')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
 
@@ -507,7 +507,6 @@ module Ruboto
                     'org/jruby/ant',
                     # 'org/jruby/compiler',      # Needed for initialization, but should not be necessary
                     # 'org/jruby/compiler/impl', # Needed for initialization, but should not be necessary
-                    'org/jruby/compiler/util',
                     'org/jruby/demo',
                     'org/jruby/embed/bsf',
                     'org/jruby/embed/jsr223',
@@ -519,30 +518,79 @@ module Ruboto
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
                     # 'org/jruby/runtime/opto',              # What is this?
                     # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
-
-                    # FIXME(uwe): We should filter the whole truffle package...
-                    # 'org/jruby/truffle',
-
+                    'org/jruby/truffle',
                     'org/jruby/truffle/*.class',
                     'org/jruby/truffle/nodes',
                     'org/jruby/truffle/runtime/control',
                     'org/jruby/truffle/runtime/core',
-                    'org/jruby/truffle/runtime/lookup',
                     'org/jruby/truffle/runtime/methods',
-                    'org/jruby/truffle/runtime/objectstorage',
                     'org/jruby/truffle/runtime/signal',
                     'org/jruby/truffle/runtime/subsystems',
                     'org/jruby/truffle/runtime/util',
                     'org/jruby/truffle/runtime/*.class',
                     'org/jruby/truffle/translator',
-                    # EMXIF
-
+                ]
+              elsif gem_version >= Gem::Version.new('1.7.20.dev')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.20
+                excluded_core_packages = [
+                    '**/*.sh',
+                    '**/*Aix*',
+                    '**/*Darwin*',
+                    '**/*darwin*',
+                    '**/*FreeBSD*',
+                    '**/*freebsd*',
+                    '**/*MacOS*',
+                    '**/*OpenBSD*',
+                    '**/*openbsd*',
+                    '**/*Solaris*',
+                    '**/*sunos*',
+                    '**/*Windows*',
+                    '**/*windows*',
+                    'META-INF',
+                    'com/headius/invokebinder',
+                    'com/headius/options/example',
+                    'com/kenai/constantine',
+                    'com/kenai/jffi',
+                    'com/kenai/jnr/x86asm',
+                    'com/martiansoftware',
+                    'jni',
+                    'jnr/constants/platform/fake',
+                    'jnr/enxio',
+                    'jnr/ffi/annotations',
+                    'jnr/ffi/byref',
+                    'jnr/ffi/mapper',
+                    'jnr/ffi/provider',
+                    'jnr/ffi/util',
+                    'jnr/ffi/Struct$*',
+                    'jnr/ffi/types',
+                    'jnr/x86asm',
+                    'org/jruby/ant',
+                    'org/jruby/cext',
+                    'org/jruby/compiler/impl/BaseBodyCompiler*',
+                    'org/jruby/compiler/util',
+                    'org/jruby/demo',
+                    'org/jruby/embed/bsf',
+                    'org/jruby/embed/jsr223',
+                    'org/jruby/embed/osgi',
+                    'org/jruby/ext/ffi/AbstractMemory*',
+                    'org/jruby/ext/ffi/Enums*',
+                    'org/jruby/ext/ffi/io',
+                    'org/jruby/ext/ffi/jffi',
+                    'org/jruby/javasupport/bsf',
                     'org/yecht',
-                    'yaml.rb', # This looks like 1.8 stdlib...
+                    'yaml.rb',
                 ]
-              elsif gem_version >= Gem::Version.new('1.7.17.dev')
+              elsif gem_version >= Gem::Version.new('1.7.19')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.19
+                excluded_core_packages = %w(**/*.sh **/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius/invokebinder com/headius/options/example com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/enxio jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/Enums* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht yaml.rb)
+              elsif gem_version >= Gem::Version.new('1.7.18')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.18
+                excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius/invokebinder com/headius/options/example com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/enxio jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/Enums* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht yaml.rb)
+              elsif gem_version >= Gem::Version.new('1.7.17')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.17
                 excluded_core_packages = %w(*.sh **/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius/invokebinder com/headius/options/example com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/enxio jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/Enums* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht yaml.rb)
               elsif gem_version >= Gem::Version.new('1.7.12')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.12
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius/invokebinder com/headius/options/example com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/enxio jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/Enums* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht yaml.rb)
               elsif gem_version >= Gem::Version.new('1.7.5')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.5
@@ -570,7 +618,7 @@ module Ruboto
               excluded_core_packages.each do |i|
                 if File.directory? i
                   FileUtils.remove_dir(i, true) rescue puts "Failed to remove package: #{i} (#{$!})"
-                elsif Dir[i].each { |f| FileUtils.rm_rf f }.empty?
+                elsif Dir.glob(i, File::FNM_CASEFOLD).each { |f| FileUtils.rm_rf f }.empty?
                   print "exclude pattern #{i.inspect} found no files..."
                 end
               end

data/lib/ruboto/version.rb

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

data/test/activity/dir_and_file_activity_test.rb

@@ -11,10 +11,10 @@ setup do |activity|
 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},
+  assert_matches %r{jar:file:/data/app/org.ruboto.test_app-[123](?:/base)?.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!},
+  assert_matches %r{jar:file:/data/app/org.ruboto.test_app-[123](?:/base)?.apk!},
                  activity.find_view_by_id(43).text.to_s
-  assert_matches %r{file:/data/app/org.ruboto.test_app-[12].apk!/AndroidManifest.xml},
+  assert_matches %r{file:/data/app/org.ruboto.test_app-[123](?:/base)?.apk!/AndroidManifest.xml},
                  activity.find_view_by_id(44).text.to_s
 end

data/test/activity/json_activity.rb

@@ -4,6 +4,17 @@ require 'ruboto/widget'
 
 ruboto_import_widgets :LinearLayout, :TextView
 
+# I/System.out( 1700): Starting JSON Parser Service
+# D/dalvikvm( 1700): JIT code cache reset in 102 ms (1048444 bytes 1/0)
+# F/libc    ( 1700): Fatal signal 11 (SIGSEGV) at 0x00000000 (code=1), thread 1709 (FinalizerDaemon)
+# D/dalvikvm( 1700): GC_CONCURRENT freed 2352K, 9% free 28484K/30980K, paused 26ms+126ms, total 834ms
+# D/dalvikvm( 1700): WAIT_FOR_CONCURRENT_GC blocked 673ms
+# I/DEBUG   (   35): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+# I/DEBUG   (   35): Build fingerprint: 'generic/sdk/generic:4.2.2/JB_MR1.1/576024:eng/test-keys'
+# I/DEBUG   (   35): Revision: '0'
+# I/DEBUG   (   35): pid: 1700, tid: 1709, name: UNKNOWN  >>> org.ruboto.test_app <<<
+# I/DEBUG   (   35): signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 00000000
+
 class JsonActivity
   def onCreate(bundle)
     super

data/test/activity/navigation_activity_test.rb

@@ -90,7 +90,7 @@ def start_activity_by_button(activity, button_id, activity_class_name = 'org.rub
     puts 'waitForIdleSync'
     waitForIdleSync
     puts 'wait_for_monitor_with_timeout'
-    current_activity = wait_for_monitor_with_timeout(monitor, 10000)
+    current_activity = monitor.wait_for_activity_with_timeout(10000)
   ensure
     removeMonitor(monitor)
   end
@@ -101,6 +101,7 @@ end
 
 def button_activity_text(button_id, activity, expected_text_id, expected_text_string,
     activity_class_name = 'org.ruboto.RubotoActivity')
+  puts "Start activity: #{expected_text_string}"
   current_activity = start_activity_by_button(activity, button_id, activity_class_name)
   start = Time.now
   loop do

data/test/activity/stack_activity_test.rb

@@ -15,23 +15,27 @@ end
 # 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: 19, PLATFORM: STANDALONE, JRuby: 1.7.20-SNAPSHOT '[28, 33, 43, 60]' expected, but got '[28, 33, 44, 61]'
 # ANDROID: 20, PLATFORM: 1.0.2,      JRuby: 1.7.12   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
+# ANDROID: 21, PLATFORM: 1.0.2,      JRuby: 1.7.12   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
+# ANDROID: 22, PLATFORM: STANDALONE, JRuby: 1.7.20-SNAPSHOT '[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],
-      /^9000/ => [0, 0, 0, 0],
-      // => [0, 0, 0, 0],
-  }.find { |k, v| org.jruby.runtime.Constants::VERSION =~ k }[1]
+  os_offset =
+      case android.os.Build::VERSION::SDK_INT
+      when 13 then [1, 1, 1, 1]
+      when (15..19) then [0, 0, 1, 1]
+      else [0, 0, 0, 0]
+      end
+  jruby_offset =
+      case org.jruby.runtime.Constants::VERSION
+      when /^1\.7/ then [0, 0, 0, -1]
+      else [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 [28 + os_offset[0] + jruby_offset[0],
                 33 + os_offset[1] + jruby_offset[1],
-                44 + os_offset[2] + jruby_offset[2],
-                62 + os_offset[3] + jruby_offset[3]], [
+                43 + os_offset[2] + jruby_offset[2],
+                61 + 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,

data/test/app_test_methods.rb

@@ -38,11 +38,11 @@ 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'))
+      # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.20.dev
+      next if file =~ /rss/ && (JRUBY_JARS_VERSION < Gem::Version.new('1.7.20.dev'))
       # EMXIF
 
-      # FIXME(uwe):  Remove when we release RubotoCore based on JRuby 1.7.14
+      # FIXME(uwe):  Remove when we release RubotoCore based on JRuby 1.7.20
       next if file =~ /rss/ && (RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM')
       # EMXIF
 
@@ -51,7 +51,7 @@ module AppTestMethods
       next if file =~ /ssl/ && (ANDROID_OS < 16 ||
           RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM' ||
           JRUBY_JARS_VERSION < Gem::Version.new('1.7.13') ||
-          JRUBY_JARS_VERSION < Gem::Version.new('9000')) # FIXME(uwe): JRuby 9K should contain the SSLSocket fix.
+          JRUBY_JARS_VERSION < Gem::Version.new('9.0.0.0')) # FIXME(uwe): JRuby 9K should contain the SSLSocket fix.
       # EMXIF
 
       # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.4.dev

data/test/arjdbc_test.rb

@@ -1,11 +1,21 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
 # FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
-if RubotoTest::ANDROID_OS >= 15
+if RubotoTest::ANDROID_OS >= 15 &&
+    # FIXME(uwe):  Remove when CURRENT works with ARJDBC
+    RubotoTest::RUBOTO_PLATFORM != 'CURRENT' &&
+    # FIXME(uwe):  Remove when CURRENT works with ARJDBC
+    RubotoTest::RUBOTO_PLATFORM != 'FROM_GEM'
 
-class ArjdbcTest < Test::Unit::TestCase
+class ArjdbcTest < Minitest::Test
   def setup
-    generate_app :bundle => [['activerecord', '<4.0.0'], 'activerecord-jdbcsqlite3-adapter', :sqldroid]
+    # FIXME(uwe):  Simplify when RubotoCore is released with newer thread_safe
+    generate_app bundle: [
+            [:activerecord, RUBOTO_PLATFORM == 'CURRENT' ? '<4.0.0' : '<4.2.0'],
+            :'activerecord-jdbc-adapter',
+            :sqldroid,
+        ]
+    # EMXIF
   end
 
   def teardown
@@ -17,7 +27,9 @@ class ArjdbcTest < Test::Unit::TestCase
       File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
 require 'ruboto/widget'
 require 'ruboto/util/stack'
+
 with_large_stack do
+  require 'rubygems'
   require 'active_record'
 end
 
@@ -53,15 +65,14 @@ class RubotoTestAppActivity
   def onResume
     super
 
-    db_dir = "\#{application_context.files_dir}/sqlite"
+    db_file = "\#{application_context.files_dir}/sqlite"
 
     with_large_stack do
 
       ActiveRecord::Base.establish_connection(
-        :adapter => 'jdbcsqlite3',
+        :adapter => 'sqlite3',
         :driver => 'org.sqldroid.SQLDroidDriver',
-        :url => "jdbc:sqldroid:\#{db_dir}?timeout=60000&retry=1000",
-        :database => db_dir,
+        :database => db_file,
       )
 
       begin