ruboto 0.11.0 → 0.12.0.rc.0

data/test/activity/navigation_activity_test.rb

@@ -41,19 +41,19 @@ test('button starts infile class activity', :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|
+test('infile activity starts again', :ui => false) do |activity|
   button_activity_text 48, activity, 42, 'This is an infile activity.'
 end
 
-test("start ruby file activity", :ui => false) do |activity|
+test('start ruby file activity', :ui => false) do |activity|
   button_activity_text 49, activity, 42, 'This is a Ruby file activity.'
 end
 
-test("start ruby file activity again", :ui => false) do |activity|
+test('start ruby file activity again', :ui => false) do |activity|
   button_activity_text 49, activity, 42, 'This is a Ruby file activity.'
 end
 
-test("start ruboto activity without config", :ui => false) do |activity|
+test('start ruboto activity without config', :ui => false) do |activity|
   a = start_activity_by_button activity, 50
   assert_equal 'Ruboto Test App', a.title
 end
@@ -75,8 +75,8 @@ def start_activity_by_button(activity, button_id, activity_class_name = 'org.rub
   current_activity
 end
 
-def button_activity_text button_id, activity, expected_text_id, expected_text_string,
-    activity_class_name = 'org.ruboto.RubotoActivity'
+def button_activity_text(button_id, activity, expected_text_id, expected_text_string,
+    activity_class_name = 'org.ruboto.RubotoActivity')
   current_activity = start_activity_by_button(activity, button_id, activity_class_name)
   start = Time.now
   loop do
@@ -91,7 +91,7 @@ ensure
   if current_activity
     finish_at = Time.now
     finished = false
-    current_activity.run_on_ui_thread { current_activity.finish ; finished = true }
+    current_activity.run_on_ui_thread { current_activity.finish; finished = true }
     loop do
       break if finished || (Time.now - finish_at > 10)
       puts 'wait for finish'

data/test/activity/option_menu_activity.rb

@@ -17,7 +17,6 @@ class OptionMenuActivity
 
   def onCreateOptionsMenu(menu)
     mi = menu.add('Test')
-    # mi.icon = $package.R::drawable::get_ruboto_core
     mi.setIcon($package.R::drawable::get_ruboto_core)
     mi.set_on_menu_item_click_listener do |menu_item|
       @text_view.text = 'What hath Matz wrought!'

data/test/activity/option_menu_activity_test.rb

@@ -11,7 +11,7 @@ setup do |activity|
 end
 
 test('option_menu changes text') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
+  assert_equal 'What hath Matz wrought?', @text_view.text
   activity.window.performPanelIdentifierAction(android.view.Window::FEATURE_OPTIONS_PANEL, 0, 0)
-  assert_equal "What hath Matz wrought!", @text_view.text
+  assert_equal 'What hath Matz wrought!', @text_view.text
 end

data/test/activity/stack_activity_test.rb

@@ -10,30 +10,20 @@ setup do |activity|
   assert @text_view
 end
 
-# ANDROID: 10, PLATFORM: 0.4.7,     JRuby: 1.7.0.dev      '28334966'         expected, but got '28335067'
-# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0         '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
-# ANDROID: 16, PLATFORM: 0.4.8.dev, JRuby: 1.7.0.preview2 '[29, 34, 47, 64]' expected, but got '[28, 33, 47, 64]'
+# ANDROID: 10, PLATFORM: 0.5.3,      JRuby: 1.7.3          '[28, 33, 46, 63]' expected, but got '[43, 48, 45, 62]'
+# ANDROID: 10, PLATFORM: 0.5.4,      JRuby: 1.7.3          '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0          '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 test('stack depth') do |activity|
   os_offset = {
       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 = {
-        '0.4.7' => [0, 0, 4, 4],
-    }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
-  else # STANDALONE
-    jruby_offset = {
-        /^1\.6/ => [0, 0, 4, 4],
-        // => [0, 0, 0, 0],
-    }.find{|k,v| org.jruby.runtime.Constants::VERSION =~ k}[1]
-  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],
-                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
+  assert_equal [28 + os_offset[0],
+                33 + os_offset[1],
+                45 + os_offset[2],
+                62 + os_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
 end

data/test/app_test_methods.rb

@@ -37,10 +37,6 @@ 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.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 include jopenssl and bouncycastle
       next if file =~ /ssl/
       # EMXIF

data/test/broadcast_receiver_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'fileutils'
 
 class BroadcastReceiverTest < Test::Unit::TestCase
@@ -38,6 +38,15 @@ class BroadcastReceiverTest < Test::Unit::TestCase
     end
 EOF
 
+      assert activity_content.sub!(/^  private$/m, <<EOF)
+  def onDestroy
+    super
+    unregisterReceiver(@receiver)
+  end
+
+  private
+EOF
+
       assert activity_content.sub!(/  def butterfly\n.*?  end\n/m, <<EOF)
   def butterfly
     intent = android.content.Intent.new
@@ -45,6 +54,7 @@ EOF
     send_broadcast(intent)
   end
 EOF
+
       File.open(activity_filename, 'w') { |f| f << activity_content }
 
       system "#{RUBOTO_CMD} gen class BroadcastReceiver --name ClickReceiver"
@@ -54,13 +64,13 @@ EOF
 
       assert receiver_content.sub!(/  def onReceive\(context, intent\)\n.*?^  end\n/m, <<EOF)
   def onReceive(context, intent)
-    Log.d "RUBOTO TEST", "Changing UI text"
+    Log.d 'RUBOTO TEST', 'Changing UI text'
     context.run_on_ui_thread{$broadcast_test_activity.find_view_by_id(42).text = '#{message}'}
-    Log.d "RUBOTO TEST", "UI text changed OK!"
+    Log.d 'RUBOTO TEST', 'UI text changed OK!'
   rescue Exception
-    Log.e "RUBOTO TEST", "Exception changing UI text: \#{$!.message}"
-    Log.e "RUBOTO TEST", $!.message
-    Log.e "RUBOTO TEST", $!.backtrace.join("\\n")
+    Log.e 'RUBOTO TEST', "Exception changing UI text: \#{$!.message}"
+    Log.e 'RUBOTO TEST', $!.message
+    Log.e 'RUBOTO TEST', $!.backtrace.join("\\n")
   end
 EOF
       File.open(receiver_filename, 'w') { |f| f << receiver_content }

data/test/minimal_app_test.rb

@@ -12,21 +12,15 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
-    # 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.3MB.  JRuby: 1.7.3,     ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 1.7.3,     ANDROID_TARGET: 15
     # APK was 4.4MB.  JRuby: 1.7.4.dev, ANDROID_TARGET: 10
-
     def test_minimal_apk_is_within_limits
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
-          '1.6.7' => 3.5,
-          '1.6.7.2' => 3.5,
-          '1.6.8' => 3.5,
           '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
           '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
           '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
@@ -42,26 +36,24 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       run_app_tests
     end
 
-    # 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.5MB.  JRuby: 1.7.3, ANDROID_TARGET: 10
     # APK was 4.6MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 10.
     # APK was 4.5MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 15.
+    # APK was 5.0MB.  JRuby: 1.7.4.dev, ANDROID_TARGET: 10
     # FIXME(uwe): Remove when we remove the exclude feature
     def test_minimal_apk_with_excludes_is_less_than_5_mb
       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 ../1.9}
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
-          '1.6.7' => 3.5,
-          '1.6.7.2' => 3.5,
-          '1.6.8' => 3.5,
           '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 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
+          '1.7.3' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
+      }[JRUBY_JARS_VERSION.to_s] || 5.0
       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

@@ -9,32 +9,27 @@ class RakeTest < Test::Unit::TestCase
     cleanup_app
   end
 
-  # 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'
-  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'
-        s = File.read(activity_filename)
-        s.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
-        File.open(activity_filename, 'w') { |f| f << s }
+  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'
+      s = File.read(activity_filename)
+      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'
-        s2 = File.read(test_filename)
-        s2.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
-        File.open(test_filename, 'w') { |f| f << s2 }
+      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!')
+      File.open(test_filename, 'w') { |f| f << s2 }
 
-        apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
-      end
-      run_app_tests
+      apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
+    end
+    run_app_tests
 
-      # 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'
-      # EMXIF
+    # 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'
+    # EMXIF
 
-      assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
-    end
+    assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
   end
 
   def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
@@ -53,7 +48,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+'/)
@@ -61,4 +56,23 @@ class RakeTest < Test::Unit::TestCase
     end
   end
 
+  def test_install_with_space_in_project_name
+    app_dir = "#{APP_DIR} with_space"
+    FileUtils.mv APP_DIR, app_dir
+    Dir.chdir app_dir do
+      system 'rake install'
+      raise "'rake install' exited with code #$?" unless $? == 0
+    end
+  ensure
+    FileUtils.rm_rf app_dir
+  end
+
+  def test_install_when_adb_server_is_stopped
+    Dir.chdir APP_DIR do
+      system 'adb kill-server'
+      system 'rake install'
+      raise "'rake install' exited with code #$?" unless $? == 0
+    end
+  end
+
 end

data/test/ruboto_gen_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'bigdecimal'
 require 'test/app_test_methods'
 
@@ -49,16 +49,16 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
-  # APK was    56.4KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 7
-  # APK was    61.9KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 10
-  # APK was    67.2KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 15
+  # APK was    57.1KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
+  # APK was    58.3KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
   # APK was    73.1KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 16
-  # APK was  5879.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.6.7
+  # APK was    57.1KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 10
   # APK was  7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0
   # APK was  7310.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.2
-  # APK was  7337.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.2.
+  # APK was  7337.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.2
   # APK was  7317.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.3
   # APK was  7332.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.3
+  # APK was  8428.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.4.dev
   # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4.dev
   # APK was  7420.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.4.dev
   def test_new_apk_size_is_within_limits
@@ -67,19 +67,16 @@ class RubotoGenTest < Test::Unit::TestCase
     version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
     if RUBOTO_PLATFORM == 'STANDALONE'
       upper_limit = {
-          '1.6.7' => 5900.0,
-          '1.6.8' => 5900.0,
           '1.7.0' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
           '1.7.1' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
           '1.7.2' => 7400.0,
           '1.7.3' => 7400.0,
-      }[JRUBY_JARS_VERSION.to_s] || 7500.0
+      }[JRUBY_JARS_VERSION.to_s] || 8500.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
-          7 => 62.0,
-          10 => 62.0,
-          15 => 63.0,
+          10 => 58.0,
+          15 => 59.0,
           16 => 74.0,
       }[ANDROID_TARGET] || 74.0
     end
@@ -109,7 +106,7 @@ class RubotoGenTest < Test::Unit::TestCase
 
       # 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(/^(public class .*ArrayAdapter) (.*ArrayAdapter)/, '\1<T>\2<T>').gsub(/T.class/, 'Object.class')}
+      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
 
       assert File.exists?('src/ruboto_array_adapter.rb')
@@ -267,8 +264,8 @@ EOF
       Dir.chdir APP_DIR do
         system "#{RUBOTO_CMD} gen jruby"
         assert_equal 0, $?.exitstatus
-        assert_equal ["libs/jruby-core-#{JRUBY_JARS_VERSION.to_s.downcase}.jar"], Dir["libs/jruby-core-*.jar"].map(&:downcase)
-        assert_equal ["libs/jruby-stdlib-#{JRUBY_JARS_VERSION.to_s.downcase}.jar"], Dir["libs/jruby-stdlib-*.jar"].map(&:downcase)
+        assert_equal %W(libs/jruby-core-#{JRUBY_JARS_VERSION.to_s.downcase}.jar), Dir['libs/jruby-core-*.jar'].map(&:downcase)
+        assert_equal %W(libs/jruby-stdlib-#{JRUBY_JARS_VERSION.to_s.downcase}.jar), Dir['libs/jruby-stdlib-*.jar'].map(&:downcase)
       end
     end
   end

data/test/sqldroid_test.rb

@@ -1,9 +1,7 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
-# FIXME(uwe):  Remove check when we stop supporting JRuby older than 1.7.0.rc1
 # FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
-if RubotoTest::JRUBY_JARS_VERSION >= Gem::Version.new('1.7.0.rc1') &&
-    (RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE')
+if RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE'
 
 require 'bigdecimal'
 require 'test/app_test_methods'
@@ -28,14 +26,13 @@ ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
 class MyArrayAdapter < android.widget.ArrayAdapter
   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")
+    puts $!.backtrace.join("\\n")
     convert_view
   end
 end

data/test/test_helper.rb

@@ -5,9 +5,11 @@ require 'rubygems'
 require 'fileutils'
 require 'yaml'
 require 'ruboto/sdk_versions'
+require 'ruboto/sdk_locations'
 
 module RubotoTest
   include Ruboto::SdkVersions
+  include Ruboto::SdkLocations
 
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR

data/test/update_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__))
 require 'test/app_test_methods'
 
 module UpdateTestMethods
@@ -34,10 +34,10 @@ module UpdateTestMethods
   unless Gem::Version.new(@old_ruboto_version) <= Gem::Version.new('0.10.0.rc.0')
     def test_broadcast_receiver
       Dir.chdir APP_DIR do
-        puts "Adding a broadcast receiver"
+        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
+        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'
@@ -49,10 +49,10 @@ module UpdateTestMethods
 
     def test_broadcast_receiver_updated_twice
       Dir.chdir APP_DIR do
-        puts "Adding a broadcast receiver"
+        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
+        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'
@@ -66,10 +66,10 @@ module UpdateTestMethods
 
   def test_subclass_is_updated
     Dir.chdir APP_DIR do
-      puts "Adding a subclass"
+      puts 'Adding a subclass'
       install_ruboto_gem @old_ruboto_version
       system "ruboto _#{@old_ruboto_version}_ gen subclass android.database.sqlite.SQLiteOpenHelper --name MyDatabaseHelper --method_base on"
-      fail "Creation of subclass failed" if $? != 0
+      fail 'Creation of subclass failed' if $? != 0
       assert File.exists? 'src/org/ruboto/test_app/MyDatabaseHelper.java'
       if Gem::Version.new(@old_ruboto_version) >= Gem::Version.new('0.8.1.rc.0')
         assert File.exists? 'src/my_database_helper.rb'
@@ -86,10 +86,10 @@ module UpdateTestMethods
   private
 
   def assert_code(code)
-    filename = "src/ruboto_test_app_activity.rb"
+    filename = 'src/ruboto_test_app_activity.rb'
     Dir.chdir APP_DIR do
       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