Skip to content

Commit d8b989d

Browse files
JonahssJonahss
committed
rename environment variables for localServer
1 parent 7cc7e9e commit d8b989d

File tree

14 files changed

+34
-45
lines changed

14 files changed

+34
-45
lines changed

‎src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
public final class AppiumServiceBuilder extends DriverService.Builder<AppiumDriverLocalService, AppiumServiceBuilder> {
3838

39-
public static final String APPIUM_NODE_PROPERTY = "appium.node.path";
40-
public static final String APPIUM_NODE_JS_EXEC_PATH = "appium.node.js.exec.path";
39+
public static final String APPIUM_PATH = "APPIUM_BINARY_PATH";
40+
public static final String NODE_PATH = "NODE_BINARY_PATH";
4141

4242
private static final String APPIUM_FOLDER = "appium";
4343
private static final String BIN_FOLDER = "bin";
@@ -123,11 +123,6 @@ private static void validateNodeStructure(File node){
123123
throw new InvalidServerInstanceException("The invalid appium node " + absoluteNodePath + " has been defined",
124124
new IOException("The node " + absoluteNodePath + "doesn't exist"));
125125
}
126-
127-
if (!absoluteNodePath.endsWith(APPIUM_NODE_MASK)) {
128-
throw new InvalidServerInstanceException("It is probably there is the corrupted appium server installation. Path " +
129-
absoluteNodePath + "doesn't match " + APPIUM_NODE_MASK);
130-
}
131126
}
132127

133128
public AppiumServiceBuilder() {
@@ -137,9 +132,9 @@ public AppiumServiceBuilder() {
137132
@Override
138133
protected File findDefaultExecutable() {
139134

140-
String nodeJSExec = System.getProperty(APPIUM_NODE_JS_EXEC_PATH);
135+
String nodeJSExec = System.getProperty(NODE_PATH);
141136
if (StringUtils.isBlank(nodeJSExec)) {
142-
nodeJSExec = System.getenv(APPIUM_NODE_JS_EXEC_PATH);
137+
nodeJSExec = System.getenv(NODE_PATH);
143138
}
144139
if (!StringUtils.isBlank(nodeJSExec)) {
145140
File result = new File(nodeJSExec);
@@ -233,9 +228,9 @@ void checkAppiumJS(){
233228
return;
234229
}
235230

236-
String appiumJS = System.getProperty(APPIUM_NODE_PROPERTY);
231+
String appiumJS = System.getProperty(APPIUM_PATH);
237232
if (StringUtils.isBlank(appiumJS)) {
238-
appiumJS = System.getenv(APPIUM_NODE_PROPERTY);
233+
appiumJS = System.getenv(APPIUM_PATH);
239234
}
240235
if (!StringUtils.isBlank(appiumJS)){
241236
File node = new File(appiumJS);

‎src/test/java/io/appium/java_client/AppiumDriverTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void setUp() throws Exception {
5353
File app = new File(appDir, "UICatalog.app.zip");
5454
DesiredCapabilities capabilities = new DesiredCapabilities();
5555
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
56-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
56+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
5757
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
5858
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5959
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());

‎src/test/java/io/appium/java_client/ContextTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void setUp() throws Exception {
5050
File app = new File(appDir, "WebViewApp.app.zip");
5151
DesiredCapabilities capabilities = new DesiredCapabilities();
5252
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
53-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
53+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
5454
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5555
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
5656
driver = new IOSDriver<WebElement>(service.getUrl(), capabilities);

‎src/test/java/io/appium/java_client/android-rottentomatoes-demo-debug.apk‎

92 Bytes
Binary file not shown.

‎src/test/java/io/appium/java_client/ios/IOSAccessibilityIdTest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@
1616

1717
package io.appium.java_client.ios;
1818

19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.assertTrue;
2119
import io.appium.java_client.AppiumDriver;
2220
import io.appium.java_client.MobileBy;
23-
import io.appium.java_client.ios.IOSDriver;
2421
import io.appium.java_client.remote.MobileCapabilityType;
25-
26-
import java.io.File;
27-
import java.util.List;
28-
2922
import io.appium.java_client.service.local.AppiumDriverLocalService;
3023
import org.junit.*;
3124
import org.openqa.selenium.WebElement;
3225
import org.openqa.selenium.remote.DesiredCapabilities;
3326

27+
import java.io.File;
28+
import java.util.List;
29+
30+
import static org.junit.Assert.assertNotNull;
31+
import static org.junit.Assert.assertTrue;
32+
3433
/**
3534
* Test context-related features
3635
*/
@@ -54,7 +53,7 @@ public void setup() throws Exception {
5453
File app = new File(appDir, "UICatalog.app.zip");
5554
DesiredCapabilities capabilities = new DesiredCapabilities();
5655
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
57-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
56+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
5857
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5958
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
6059
driver = new IOSDriver<WebElement>(service.getUrl(), capabilities);

‎src/test/java/io/appium/java_client/ios/IOSDriverTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setup() throws Exception {
5757
File app = new File(appDir, "UICatalog.app.zip");
5858
DesiredCapabilities capabilities = new DesiredCapabilities();
5959
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
60-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
60+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
6161
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
6262
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
6363
driver = new IOSDriver<MobileElement>(service.getUrl(), capabilities);

‎src/test/java/io/appium/java_client/ios/IosUIAutomationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void setup() throws Exception {
5252
File app = new File(appDir, "UICatalog.app.zip");
5353
DesiredCapabilities capabilities = new DesiredCapabilities();
5454
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
55-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
55+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
5656
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5757
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
5858
driver = new IOSDriver<WebElement>(service.getUrl(), capabilities);

‎src/test/java/io/appium/java_client/ios/iOSGestureTest.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,8 @@
1616

1717
package io.appium.java_client.ios;
1818

19-
import io.appium.java_client.AppiumDriver;
20-
import io.appium.java_client.MobileElement;
21-
import io.appium.java_client.MultiTouchAction;
22-
import io.appium.java_client.SwipeElementDirection;
23-
import io.appium.java_client.TouchAction;
19+
import io.appium.java_client.*;
2420
import io.appium.java_client.remote.MobileCapabilityType;
25-
26-
import java.io.File;
27-
2821
import io.appium.java_client.service.local.AppiumDriverLocalService;
2922
import org.junit.*;
3023
import org.openqa.selenium.Alert;
@@ -33,6 +26,8 @@
3326
import org.openqa.selenium.support.ui.ExpectedConditions;
3427
import org.openqa.selenium.support.ui.WebDriverWait;
3528

29+
import java.io.File;
30+
3631
/**
3732
* Test Mobile Driver features
3833
*/
@@ -56,7 +51,7 @@ public void setup() throws Exception {
5651
File app = new File(appDir, "TestApp.app.zip");
5752
DesiredCapabilities capabilities = new DesiredCapabilities();
5853
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
59-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
54+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
6055
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
6156
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
6257
driver = new IOSDriver<WebElement>(service.getUrl(), capabilities);

‎src/test/java/io/appium/java_client/localserver/ServerBuilderTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,28 @@ public void checkAbilityToBuildDefaultService(){
6262
public void checkAbilityToBuildServiceWithDefinedParametersAndNodeSetInProperties(){
6363
try {
6464
String definedNode = findCustomNode().getAbsolutePath();
65-
System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
65+
System.setProperty(AppiumServiceBuilder.APPIUM_PATH, definedNode);
6666
AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
6767
usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE,""));
6868
}
6969
finally {
70-
System.clearProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY);
70+
System.clearProperty(AppiumServiceBuilder.APPIUM_PATH);
7171
}
7272
}
7373

7474
@Test
7575
public void checkAbilityToStartServiceOnAFreePort(){
7676
try {
7777
String definedNode = findCustomNode().getAbsolutePath();
78-
System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
78+
System.setProperty(AppiumServiceBuilder.APPIUM_PATH, definedNode);
7979
AppiumDriverLocalService service = AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
8080
usingAnyFreePort().withArgument(GeneralServerFlag.SESSION_OVERRIDE));
8181
service.start();
8282
assertEquals(true, service.isRunning());
8383
service.stop();
8484
}
8585
finally {
86-
System.clearProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY);
86+
System.clearProperty(AppiumServiceBuilder.APPIUM_PATH);
8787
}
8888
}
8989

@@ -115,15 +115,15 @@ public void checkStartingOfDefaultServiceWithNonDefaultArguments(){
115115
public void checkStartingOfTheServiceDefinedByProperty(){
116116
try {
117117
String definedNode = findCustomNode().getAbsolutePath();
118-
System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
118+
System.setProperty(AppiumServiceBuilder.APPIUM_PATH, definedNode);
119119
AppiumDriverLocalService service = AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
120120
usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE));
121121
service.start();
122122
assertEquals(true, service.isRunning());
123123
service.stop();
124124
}
125125
finally {
126-
System.clearProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY);
126+
System.clearProperty(AppiumServiceBuilder.APPIUM_PATH);
127127
}
128128
}
129129

‎src/test/java/io/appium/java_client/localserver/StartingAppLocallyTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void startingIOSAppWithCapabilitiesOnlyTest(){
8686
File app = new File(appDir, "UICatalog.app.zip");
8787

8888
DesiredCapabilities capabilities = new DesiredCapabilities();
89-
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
89+
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.4");
9090
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
9191
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
9292
capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.APPIUM);
@@ -98,7 +98,7 @@ public void startingIOSAppWithCapabilitiesOnlyTest(){
9898
assertEquals(true, caps.getCapability(MobileCapabilityType.AUTOMATION_NAME).equals(AutomationName.APPIUM));
9999
assertEquals(true, caps.getCapability(MobileCapabilityType.PLATFORM_NAME).equals(MobilePlatform.IOS));
100100
assertNotEquals(null, caps.getCapability(MobileCapabilityType.DEVICE_NAME));
101-
assertEquals(true, caps.getCapability(MobileCapabilityType.PLATFORM_VERSION).equals("7.1"));
101+
assertEquals(true, caps.getCapability(MobileCapabilityType.PLATFORM_VERSION).equals("8.4"));
102102
assertEquals(true, caps.getCapability(MobileCapabilityType.APP).equals(app.getAbsolutePath()));
103103
}
104104
finally {
@@ -116,7 +116,7 @@ public void startingIOSAppWithCapabilitiesAndServiseTest(){
116116
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
117117

118118
AppiumServiceBuilder builder = new AppiumServiceBuilder().withArgument(GeneralServerFlag.AUTOMATION_NAME, AutomationName.APPIUM).
119-
withArgument(GeneralServerFlag.APP, app.getAbsolutePath()).withArgument(GeneralServerFlag.PLATFORM_VERSION, "7.1");
119+
withArgument(GeneralServerFlag.APP, app.getAbsolutePath()).withArgument(GeneralServerFlag.PLATFORM_VERSION, "8.4");
120120

121121
IOSDriver<MobileElement> driver = new IOSDriver<>(builder, capabilities);;
122122
try {

0 commit comments

Comments
 (0)