ruboto 0.9.0 → 0.10.0.rc.0

data/test/activity/mytest_activity_test.rb

@@ -0,0 +1,52 @@
+activity org.ruboto.test_app.MytestActivity
+
+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
+
+def button_activity_text button_id, activity, expected_text_id, expected_text_string
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(button_id).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+  ensure
+    removeMonitor(monitor)
+  end
+  puts "new activity: #{current_activity.inspect}"
+  assert current_activity
+   assert current_activity.is_a? Java::OrgRuboto::RubotoActivity
+  start = Time.now
+  loop do
+    @text_view = current_activity.find_view_by_id(expected_text_id)
+    break if @text_view || (Time.now - start > 10)
+    puts 'wait for text'
+    sleep 1
+  end
+  assert @text_view
+  assert_equal expected_text_string, @text_view.text
+  current_activity.run_on_ui_thread { current_activity.finish }
+  # FIXME(uwe):  Replace sleep with proper monitor
+  sleep 3
+end
+
+test("infile activity starts once", :ui => false) do |activity|
+  button_activity_text 48, activity, 42, 'This is an infile activity.'
+end
+
+test("infile activity starts again", :ui => false) do |activity|
+  button_activity_text 48, activity, 42, 'This is an infile activity.'
+end
+
+test("otherfile activity starts once", :ui => false) do |activity|
+  button_activity_text 49, activity, 42, 'This is an otherfile activity.'
+end
+
+test("otherfile activity starts again", :ui => false) do |activity|
+  button_activity_text 49, activity, 42, 'This is an otherfile activity.'
+end

data/test/activity/mytest_otherfile_activity.rb

@@ -0,0 +1,12 @@
+class MytestOtherfileActivity
+  def on_create(bundle)
+    super
+    set_title 'Otherfile Activity'
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+          text_view :text => 'This is an otherfile activity.', :id => 42, :width => :match_parent,
+                    :gravity => :center, :text_size => 48.0
+        end
+  end
+end

data/test/activity/navigation_activity.rb

@@ -3,7 +3,7 @@ require 'ruboto/widget'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
-class NavigationActivity < Java::OrgRuboto::EntryPointActivity
+class NavigationActivity
   def on_create(bundle)
     super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')

data/test/activity/subclass_activity.rb

@@ -4,11 +4,11 @@ require 'ruboto/widget'
 ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
 class SubclassOfArrayAdapter < Java::AndroidWidget::ArrayAdapter
-  def get_view(position, convert_view, parent)
+  def getView(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.findViewById(mFieldId).text = "[#{get_item(position)}]"
     row
   rescue Exception
     puts "Exception getting list item view: #$!"
@@ -17,17 +17,22 @@ class SubclassOfArrayAdapter < Java::AndroidWidget::ArrayAdapter
   end
 end
 
+class Java::AndroidWidget::ArrayAdapter
+   field_reader :mResource, :mFieldId
+end
+
 class SubclassActivity
   def on_create(bundle)
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
-    adapter = SubclassOfArrayAdapter.new(self, android.R.layout.simple_list_item_1 , AndroidIds::text1, ['Record one', 'Record two'])
+    adapter = SubclassOfArrayAdapter.new(self, android.R.layout.simple_list_item_1, AndroidIds::text1, ['Record one', 'Record two'])
 
     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
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+          @list_view = list_view :adapter => adapter, :id => 43,
+              :on_item_click_listener => proc{|_,view,_,_| @text_view.text = view.findViewById(AndroidIds::text1).text}
         end
   end
 end

data/test/activity/subclass_activity_test.rb

@@ -12,6 +12,21 @@ setup do |activity|
   assert @list_view
 end
 
-test("activity starts") do |activity|
-  assert true
+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
+end
+
+class MyObject < java.lang.Object
+  attr_reader :my_param
+
+  def initialize(my_param)
+    super()
+    @my_param = my_param
+  end
+end
+
+test('add constructor with parameter') do
+  o = MyObject.new('It works!')
+  assert_equal 'It works!', o.my_param
 end

data/test/activity/view_constants_activity.rb

@@ -0,0 +1,42 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class ViewConstantsActivity
+  def on_create(bundle)
+    super
+    $ruboto_test_app_activity = self
+    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 = text_view :text    => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
+                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
+          button :text => 'M-x butterfly', :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
+        startService(android.content.Intent.new(application_context, $package.RubotoTestService.java_class))
+      rescue Exception
+        puts "Exception starting the service: \#{$!}"
+        puts $!.backtrace.join("\\n")
+      end
+    end
+    puts 'butterfly OK'
+  end
+
+end

data/test/activity/view_constants_activity_test.rb

@@ -0,0 +1,30 @@
+activity Java::org.ruboto.test_app.ViewConstantsActivity
+java_import "android.view.ViewGroup"
+java_import "android.view.Gravity"
+java_import "android.os.Build"
+
+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
+
+def view_constant(const)
+  View.convert_constant(const.downcase.to_sym)
+end
+
+test('LayoutParams Constants') do |activity|
+  ViewGroup::LayoutParams.constants.each do |const|
+    assert_equal ViewGroup::LayoutParams.const_get(const), view_constant(const)
+  end
+end
+
+test('Gravity Constants') do |activity|
+  Gravity.constants.each do |const|
+    assert_equal Gravity.const_get(const), view_constant(const)
+  end
+end

data/test/app_test_methods.rb

@@ -4,31 +4,29 @@ module AppTestMethods
   include RubotoTest
 
   def test_activity_tests
-    assert_code 'Base64Loads', "require 'base64'"
-    assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
-    assert_code 'ReadSourceFile', 'File.read(__FILE__)'
-    assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
-    assert_code 'RepeatRubotoImportWidget', 'ruboto_import_widget :TextView ; ruboto_import_widget :TextView'
-    run_activity_tests('activity')
-  end
+    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"
+      end
+    else
+      assert_code 'Base64Loads', "require 'base64'"
 
-  def test_block_def_activity_tests
-    run_activity_tests('block_def_activity')
-  end
+      # FIXME(uwe):  We should try using YAML as well
+      assert_code 'YamlLoads', "require 'ruboto/util/stack' ; with_large_stack{require 'yaml'}"
 
-  def test_handle_activity_tests
-    Dir.chdir APP_DIR do
-      FileUtils.rm "src/ruboto_test_app_activity.rb"
-      FileUtils.rm "test/src/ruboto_test_app_activity_test.rb"
+      assert_code 'ReadSourceFile', 'File.read(__FILE__)'
+      assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
+      assert_code 'RepeatRubotoImportWidget', 'ruboto_import_widget :TextView ; ruboto_import_widget :TextView'
     end
-    run_activity_tests('handle_activity')
+    run_activity_tests('activity')
   end
 
   private
 
   def assert_code(activity_name, code)
     snake_name = activity_name.scan(/[A-Z]+[a-z0-9]+/).map { |s| s.downcase }.join('_')
-    filename   = "src/#{snake_name}_activity.rb"
+    filename = "src/#{snake_name}_activity.rb"
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
       s = File.read(filename)
@@ -38,17 +36,24 @@ module AppTestMethods
   end
 
   def run_activity_tests(activity_dir)
-    Dir[File.expand_path("#{activity_dir}/*_test.rb", File.dirname(__FILE__))].each do |test_src|
-      snake_name    = test_src.chomp('_test.rb')
-
+    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 snake_name =~ /subclass/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.0.rc1'))
-
-      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 test_src, "test/src/"
+      next if file =~ /subclass/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.0.rc1'))
+
+      if file =~ /_test.rb$/
+        next unless file =~ /#{ENV['ACTIVITY_TEST_PATTERN']}/
+        snake_name = file.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", "src/"
+          FileUtils.cp file, "test/src/"
+        end
+      elsif !File.exists? "#{file.chomp('.rb')}'_test.rb'"
+        Dir.chdir APP_DIR do
+          FileUtils.cp file, "src/"
+        end
       end
     end
     run_app_tests

data/test/broadcast_receiver_test.rb

@@ -21,6 +21,8 @@ class BroadcastReceiverTest < Test::Unit::TestCase
 
       assert activity_content.sub!(/  def on_create\(bundle\)\n/, <<EOF)
   def on_create(bundle)
+    super
+    $broadcast_test_activity = self
     @receiver = $package.ClickReceiver.new
     filter = android.content.IntentFilter.new('#{action_name}')
     Thread.start do
@@ -53,7 +55,7 @@ EOF
       assert receiver_content.sub!(/  def on_receive\(context, intent\)\n.*?^  end\n/m, <<EOF)
   def on_receive(context, intent)
     Log.d "RUBOTO TEST", "Changing UI text"
-    context.run_on_ui_thread{$activity.find_view_by_id(42).text = '#{message}'}
+    context.run_on_ui_thread{$broadcast_test_activity.find_view_by_id(42).text = '#{message}'}
     Log.d "RUBOTO TEST", "UI text changed OK!"
   rescue
     Log.e "RUBOTO TEST", "Exception changing UI text: \#{$!.message}"

data/test/ruboto_gen_test.rb

@@ -56,16 +56,16 @@ class RubotoGenTest < Test::Unit::TestCase
     version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
     if RUBOTO_PLATFORM == 'STANDALONE'
       upper_limit = {
-          '1.6.7' => ANDROID_TARGET < 15 ? 5800.0 : 5900.0,
+          '1.6.7' => 5900.0,
+          '1.6.8' => 5900.0,
           '1.7.0' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
           '1.7.1.dev' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
       }[JRUBY_JARS_VERSION.to_s] || 7600.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
-          7 => 67.0,
-          10 => 64.0,
-          15 => 68.0,
+          10 => 62.0,
+          15 => 63.0,
       }[ANDROID_TARGET] || 64.0
     end
     lower_limit = upper_limit * 0.9

data/test/test_helper.rb

@@ -68,7 +68,9 @@ module RubotoTest
       if File.exists?(local_gem_file)
         system "gem install -l #{local_gem_file} --no-ri --no-rdoc"
       else
-        system "gem install -r jruby-jars#{version_requirement} --no-ri --no-rdoc"
+        Dir.chdir('tmp') do
+          system "gem install -r jruby-jars#{version_requirement} --no-ri --no-rdoc"
+        end
       end
     end
     raise "install of jruby-jars failed with return code #$?" unless $? == 0
@@ -299,7 +301,8 @@ class Test::Unit::TestCase
       fail "Unknown Ruboto platform: #{RUBOTO_PLATFORM.inspect}"
     end
     if $? != 0
-      FileUtils.rm_rf 'tmp/RubotoCore'
+      # FIXME(uwe): Delete failed RubotoCore.  Kept temporarily for debuging.
+      # FileUtils.rm_rf 'tmp/RubotoCore'
       fail 'Error (un)installing RubotoCore'
     end
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: 
+  hash: -86398566
+  prerelease: 7
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  - rc
+  - 0
+  version: 0.10.0.rc.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-07 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -95,15 +97,12 @@ files:
 - assets/src/ruboto/activity.rb
 - assets/src/ruboto/base.rb
 - assets/src/ruboto/broadcast_receiver.rb
-- assets/src/ruboto/legacy.rb
-- assets/src/ruboto/menu.rb
 - assets/src/ruboto/package.rb
 - assets/src/ruboto/preference.rb
 - assets/src/ruboto/service.rb
 - assets/src/ruboto/util/stack.rb
 - assets/src/ruboto/util/toast.rb
 - assets/src/ruboto/widget.rb
-- assets/src/ruboto.rb
 - assets/src/RubotoActivity.java
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
@@ -112,7 +111,6 @@ files:
 - lib/DalvikProxyClassFactory.java
 - lib/DexClient.java
 - lib/java_class_gen/android_api.xml
-- lib/java_class_gen/InheritingClass.java.erb
 - lib/ruboto/api.rb
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
@@ -138,6 +136,9 @@ files:
 - test/activity/image_button_and_button_activity_test.rb
 - test/activity/margins_activity.rb
 - test/activity/margins_activity_test.rb
+- test/activity/mytest_activity.rb
+- test/activity/mytest_activity_test.rb
+- test/activity/mytest_otherfile_activity.rb
 - test/activity/navigation_activity.rb
 - test/activity/navigation_activity_test.rb
 - test/activity/option_menu_activity.rb
@@ -148,33 +149,11 @@ files:
 - test/activity/stack_activity_test.rb
 - test/activity/subclass_activity.rb
 - test/activity/subclass_activity_test.rb
+- test/activity/view_constants_activity.rb
+- test/activity/view_constants_activity_test.rb
 - test/app_test_methods.rb
-- test/block_def_activity/image_button_activity.rb
-- test/block_def_activity/image_button_activity_test.rb
-- test/block_def_activity/image_button_and_button_activity.rb
-- test/block_def_activity/image_button_and_button_activity_test.rb
-- test/block_def_activity/margins_activity.rb
-- test/block_def_activity/margins_activity_test.rb
-- test/block_def_activity/option_menu_activity.rb
-- test/block_def_activity/option_menu_activity_test.rb
-- test/block_def_activity/psych_activity.rb
-- test/block_def_activity/psych_activity_test.rb
-- test/block_def_activity/stack_activity.rb
-- test/block_def_activity/stack_activity_test.rb
 - test/broadcast_receiver_test.rb
 - test/gem_test.rb
-- test/handle_activity/image_button_activity.rb
-- test/handle_activity/image_button_activity_test.rb
-- test/handle_activity/image_button_and_button_activity.rb
-- test/handle_activity/image_button_and_button_activity_test.rb
-- test/handle_activity/margins_activity.rb
-- test/handle_activity/margins_activity_test.rb
-- test/handle_activity/option_menu_activity.rb
-- test/handle_activity/option_menu_activity_test.rb
-- test/handle_activity/psych_activity.rb
-- test/handle_activity/psych_activity_test.rb
-- test/handle_activity/stack_activity.rb
-- test/handle_activity/stack_activity_test.rb
 - test/minimal_app_test.rb
 - test/rake_test.rb
 - test/ruboto_gen_test.rb
@@ -184,7 +163,6 @@ files:
 - test/test_helper.rb
 - test/update_test_methods.rb
 - test/updated_example_test_methods.rb
-- test/view_constants_test.rb
 homepage: http://ruboto.org/
 licenses: []
 
@@ -205,12 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ruboto/ruboto