ruboto 0.8.0 → 0.8.1

data/test/minimal_app_test.rb

@@ -17,8 +17,8 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
           '1.6.7' => 3.2,
-          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 4.4 : 4.6, # Without dexmaker for Android < 4.0.3
-          '1.7.0.preview2' => ANDROID_TARGET < 15 ? 4.4 : 4.6, # Without dexmaker for Android < 4.0.3
+          '1.7.0.preview1' => 4.6,
+          '1.7.0.preview2' => 4.6,
       }[JRUBY_JARS_VERSION.to_s] || 3.2
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"

data/test/rake_test.rb

@@ -31,7 +31,7 @@ class RakeTest < Test::Unit::TestCase
 
       # FIXME(uwe): Uncomment this when we can build the test package without building the main package
       # assert_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
-      # FIXME end
+      # EMXIF
 
       assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
     end

data/test/ruboto_gen_test.rb

@@ -39,15 +39,15 @@ class RubotoGenTest < Test::Unit::TestCase
     if RUBOTO_PLATFORM == 'STANDALONE'
       upper_limit = {
           '1.6.7' => 5800.0,
-          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 7062.0 : 7308.0,
-          '1.7.0.preview2' => ANDROID_TARGET < 15 ? 7062.0 : 7308.0,
+          '1.7.0.preview1' => 7308.0,
+          '1.7.0.preview2' => 7308.0,
       }[JRUBY_JARS_VERSION.to_s] || 4200.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
-          7 => 62.0,
-          10 => 66.0,
-          15 => 67.0,
+          7 => 67.0,
+          10 => 309.0,
+          15 => 309.0,
       }[ANDROID_TARGET] || 64.0
     end
     lower_limit = upper_limit * 0.9
@@ -60,48 +60,176 @@ class RubotoGenTest < Test::Unit::TestCase
       system "#{RUBOTO_CMD} gen subclass android.database.sqlite.SQLiteOpenHelper --name MyDatabaseHelper --method_base on"
       assert_equal 0, $?.exitstatus
       assert File.exists?('src/org/ruboto/test_app/MyDatabaseHelper.java')
-      # FIXME(uwe):  Add tests and definition script?
-      # assert File.exists?('src/my_database_helper.rb')
-      # assert File.exists?('test/src/my_database_helper_test.rb')
+      assert File.exists?('src/my_database_helper.rb')
+      assert File.exists?('test/src/my_database_helper_test.rb')
       system 'rake debug'
       assert_equal 0, $?
     end
   end
 
-  def test_gen_interface
+  def test_gen_subclass_of_array_adapter
     Dir.chdir APP_DIR do
-      system "#{RUBOTO_CMD} gen interface java.lang.Runnable --name MyRunnable"
+      system "#{RUBOTO_CMD} gen subclass android.widget.ArrayAdapter --name RubotoArrayAdapter --method_base all"
       assert_equal 0, $?.exitstatus
-      java_source_file = 'src/org/ruboto/test_app/MyRunnable.java'
+      java_source_file = 'src/org/ruboto/test_app/RubotoArrayAdapter.java'
       assert File.exists?(java_source_file)
-      # FIXME(uwe):  Add tests and definition script?
-      # assert File.exists?('src/my_runnable.rb')
-      # assert File.exists?('test/src/my_runnable_test.rb')
 
+      # FIXME(uwe):  Workaround for Ruboto Issue #246
       java_source = File.read(java_source_file)
-      File.open(java_source_file, 'w'){|f| f << java_source.gsub(/^\}\n/, "    public static void main(String[] args){new MyRunnable().run();}\n}\n")}
+      File.open(java_source_file, 'w'){|f| f << java_source.gsub(/^(public class .*ArrayAdapter) (.*ArrayAdapter)/, '\1<T>\2<T>').gsub(/T.class/, 'Object.class')}
+      # EMXIF
 
-      system 'rake debug'
-      assert_equal 0, $?
+      assert File.exists?('src/ruboto_array_adapter.rb')
+      assert File.exists?('test/src/ruboto_array_adapter_test.rb')
+
+      File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
+require 'ruboto/activity'
+require 'ruboto/util/stack'
+require 'ruboto/widget'
 
-      File.open('src/org/ruboto/JRubyAdapter.java', 'w'){|f| f << <<EOF}
-package org.ruboto;
-public class JRubyAdapter {
-    public static Object get(String varName){return null;}
-    public static boolean isInitialized(){return true;}
-    public static boolean isJRubyOneSeven(){return true;}
-    public static boolean isJRubyPreOneSeven(){return false;}
-    public static void put(String varName, Object value){}
-    public static void runRubyMethod(Object receiver, String method){}
-    public static boolean runScriptlet(String scriptlet){return false;}
-}
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+class RubotoTestAppActivity
+  def on_create(bundle)
+    super
+    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)
+puts "adapter: \#{adapter.inspect}"
+    self.content_view =
+        linear_layout :orientation => :vertical do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :match_parent,
+                    :gravity => :center, :text_size => 48.0
+          list_view :adapter => adapter, :id => 43,
+                    :on_item_click_listener => proc{|parent, view, position, id| @text_view.text = 'List item clicked!'}
+        end
+  end
+end
 EOF
-      system 'javac -cp bin/classes -d bin/classes src/org/ruboto/JRubyAdapter.java'
-      assert_equal 0, $?
-      system 'javac -cp bin/classes -d bin/classes src/org/ruboto/test_app/MyRunnable.java'
-      assert_equal 0, $?
-      system 'java -cp bin/classes org.ruboto.test_app.MyRunnable'
-      assert_equal 0, $?
+
+      File.open('test/src/ruboto_test_app_activity_test.rb', 'w'){|f| f << <<EOF}
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    @list_view = activity.findViewById(43)
+    break if (@text_view && @list_view && @list_view.adapter) || (Time.now - start > 60)
+puts "Waiting for adapter: \#{@list_view && @list_view.adapter.inspect}"
+    sleep 1
+  end
+  assert @text_view
+  assert @list_view
+  assert @list_view.adapter
+end
+
+test('Item click changes text') do |activity|
+  text_view = activity.findViewById(42)
+  list_view = activity.findViewById(43)
+  list_view.perform_item_click(list_view.adapter.get_view(1, nil, nil), 1, 1)
+  assert_equal 'List item clicked!', text_view.text
+end
+EOF
+
+      File.open('src/ruboto_array_adapter.rb', 'w'){|f| f << <<EOF}
+class Java::AndroidWidget::ArrayAdapter
+   field_reader :mResource, :mFieldId
+end
+
+class RubotoArrayAdapter
+  import android.content.Context
+
+  def get_view(position, convert_view, parent)
+    puts "IN get_view!!!"
+    @inflater = context.getSystemService(Context::LAYOUT_INFLATER_SERVICE) unless @inflater
+    if convert_view
+      row = convert_view
+      row.findViewById(Ruboto::Id.image).image_drawable = nil
+      row.findViewById(AndroidIds.text1).text = nil
+    else
+      row = @inflater.inflate(mResource, nil)
+    end
+
+    model = get_item position
+    case model
+    when Hash
+      model.each do |field, value|
+        begin
+          field_id = Ruboto::Id.respond_to?(field) && Ruboto::Id.send(field) ||
+              AndroidIds.respond_to?(field) && AndroidIds.send(field)
+          field_view = row.findViewById(field_id)
+          case value
+          when String
+            field_view.text = value
+          when android.graphics.drawable.Drawable
+            field_view.image_drawable = value
+          else
+            raise "Unknown View type: \#{value.inspect}"
+          end
+        rescue Exception
+          puts "Exception setting list item value: \#$!"
+          puts $!.backtrace.join("\n")
+        end
+      end
+    else
+      row.findViewById(mFieldId).text = model.to_s
+    end
+
+    row
+  rescue Exception
+    puts "Exception getting list item view: \#$!"
+    puts $!.backtrace.join("\n")
+    convert_view
+  end
+
+  def getView(position, convert_view, parent)
+    puts "IN get_view!!!"
+    get_view(position, convert_view, parent)
+  end
+
+end
+EOF
+
+      File.open('res/layout/list_item.xml', 'w'){|f| f << <<EOF}
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+>
+  <TextView
+          android:id="@android:id/text1"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:gravity="left"
+          android:layout_weight="1"
+          android:layout_width="wrap_content"
+          android:layout_height="?android:attr/listPreferredItemHeight"
+          android:textColor="#000000"
+  />
+  <ImageView
+          android:id="@+id/image"
+          android:gravity="right"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+  />
+</LinearLayout>
+EOF
+
+    end
+
+    run_app_tests
+  end
+
+  def test_gen_jruby
+    Dir.chdir APP_DIR do
+      system "#{RUBOTO_CMD} gen jruby"
+      assert_equal 0, $?.exitstatus
+      assert File.exists?("libs/jruby-core-#{JRUBY_JARS_VERSION}.jar")
+      assert File.exists?("libs/jruby-stdlib-#{JRUBY_JARS_VERSION}.jar")
     end
   end
 

data/test/service_test.rb

@@ -25,9 +25,8 @@ require 'ruboto/widget'
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class RubotoTestAppActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
+    super
     $ruboto_test_app_activity = self
     set_title 'Domo arigato, Mr Ruboto!'
 

data/test/sqldroid_test.rb

@@ -0,0 +1,87 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+
+# FIXME(uwe):  Remove check when we stop supporting JRuby older than 1.7.0.rc1
+if RubotoTest::JRUBY_JARS_VERSION >= Gem::Version.new('1.7.0.rc1')
+
+require 'bigdecimal'
+require 'test/app_test_methods'
+
+class SqldroidTest < Test::Unit::TestCase
+  def setup
+    generate_app :bundle => :sqldroid
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_sqldroid
+    Dir.chdir APP_DIR do
+      File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/generate'
+require 'sqldroid'
+
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+ruboto_generate("android.widget.ArrayAdapter" => $package_name + ".MyArrayAdapter")
+
+class RubotoTestAppActivity
+  def on_create(bundle)
+    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, ['Record one', 'Record two'])
+    adapter.initialize_ruboto_callbacks do
+      def get_view(position, convert_view, parent)
+        puts "IN get_view!!!"
+        @inflater ||= context.getSystemService(Context::LAYOUT_INFLATER_SERVICE)
+        row = convert_view ? convert_view : @inflater.inflate(mResource, nil)
+        row.findViewById(mFieldId).text = get_item(position)
+        row
+      rescue Exception
+        puts "Exception getting list item view: \#$!"
+        puts $!.backtrace.join("\n")
+        convert_view
+      end
+    end
+
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view_margins = text_view :text => 'What hath Matz wrought?', :id => 42
+          @list_view = list_view :adapter => adapter, :id => 43
+        end
+  end
+end
+EOF
+
+      File.open('test/src/ruboto_test_app_activity_test.rb', 'w'){|f| f << <<EOF}
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+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
+  assert @list_view
+end
+
+test("activity starts") do |activity|
+  assert true
+end
+EOF
+
+    end
+
+    run_app_tests
+  end
+
+end
+
+end
+# EMXIF

data/test/test_helper.rb

@@ -111,7 +111,7 @@ module RubotoTest
   else
     gem_spec = Gem.searcher.find('jruby-jars')
   end
-  # FIXME end
+  # EMXIF
 
   raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
   JRUBY_JARS_VERSION = gem_spec.version
@@ -159,6 +159,7 @@ class Test::Unit::TestCase
     update = options.delete(:update) || false
     excluded_stdlibs = options.delete(:excluded_stdlibs)
     standalone = options.delete(:standalone) || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
+    bundle = options.delete(:bundle)
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
 
@@ -198,10 +199,11 @@ class Test::Unit::TestCase
           FileUtils.rm_rf APP_DIR
           raise "gen app failed with return code #$?"
         end
-        if standalone
-          Dir.chdir APP_DIR do
+        Dir.chdir APP_DIR do
+          write_gemfile(bundle) if bundle
+          if standalone
             exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
-            system "#{RUBOTO_CMD} update jruby --force"
+            system "#{RUBOTO_CMD} gen jruby"
             raise "update jruby failed with return code #$?" if $? != 0
           end
         end
@@ -209,13 +211,13 @@ class Test::Unit::TestCase
 
       # FIXME(uwe): Installation with dexmaker fails on Android < 4.0.3 due to complex interface structure
       # Fixme(uwe): Remove when solved
-      if standalone && ANDROID_OS < 15
-        Dir.chdir APP_DIR do
-          puts "Removing dexmaker jar for android-#{ANDROID_OS}"
-          FileUtils.rm(Dir['libs/dexmaker*.jar'])
-        end
-      end
-      # FIXME end
+      #if standalone && ANDROID_OS < 15
+      #  Dir.chdir APP_DIR do
+      #    puts "Removing dexmaker jar for android-#{ANDROID_OS}"
+      #    FileUtils.rm(Dir['libs/dexmaker*.jar'])
+      #  end
+      #end
+      # EMXIF
 
       unless example && !update
         Dir.chdir APP_DIR do
@@ -266,7 +268,7 @@ class Test::Unit::TestCase
         break if retries >= 3
         puts "Retrying (#{retries})."
       end
-      # FIXME end
+      # EMXIF
 
       assert_equal 0, $?, "tests failed with return code #$?"
     end
@@ -293,4 +295,9 @@ class Test::Unit::TestCase
     File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:excluded_stdlibs => excluded_stdlibs}) }
   end
 
+  def write_gemfile(bundle)
+    puts "Adding Gemfile.apk: #{[*bundle].join(' ')}"
+    File.open('Gemfile.apk', 'w') { |f| f << "source :rubygems\n\ngem 'sqldroid'\n" }
+  end
+
 end

data/test/update_test_methods.rb

@@ -14,52 +14,34 @@ module UpdateTestMethods
   end
 
   def test_broadcast_receiver
-    # FIXME(uwe): Remove check when we stop supporting updating from ruboto_core (Ruboto before version 0.5.2 2011-12-24)
-    if Gem::Version.new(@old_ruboto_version) >= Gem::Version.new('0.5.2')
-      Dir.chdir APP_DIR do
-        puts "Adding a broadcast receiver"
-        install_ruboto_gem @old_ruboto_version
-        system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
-        fail "Creation of broadcast receiver failed" if $? != 0
-        assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
-        assert File.exists? 'src/dummy_receiver.rb'
-        test_file = 'test/src/dummy_receiver_test.rb'
-        assert File.exists? test_file
-
-        # FIXME(uwe):  NOOP?
-        source = File.read(test_file)
-        File.open(test_file, 'w'){|f| f << source}
-
-        update_app
-      end
-      run_app_tests
+    Dir.chdir APP_DIR do
+      puts "Adding a broadcast receiver"
+      install_ruboto_gem @old_ruboto_version
+      system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
+      fail "Creation of broadcast receiver failed" if $? != 0
+      assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
+      assert File.exists? 'src/dummy_receiver.rb'
+      test_file = 'test/src/dummy_receiver_test.rb'
+      assert File.exists? test_file
+      update_app
     end
-    # FIXME end
+    run_app_tests
   end
 
   def test_broadcast_receiver_updated_twice
-    # FIXME(uwe): Remove check when we stop supporting updating from ruboto_core (Ruboto before version 0.5.2 2011-12-24)
-    if Gem::Version.new(@old_ruboto_version) >= Gem::Version.new('0.5.2')
-      Dir.chdir APP_DIR do
-        puts "Adding a broadcast receiver"
-        install_ruboto_gem @old_ruboto_version
-        system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
-        fail "Creation of broadcast receiver failed" if $? != 0
-        assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
-        assert File.exists? 'src/dummy_receiver.rb'
-        test_file = 'test/src/dummy_receiver_test.rb'
-        assert File.exists? test_file
-
-        # FIXME(uwe):  NOOP?
-        source = File.read(test_file)
-        File.open(test_file, 'w'){|f| f << source}
-
-        update_app
-        update_app
-      end
-      run_app_tests
+    Dir.chdir APP_DIR do
+      puts "Adding a broadcast receiver"
+      install_ruboto_gem @old_ruboto_version
+      system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
+      fail "Creation of broadcast receiver failed" if $? != 0
+      assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
+      assert File.exists? 'src/dummy_receiver.rb'
+      test_file = 'test/src/dummy_receiver_test.rb'
+      assert File.exists? test_file
+      update_app
+      update_app
     end
-    # FIXME end
+    run_app_tests
   end
 
   def test_subclass_is_updated
@@ -69,10 +51,13 @@ module UpdateTestMethods
       system "ruboto _#{@old_ruboto_version}_ gen subclass android.database.sqlite.SQLiteOpenHelper --name MyDatabaseHelper --method_base on"
       fail "Creation of subclass failed" if $? != 0
       assert File.exists? 'src/org/ruboto/test_app/MyDatabaseHelper.java'
-      # assert File.exists? 'src/my_database_helper.rb'
-      # assert File.exists? 'test/src/my_database_helper_test.rb'
-
+      if Gem::Version.new(@old_ruboto_version) >= Gem::Version.new('0.8.1.rc.0')
+        assert File.exists? 'src/my_database_helper.rb'
+        assert File.exists? 'test/src/my_database_helper_test.rb'
+      end
       update_app
+      assert File.exists? 'src/my_database_helper.rb'
+      assert File.exists? 'test/src/my_database_helper_test.rb'
       system 'rake debug'
       assert_equal 0, $?
     end