ruboto-core 0.2.1 → 0.3.3

data/lib/ruboto/util/verify.rb

@@ -1,4 +1,5 @@
 require 'ruboto/api'
+require 'yaml'
 
 module Ruboto
   module Util
@@ -18,6 +19,16 @@ module Ruboto
         File.open("AndroidManifest.xml", 'w') {|f| verify_manifest.document.write(f, 4)}
       end
       
+      def verify_test_manifest
+        abort "cannot find your test AndroidManifest.xml to extract info from it. Make sure you're in the root directory of your app" \
+            unless File.exists? 'test/AndroidManifest.xml'
+        @manifest ||= REXML::Document.new(File.read('test/AndroidManifest.xml')).root
+      end
+
+      def save_test_manifest
+        File.open("test/AndroidManifest.xml", 'w') {|f| verify_test_manifest.document.write(f, 4)}
+      end
+
       def verify_package
         verify_manifest
         @package ||= @manifest.attribute('package').value
@@ -58,6 +69,19 @@ module Ruboto
       def verify_api
         Ruboto::API.api
       end
+
+      def verify_ruboto_config
+        if File.exists? 'ruboto.yml'
+          @ruboto_config ||= YAML::load_file('ruboto.yml')
+        else
+          @ruboto_config = {}
+        end
+      end
+
+      def save_ruboto_config
+        File.open("ruboto.yml", 'w') {|f| YAML.dump verify_ruboto_config}
+      end
+
     end
   end
 end

data/lib/ruboto/util/xml_element.rb

@@ -156,9 +156,8 @@ module Ruboto
 
         params = parameters
         args = ""
-        if params.size > 3
-          args = ", args"
-          rv << "Object[] args = {" + params.map{|i| i[0]}.join(", ") + "};"
+        if params.size > 1
+          args = ", new Object[]{" + params.map{|i| i[0]}.join(", ") + "}"
         elsif params.size > 0
           args = ", " + params.map{|i| i[0]}.join(", ")
         end
@@ -177,13 +176,7 @@ module Ruboto
           convert_return = ", #{return_class}.class"
         end
 
-        if return_class == 'Integer'
-          # TODO(uwe): This is a fix for JRUBY-5937  Remove when the issue is fixed.
-          rv << "#{return_cast}((Number)getRuby().callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return})).intValue();"
-          # TODO end
-        else
         rv << "#{return_cast}getRuby().callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return});"
-        end
         rv
       end
 

data/test/activity/{image_button_test.rb → image_button_activity_test.rb}

@@ -1,4 +1,4 @@
-activity Java::org.ruboto.test_app.RubotoTestAppActivity
+activity Java::org.ruboto.test_app.ImageButtonActivity
 
 setup do |activity|
   start = Time.now

data/test/activity/{image_button_and_button.rb → image_button_and_button_activity.rb}

@@ -21,11 +21,4 @@ $activity.handle_create do |bundle|
     end
   end
 
-#  handle_image_click do |view|
-#    if view.id == 43
-#      @text_view.text = 'Image button pressed'
-#    elsif view.id == 44
-#      @text_view.text = 'Button pressed'
-#    end
-#  end
 end

data/test/activity/{image_button_and_button_test.rb → image_button_and_button_activity_test.rb}

@@ -1,4 +1,4 @@
-activity Java::org.ruboto.test_app.RubotoTestAppActivity
+activity Java::org.ruboto.test_app.ImageButtonAndButtonActivity
 
 setup do |activity|
   start = Time.now

data/test/activity/option_menu_activity.rb

@@ -0,0 +1,21 @@
+require 'ruboto'
+
+ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
+
+$activity.handle_create do |bundle|
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  setup_content do
+    linear_layout :orientation => LinearLayout::VERTICAL do
+      @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+    end
+  end
+
+  handle_create_options_menu do |menu|
+    add_menu('Test') do
+      @text_view.setText 'What hath Matz wrought!'
+      toast 'Flipped a bit via butterfly'
+    end
+    true
+  end
+end

data/test/activity/option_menu_activity_test.rb

@@ -0,0 +1,20 @@
+activity Java::org.ruboto.test_app.OptionMenuActivity
+
+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('initial setup') do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+end
+
+test('option_menu changes text') do |activity|
+  activity.window.performPanelIdentifierAction(android.view.Window::FEATURE_OPTIONS_PANEL, 0, 0)
+  assert_equal "What hath Matz wrought!", @text_view.text
+end

data/test/app_test_methods.rb

@@ -8,47 +8,40 @@ module AppTestMethods
       puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
     end
   else
-    def test_that_tests_work_on_new_project
-      run_app_tests
-    end
-
-    if not ON_JRUBY_JARS_1_5_6
-      def test_that_yaml_loads
-        assert_code "with_large_stack{require 'yaml'}"
+    def test_activity_tests
+      if not ON_JRUBY_JARS_1_5_6
+        assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
+      else
+        puts "Skipping YAML tests on jruby-jars-1.5.6"
       end
-    else
-      puts "Skipping YAML tests on jruby-jars-1.5.6"
-    end
 
-    def test_file_read_source_file
-      assert_code "File.read(__FILE__)"
-    end
+      assert_code 'ReadSourceFile', "File.read(__FILE__)"
 
-    Dir.chdir File.expand_path('activity', File.dirname(__FILE__)) do
-      Dir['*_test.rb'].each do |test|
-        class_eval %Q{
-        def test_#{test.chomp('_test.rb')}
-          filename      = "#{APP_DIR}/assets/scripts/ruboto_test_app_activity.rb"
-          test_filename = "#{APP_DIR}/test/assets/scripts/ruboto_test_app_activity_test.rb"
-          File.open(filename, 'w') { |f| f << File.read('#{PROJECT_DIR}/test/activity/#{test.gsub('_test', '')}') }
-          File.open(test_filename, 'w') { |f| f << File.read('#{PROJECT_DIR}/test/activity/#{test}') }
-          run_app_tests
+      Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
+        snake_name = test_src.chomp('_test.rb')
+        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", "assets/scripts/"
+          FileUtils.cp test_src, "test/assets/scripts/"
         end
-      }
-        puts "Creating test from file #{PROJECT_DIR}/test/activity/#{test}"
       end
+      run_app_tests
     end
 
     private
 
-    def assert_code(code)
-      filename = "#{APP_DIR}/assets/scripts/ruboto_test_app_activity.rb"
-      s        = File.read(filename)
-      s.gsub!(/(require 'ruboto')/, "\\1\n#{code}")
-      File.open(filename, 'w') { |f| f << s }
-      run_app_tests
+    def assert_code(activity_name, code)
+      snake_name = activity_name.scan(/[A-Z]+[a-z]+/).map { |s| s.downcase }.join('_')
+      filename = "assets/scripts/#{snake_name}_activity.rb"
+      Dir.chdir APP_DIR do
+        system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
+        s = File.read(filename)
+        s.gsub!(/(require 'ruboto')/, "\\1\n#{code}")
+        File.open(filename, 'w') { |f| f << s }
+      end
     end
 
   end
 
-end
+end

data/test/minimal_app_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+
+class MinimalAppTest < Test::Unit::TestCase
+  def setup
+    generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss rubygems runit shell soap test uri webrick win32 wsdl xmlrpc xsd}
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_minimal_apk_is_less_than_3_mb
+    apk_size = File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_f / (1024 * 1024)
+    limit = 3.0
+    assert apk_size < limit, "APK was larger than #{'%.1f' % limit}MB: #{'%.1f' % apk_size}MB"
+  end
+
+  def test_minimal_apk_succeeds_tests
+    run_app_tests
+  end
+
+end

data/test/rake_test.rb

@@ -1,7 +1,4 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
-require 'fileutils'
-
-$stdout.sync = true
 
 class RakeTest < Test::Unit::TestCase
   def setup
@@ -18,7 +15,7 @@ class RakeTest < Test::Unit::TestCase
     File.open("#{APP_DIR}/AndroidManifest.xml", 'w') { |f| f << manifest }
 
     Dir.chdir APP_DIR do
-      system 'rake install:restart:clean'
+      system 'rake install:clean start'
       assert_equal 0, $?
     end
 
@@ -31,23 +28,11 @@ class RakeTest < Test::Unit::TestCase
   else
     def test_that_update_scripts_task_copies_files_to_app_directory_when_permissions_are_not_set
       Dir.chdir APP_DIR do
-        system 'rake install:restart:clean'
+        system 'rake install:clean start'
         assert_equal 0, $?
       end
       wait_for_dir("/data/data/#{PACKAGE}/files/scripts")
     end
   end
 
-  private
-
-  def wait_for_dir(dir)
-    puts "Waiting for app to generate script directory: #{dir}"
-    start = Time.now
-    loop do
-      break if `adb shell ls -d #{dir}`.chomp =~ %r{^#{dir}$}
-      flunk 'Timeout waiting for scripts directory to appear' if Time.now > start + 60
-      sleep 1
-    end
-  end
-
 end

data/test/ruboto_gen_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
-require 'fileutils'
 require 'test/app_test_methods'
 
 class RubotoGenTest < Test::Unit::TestCase
@@ -12,20 +11,32 @@ class RubotoGenTest < Test::Unit::TestCase
   def teardown
     cleanup_app
   end
+
+  def test_icons_are_updated
+    Dir.chdir APP_DIR do
+      assert_equal 4032, File.size('res/drawable-hdpi/icon.png')
+    end
+  end
+
+  def test_gen_class_activity_with_lowercase_should_fail
+    Dir.chdir APP_DIR do
+      system "#{RUBOTO_CMD} gen class activity --name VeryNewActivity"
+      assert_equal 1, $?.exitstatus
+      assert !File.exists?('src/org/ruboto/test_app/VeryNewActivity.java')
+      assert !File.exists?('assets/scripts/very_new_activity.rb')
+      assert !File.exists?('test/assets/scripts/very_new_activity_test.rb')
+      assert File.read('AndroidManifest.xml') !~ /VeryNewActivity/
+    end
+  end
+
 end
 
 if not RubotoTest::ON_JRUBY_JARS_1_5_6
-  class RubotoGenWithPsychTest < Test::Unit::TestCase
-    include AppTestMethods
-    
+  class RubotoGenWithPsychTest < RubotoGenTest
     def setup
       generate_app :with_psych => true
     end
 
-    def teardown
-      cleanup_app
-    end
-
     def test_psych_jar_exists
       assert File.exists?("#{APP_DIR}/libs/psych.jar"), "Failed to generate psych jar"
     end

data/test/ruboto_update_test.rb

@@ -1,28 +1,11 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
-require 'fileutils'
 require 'test/app_test_methods'
 
 module UpdateTestMethods
   include RubotoTest
 
   def setup(with_psych = false)
-    Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
-    FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
-    Dir.chdir TMP_DIR do
-      system "tar xzf #{PROJECT_DIR}/examples/RubotoTestApp_0.1.0_jruby_1.6.3.dev.tgz"
-    end
-    if ENV['ANDROID_HOME']
-      android_home = ENV['ANDROID_HOME']
-    else
-      android_home = File.dirname(File.dirname(`which adb`))
-    end
-    File.open("#{APP_DIR}/local.properties", 'w'){|f| f.puts "sdk.dir=#{android_home}"}
-    File.open("#{APP_DIR}/test/local.properties", 'w'){|f| f.puts "sdk.dir=#{android_home}"}
-    Dir.chdir APP_DIR do
-      FileUtils.touch "libs/psych.jar" if with_psych
-      system "#{RUBOTO_CMD} update app"
-      assert_equal 0, $?, "update app failed with return code #$?"
-    end
+    generate_app(:with_psych => with_psych, :update => true)
   end
 
   def teardown
@@ -35,6 +18,13 @@ module UpdateTestMethods
       assert_equal 1, File.readlines('test/build.xml').grep(/<macrodef name="run-tests-helper">/).size, 'Duplicate macro in build.xml'
     end
   end
+
+  def test_icons_are_untouched
+    Dir.chdir APP_DIR do
+      assert_equal 4100, File.size('res/drawable-hdpi/icon.png')
+    end
+  end
+
 end
 
 class RubotoUpdateTest < Test::Unit::TestCase

data/test/service_test.rb

@@ -2,8 +2,6 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
 class ServiceTest < Test::Unit::TestCase
-  include RubotoTest
-  
   def setup
     generate_app
   end
@@ -44,6 +42,6 @@ EOF
       File.open(activity_filename, 'w') { |f| f << s }
     end
     run_app_tests
-  end
+    end
 
-end
+  end

data/test/test_helper.rb

@@ -1,11 +1,17 @@
 require 'test/unit'
 require 'rubygems'
+require 'fileutils'
+require 'yaml'
 
 module RubotoTest
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
-  gem_spec = Gem.searcher.find('jruby-jars')
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
+    gem_spec = Gem::Specification.find_by_path 'jruby-jars'
+  else
+    gem_spec = Gem.searcher.find('jruby-jars')
+  end
   raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
   JRUBY_JARS_VERSION  = gem_spec.version
   ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
@@ -35,6 +41,9 @@ module RubotoTest
         puts "Getting version from device/emulator took #{(Time.now - start).to_i}s"
         return api_level
       end
+      if line =~ /\[ro\.build\.version\.sdk\]: \[(\d+)\]/
+        return $1
+      end
     end
     raise "Unable to read device/emulator apilevel"
   end
@@ -77,19 +86,47 @@ class Test::Unit::TestCase
 
   def generate_app(options = {})
     with_psych = options.delete(:with_psych) || false
+    update = options.delete(:update) || false
+    excluded_stdlibs = options.delete(:excluded_stdlibs)
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
-    template_dir = "#{APP_DIR}_template_#{$$}#{'_with_psych' if with_psych}"
+    template_dir = "#{APP_DIR}_template_#{$$}#{'_with_psych' if with_psych}#{'_updated' if update}#{"_without_#{excluded_stdlibs.join('_')}" if excluded_stdlibs}"
     if File.exists?(template_dir)
       puts "Copying app from template #{template_dir}"
       FileUtils.cp_r template_dir, APP_DIR, :preserve => true
     else
-      puts "Generating app #{APP_DIR}"
-      system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --min_sdk #{ANDROID_TARGET} #{'--with-psych' if with_psych}"
-      if $? != 0
-        FileUtils.rm_rf template_dir
-        raise "gen app failed with return code #$?"
+      if update
+        Dir.chdir TMP_DIR do
+          system "tar xzf #{PROJECT_DIR}/examples/RubotoTestApp_0.1.0_jruby_1.6.3.dev.tgz"
+        end
+        if ENV['ANDROID_HOME']
+          android_home = ENV['ANDROID_HOME']
+        else
+          android_home = File.dirname(File.dirname(`which adb`))
+        end
+        Dir.chdir APP_DIR do
+          File.open('local.properties', 'w'){|f| f.puts "sdk.dir=#{android_home}"}
+          File.open('test/local.properties', 'w'){|f| f.puts "sdk.dir=#{android_home}"}
+          FileUtils.touch "libs/psych.jar" if with_psych
+          exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
+          system "#{RUBOTO_CMD} update app"
+          assert_equal 0, $?, "update app failed with return code #$?"
+        end
+      else
+        puts "Generating app #{APP_DIR}"
+        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target #{ANDROID_TARGET} #{'--with-psych' if with_psych}"
+        if $? != 0
+          FileUtils.rm_rf APP_DIR
+          raise "gen app failed with return code #$?"
+        end
+        if excluded_stdlibs
+          Dir.chdir APP_DIR do
+            exclude_stdlibs(excluded_stdlibs)
+            system "#{RUBOTO_CMD} update jruby --force"
+            raise "update jruby failed with return code #$?" if $? != 0
+          end
+        end
       end
       Dir.chdir APP_DIR do
         system 'rake debug'
@@ -111,4 +148,19 @@ class Test::Unit::TestCase
     end
   end
 
+  def wait_for_dir(dir)
+    puts "Waiting for app to generate script directory: #{dir}"
+    start = Time.now
+    loop do
+      break if `adb shell ls -d #{dir}`.chomp =~ %r{^#{dir}$}
+      flunk 'Timeout waiting for scripts directory to appear' if Time.now > start + 120
+      sleep 1
+    end
+  end
+
+  def exclude_stdlibs(excluded_stdlibs)
+    puts "Adding ruboto.yml: #{excluded_stdlibs.join(' ')}"
+    File.open('ruboto.yml', 'w'){|f| f << YAML.dump({:excluded_stdlibs => excluded_stdlibs})}
+  end
+
 end