test: tweak tests (#508)

Author: KazuCocoa

lib/appium_lib_core/common/base/driver.rb

@@ -472,7 +472,7 @@ def available_contexts
         #   @driver.set_context "NATIVE_APP"
         #   @driver.context = "NATIVE_APP"
         #
-        def context=(context = null)
+        def context=(context = nil)
           @bridge.set_context(context)
         end
         alias set_context context=

lib/appium_lib_core/common/device/context.rb

@@ -42,7 +42,7 @@ def available_contexts
             execute(:available_contexts, {}) || []
           end
 
-          def set_context(context = null)
+          def set_context(context = nil)
             execute :set_context, {}, name: context
           end
         end # module ImeActions

test/functional/android/android/device_test.rb

@@ -48,27 +48,6 @@ def test_shake
         assert @driver.shake
       end
 
-      def test_close_and_launch_app
-        if @@core.automation_name == :espresso
-          assert_raises ::Selenium::WebDriver::Error::UnsupportedOperationError do
-            @driver.close_app
-          end
-        else
-          @driver.close_app
-          assert(@driver.wait_until { |d| d.app_state('io.appium.android.apis') != :running_in_foreground })
-        end
-
-        if @@core.automation_name == :espresso
-          assert_raises ::Selenium::WebDriver::Error::UnsupportedOperationError do
-            @driver.launch_app
-          end
-        else
-          @driver.launch_app
-          e = @driver.wait_until { |d| d.find_element :accessibility_id, 'App' }
-          assert_equal 'App', e.text
-        end
-      end
-
       def test_lock_unlock
         @driver.lock
         assert @driver.device_locked?
@@ -202,42 +181,6 @@ def test_touch_actions
         @driver.back
       end
 
-      # @deprecated Appium::Core::TouchAction
-      def test_swipe
-        @driver.wait_until { |d| d.find_element :accessibility_id, 'App' }.click
-
-        el = @driver.wait_until { |d| d.find_element :accessibility_id, 'Fragment' }
-        rect = el.rect
-
-        Appium::Core::TouchAction.new(@driver)
-                                 .swipe(start_x: 75, start_y: 500, end_x: 75, end_y: 500, duration: 500)
-                                 .perform
-        @driver.back # The above command become "tap" action since it doesn't move.
-        el = @driver.wait_until { |d| d.find_element :accessibility_id, 'Fragment' }
-        assert rect.x == el.rect.x
-        assert rect.y == el.rect.y
-
-        touch_action = Appium::Core::TouchAction.new(@driver)
-                                                .swipe(start_x: 75, start_y: 500, end_x: 75, end_y: 300, duration: 500)
-
-        assert_equal :press, touch_action.actions[0][:action]
-        assert_equal({ x: 75, y: 500 }, touch_action.actions[0][:options])
-
-        assert_equal :wait, touch_action.actions[1][:action]
-        assert_equal({ ms: 500 }, touch_action.actions[1][:options])
-
-        assert_equal :moveTo, touch_action.actions[2][:action]
-        assert_equal({ x: 75, y: 300 }, touch_action.actions[2][:options])
-
-        assert_equal :release, touch_action.actions[3][:action]
-
-        touch_action.perform
-        assert_equal [], touch_action.actions
-
-        assert rect.x == el.rect.x
-        assert rect.y > el.rect.y
-      end
-
       def test_hidekeyboard
         @driver.wait_until { |d| d.find_element :accessibility_id, 'App' }.click
         @driver.wait_until { |d| d.find_element :accessibility_id, 'Activity' }.click

test/functional/ios/driver_test.rb

@@ -109,7 +109,6 @@ def test_click_back
     def test_default_keyboard_pref
       skip_as_appium_version '1.15.0'
 
-      bundle_id = @@driver.session_capabilities['CFBundleIdentifier']
       begin
         @@driver.terminate_app('com.apple.Preferences') # To ensure the app shows the top view
         @@driver.activate_app('com.apple.Preferences')
@@ -128,7 +127,7 @@ def test_default_keyboard_pref
         assert_equal '0', auto_correction.value
         assert_equal '0', predictive.value
       ensure
-        @@driver.activate_app(bundle_id)
+        @@driver.activate_app('com.example.apple-samplecode.UICatalog')
       end
     end