test/app_test_methods.rb in ruboto-0.9.0 vs test/app_test_methods.rb in ruboto-0.10.0.rc.0

@@ -2,54 +2,59 @@
 
 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)
       raise "Code injection failed!" unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")
       File.open(filename, 'w') { |f| f << s }
     end
   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'))
+      next if file =~ /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/"
+      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
   end