Skip to content

test: Update e2e tests #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 4, 2022
Merged

test: Update e2e tests #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01389d5
test: Check new beta version
mykola-mokhnach Jun 3, 2022
0e25586
rerun
mykola-mokhnach Jun 4, 2022
e8b1d70
Update Android tests
mykola-mokhnach Jun 4, 2022
51e262f
Update tests
mykola-mokhnach Jun 4, 2022
0b79932
Update deprecations
mykola-mokhnach Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 9 additions & 23 deletions ...test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.appium.java_client.pagefactory_tests.widget.tests;

import static com.google.common.collect.ImmutableList.of;
import static io.appium.java_client.remote.AutomationName.APPIUM;
import static io.appium.java_client.remote.AutomationName.ANDROID_UIAUTOMATOR2;
import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
import static io.appium.java_client.remote.MobilePlatform.ANDROID;
import static io.appium.java_client.remote.MobilePlatform.IOS;
Expand All @@ -13,13 +13,12 @@
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.HasCapabilities;
import org.openqa.selenium.ImmutableCapabilities;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.logging.Logs;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.Response;

import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -115,10 +114,10 @@ public String getAutomationName() {

@Override
public Capabilities getCapabilities() {
Map<String, Object> caps = new HashMap<>();
caps.put("platformName", getPlatformName());
caps.put("automationName", getAutomationName());
return new DesiredCapabilities(caps);
return new ImmutableCapabilities(
"appium:platformName", getPlatformName(),
"appium:automationName", getAutomationName()
);
}

@Override
Expand Down Expand Up @@ -200,20 +199,7 @@ public String getPlatformName() {

@Override
public String getAutomationName() {
return APPIUM;
}
}

public static class StubIOSDriver extends AbstractStubWebDriver {

@Override
public String getPlatformName() {
return IOS;
}

@Override
public String getAutomationName() {
return APPIUM;
return ANDROID_UIAUTOMATOR2;
}
}

Expand All @@ -239,7 +225,7 @@ public String getPlatformName() {

@Override
public String getAutomationName() {
return APPIUM;
return WINDOWS;
}
}

Expand All @@ -265,7 +251,7 @@ public String getPlatformName() {

@Override
public String getAutomationName() {
return APPIUM;
return ANDROID;
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...t/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;

import io.appium.java_client.pagefactory.OverrideWidget;
import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
Expand All @@ -20,6 +20,7 @@
import java.util.Collection;
import java.util.List;

@SuppressWarnings({"unused", "unchecked"})
@RunWith(Parameterized.class)
public class CombinedAppTest extends WidgetTest {

Expand All @@ -42,8 +43,6 @@ public static Collection<Object[]> data() {
DefaultFindByWidget.class),
dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubAndroidDriver(),
DefaultAndroidWidget.class),
dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubIOSDriver(),
DefaultStubWidget.class),
dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubIOSXCUITDriver(),
DefaultStubWidget.class),
dataArray(new PartiallyCombinedApp(), new AbstractStubWebDriver.StubWindowsDriver(),
Expand All @@ -62,7 +61,7 @@ public CombinedAppTest(AbstractApp app, WebDriver driver, Class<? extends Defaul

@Override
public void checkThatWidgetsAreCreatedCorrectly() {
assertThat("Excpected widget class was " + widgetClass.getName(),
assertThat("Expected widget class was " + widgetClass.getName(),
app.getWidget().getSelfReference().getClass(),
equalTo(widgetClass));

Expand Down
7 changes: 3 additions & 4 deletions ...ava/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;

import io.appium.java_client.pagefactory.OverrideWidget;
import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
Expand All @@ -23,6 +23,7 @@
import java.util.List;


@SuppressWarnings({"unchecked", "unused"})
@RunWith(Parameterized.class)
public class CombinedWidgetTest extends WidgetTest {

Expand All @@ -48,8 +49,6 @@ public static Collection<Object[]> data() {
new AbstractStubWebDriver.StubAndroidBrowserOrWebViewDriver(), DefaultFindByWidget.class),
dataArray(new AppWithPartiallyCombinedWidgets(),
new AbstractStubWebDriver.StubAndroidDriver(), DefaultAndroidWidget.class),
dataArray(new AppWithPartiallyCombinedWidgets(),
new AbstractStubWebDriver.StubIOSDriver(), DefaultStubWidget.class),
dataArray(new AppWithPartiallyCombinedWidgets(),
new AbstractStubWebDriver.StubIOSXCUITDriver(), DefaultStubWidget.class),
dataArray(new AppWithPartiallyCombinedWidgets(),
Expand All @@ -68,7 +67,7 @@ public CombinedWidgetTest(AbstractApp app, WebDriver driver, Class<?> widgetClas

@Override
public void checkThatWidgetsAreCreatedCorrectly() {
assertThat("Excpected widget class was " + widgetClass.getName(),
assertThat("Expected widget class was " + widgetClass.getName(),
app.getWidget().getSubWidget().getSelfReference().getClass(),
equalTo(widgetClass));

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void startingAndroidAppWithCapabilitiesOnlyTest() {
Capabilities caps = driver.getCapabilities();

assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase(
(String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME))
String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME)))
);
assertEquals(AutomationName.ANDROID_UIAUTOMATOR2, caps.getCapability(MobileCapabilityType.AUTOMATION_NAME));
assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME));
Expand All @@ -70,7 +70,7 @@ public void startingAndroidAppWithCapabilitiesAndServiceTest() {
Capabilities caps = driver.getCapabilities();

assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase(
(String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME))
String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME)))
);
assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME));
} finally {
Expand Down Expand Up @@ -105,7 +105,7 @@ public void startingAndroidAppWithCapabilitiesAndFlagsOnServerSideTest() {
Capabilities caps = driver.getCapabilities();

assertTrue(MobilePlatform.ANDROID.equalsIgnoreCase(
(String) caps.getCapability(MobileCapabilityType.PLATFORM_NAME))
String.valueOf(caps.getCapability(MobileCapabilityType.PLATFORM_NAME)))
);
assertNotNull(caps.getCapability(MobileCapabilityType.DEVICE_NAME));
} finally {
Expand Down