From 67387153ae98fbd133ce43647d2090d5838345c6 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Mon, 4 Apr 2022 16:38:58 +0200 Subject: [PATCH] refactor!: Remove deprecated option classes --- .../java_client/android/AndroidOptions.java | 41 ---------- .../io/appium/java_client/ios/IOSOptions.java | 41 ---------- .../android/AndroidOptionsTest.java | 78 ------------------- .../java_client/ios/IOSOptionsTest.java | 78 ------------------- 4 files changed, 238 deletions(-) delete mode 100644 src/main/java/io/appium/java_client/android/AndroidOptions.java delete mode 100644 src/main/java/io/appium/java_client/ios/IOSOptions.java delete mode 100644 src/test/java/io/appium/java_client/android/AndroidOptionsTest.java delete mode 100644 src/test/java/io/appium/java_client/ios/IOSOptionsTest.java diff --git a/src/main/java/io/appium/java_client/android/AndroidOptions.java b/src/main/java/io/appium/java_client/android/AndroidOptions.java deleted file mode 100644 index 3841ab62c..000000000 --- a/src/main/java/io/appium/java_client/android/AndroidOptions.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.appium.java_client.android; - -import io.appium.java_client.remote.MobileOptions; -import io.appium.java_client.remote.MobilePlatform; -import org.openqa.selenium.Capabilities; - -/** - * Use the specific options class for your driver, - * for example UiAutomator2Options. - */ -@Deprecated -public class AndroidOptions extends MobileOptions { - public AndroidOptions() { - setAndroidPlatformName(); - } - - public AndroidOptions(Capabilities source) { - super(source); - setAndroidPlatformName(); - } - - private void setAndroidPlatformName() { - setPlatformName(MobilePlatform.ANDROID); - } -} diff --git a/src/main/java/io/appium/java_client/ios/IOSOptions.java b/src/main/java/io/appium/java_client/ios/IOSOptions.java deleted file mode 100644 index 9cb847d1e..000000000 --- a/src/main/java/io/appium/java_client/ios/IOSOptions.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.appium.java_client.ios; - -import io.appium.java_client.remote.MobileOptions; -import io.appium.java_client.remote.MobilePlatform; -import org.openqa.selenium.Capabilities; - -/** - * Use the specific options class for your driver, - * for example XCUITestOptions. - */ -@Deprecated -public class IOSOptions extends MobileOptions { - public IOSOptions() { - setIOSPlatformName(); - } - - public IOSOptions(Capabilities source) { - super(source); - setIOSPlatformName(); - } - - private void setIOSPlatformName() { - setPlatformName(MobilePlatform.IOS); - } -} diff --git a/src/test/java/io/appium/java_client/android/AndroidOptionsTest.java b/src/test/java/io/appium/java_client/android/AndroidOptionsTest.java deleted file mode 100644 index 26061993f..000000000 --- a/src/test/java/io/appium/java_client/android/AndroidOptionsTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.appium.java_client.android; - -import io.appium.java_client.remote.AutomationName; -import io.appium.java_client.remote.MobilePlatform; -import org.junit.Test; -import org.openqa.selenium.MutableCapabilities; -import org.openqa.selenium.Platform; -import org.openqa.selenium.ScreenOrientation; - -import java.net.MalformedURLException; -import java.net.URL; -import java.time.Duration; - -import static org.junit.Assert.assertEquals; - -public class AndroidOptionsTest { - - @Test - public void setsPlatformNameByDefault() { - assertEquals(Platform.ANDROID, new AndroidOptions().getPlatformName()); - } - - @Test - public void acceptsExistingCapabilities() { - MutableCapabilities capabilities = new MutableCapabilities(); - capabilities.setCapability("deviceName", "Pixel"); - capabilities.setCapability("platformVersion", "10"); - capabilities.setCapability("newCommandTimeout", 60); - - AndroidOptions androidOptions = new AndroidOptions(capabilities); - - assertEquals("Pixel", androidOptions.getDeviceName()); - assertEquals("10", androidOptions.getPlatformVersion()); - assertEquals(Duration.ofSeconds(60), androidOptions.getNewCommandTimeout()); - } - - @Test - public void acceptsMobileCapabilities() throws MalformedURLException { - AndroidOptions androidOptions = new AndroidOptions(); - androidOptions.setApp(new URL("http://example.com/myapp.apk")) - .setAutomationName(AutomationName.ANDROID_UIAUTOMATOR2) - .setPlatformVersion("10") - .setDeviceName("Pixel") - .setOtherApps("/path/to/app.apk") - .setLocale("fr_CA") - .setUdid("1ae203187fc012g") - .setOrientation(ScreenOrientation.LANDSCAPE) - .setNewCommandTimeout(Duration.ofSeconds(60)) - .setLanguage("fr"); - - assertEquals("http://example.com/myapp.apk", androidOptions.getApp()); - assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, androidOptions.getAutomationName()); - assertEquals("10", androidOptions.getPlatformVersion()); - assertEquals("Pixel", androidOptions.getDeviceName()); - assertEquals("/path/to/app.apk", androidOptions.getOtherApps()); - assertEquals("fr_CA", androidOptions.getLocale()); - assertEquals("1ae203187fc012g", androidOptions.getUdid()); - assertEquals(ScreenOrientation.LANDSCAPE, androidOptions.getOrientation()); - assertEquals(Duration.ofSeconds(60), androidOptions.getNewCommandTimeout()); - assertEquals("fr", androidOptions.getLanguage()); - } -} diff --git a/src/test/java/io/appium/java_client/ios/IOSOptionsTest.java b/src/test/java/io/appium/java_client/ios/IOSOptionsTest.java deleted file mode 100644 index 4bfa02ea6..000000000 --- a/src/test/java/io/appium/java_client/ios/IOSOptionsTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.appium.java_client.ios; - -import io.appium.java_client.remote.AutomationName; -import io.appium.java_client.remote.MobilePlatform; -import org.junit.Test; -import org.openqa.selenium.MutableCapabilities; -import org.openqa.selenium.Platform; -import org.openqa.selenium.ScreenOrientation; - -import java.net.MalformedURLException; -import java.net.URL; -import java.time.Duration; - -import static org.junit.Assert.assertEquals; - -public class IOSOptionsTest { - private IOSOptions iosOptions = new IOSOptions(); - - @Test - public void setsPlatformNameByDefault() { - assertEquals(Platform.IOS, iosOptions.getPlatformName()); - } - - @Test - public void acceptsExistingCapabilities() { - MutableCapabilities capabilities = new MutableCapabilities(); - capabilities.setCapability("deviceName", "Pixel"); - capabilities.setCapability("platformVersion", "10"); - capabilities.setCapability("newCommandTimeout", 60); - - iosOptions = new IOSOptions(capabilities); - - assertEquals("Pixel", iosOptions.getDeviceName()); - assertEquals("10", iosOptions.getPlatformVersion()); - assertEquals(Duration.ofSeconds(60), iosOptions.getNewCommandTimeout()); - } - - @Test - public void acceptsMobileCapabilities() throws MalformedURLException { - iosOptions.setApp(new URL("http://example.com/myapp.apk")) - .setAutomationName(AutomationName.ANDROID_UIAUTOMATOR2) - .setPlatformVersion("10") - .setDeviceName("Pixel") - .setOtherApps("/path/to/app.apk") - .setLocale("fr_CA") - .setUdid("1ae203187fc012g") - .setOrientation(ScreenOrientation.LANDSCAPE) - .setNewCommandTimeout(Duration.ofSeconds(60)) - .setLanguage("fr"); - - assertEquals("http://example.com/myapp.apk", iosOptions.getApp()); - assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, iosOptions.getAutomationName()); - assertEquals("10", iosOptions.getPlatformVersion()); - assertEquals("Pixel", iosOptions.getDeviceName()); - assertEquals("/path/to/app.apk", iosOptions.getOtherApps()); - assertEquals("fr_CA", iosOptions.getLocale()); - assertEquals("1ae203187fc012g", iosOptions.getUdid()); - assertEquals(ScreenOrientation.LANDSCAPE, iosOptions.getOrientation()); - assertEquals(Duration.ofSeconds(60), iosOptions.getNewCommandTimeout()); - assertEquals("fr", iosOptions.getLanguage()); - } -}