Update android tests

Author: bootstraponline

ruby_lib_android/Rakefile

@@ -21,9 +21,18 @@ def bash cmd
   end
 end
 
+def wait_for_valid_device
+  while `adb shell echo "ping"`.strip != 'ping'
+    `adb kill-server`
+    `adb devices`
+    sleep 5
+  end
+end
+
 # rake android['single_text_name']
 # rake android
 def run_android test_file=nil
+  wait_for_valid_device
   path = File.expand_path('appium.txt', Rake.application.original_dir)
   ENV['APPIUM_TXT'] = path
   puts "Rake appium.txt path is: #{path}"
@@ -55,6 +64,7 @@ end
 
 desc 'ADB uninstall apk'
 task :adb_uninstall do
+  wait_for_valid_device
   # uninstall old api
   cmd = 'adb uninstall com.example.android.apis'
   run_sh cmd

ruby_lib_android/lib/android/specs/android/helper.rb

@@ -17,7 +17,7 @@
 
   t 'find_eles_attr' do
     act = find_eles_attr :text
-    exp = ['API Demos', 'Action Bar', 'Activity', 'Alarm', 'Alert Dialogs', 'Device Admin', 'Fragment', 'Launcher Shortcuts', 'Loader', 'Menu', 'Notification', 'Search', 'Service', 'Text-To-Speech', 'Voice Recognition']
+    exp = ['API Demos', 'Accessibility', 'Animation', 'App', 'Content', 'Graphics', 'Media', 'NFC', 'OS', 'Preference', 'Text', 'Views']
     act.must_equal exp
   end
 

ruby_lib_android/lib/run.rb

@@ -51,6 +51,7 @@
   one_test = File.join(File.dirname(one_test),
                        File.basename(one_test, '.*') + '.rb')
   one_test = File.join(dir, test_dir + 'specs/', one_test)
+  one_test = File.expand_path one_test
   raise "\nTest #{one_test} does not exist.\n" unless File.exists?(one_test)
   # require support (common.rb)
   Dir.glob(File.join dir, test_dir + '/*.rb') do |test|