From 0590f6974e8931eace2315a9217c6c3d7088108a Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 00:16:45 +0530 Subject: [PATCH 01/12] Set up CI with Azure Pipelines update azure configs add default server path remove iOS from travis format as per azure guidelines format as per azure guidelines format as per azure guidelines Add appium server installation Install specific version of node Add appium server path Execute on appropriate environment Execute on appropriate environment --- .travis.yml | 15 ------- azure-pipelines.yml | 31 ++++++++++++++ .../generation/BaseElementGenerationTest.java | 2 + .../ios/IOSElementGenerationTest.java | 24 +++++++---- .../appium/java_client/ios/BaseIOSTest.java | 5 ++- .../service/local/StartingAppLocallyTest.java | 40 ++++++++++++------- 6 files changed, 78 insertions(+), 39 deletions(-) create mode 100644 azure-pipelines.yml diff --git a/.travis.yml b/.travis.yml index 5d11633f3..20c576315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,6 @@ sudo: required matrix: include: - - language: java - install: true - jdk: - - $jdkVersion - os: osx - osx_image: $xcodeVersion - before_install: - - brew tap caskroom/versions - - brew cask install java8 - - export JAVA_HOME=`/usr/libexec/java_home -v 1.8` - - java -version - - npm install -g $appiumVersion - script: - - ./gradlew clean build xcuiTest -x test -x signArchives - - language: android install: true install: diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..f4b23df17 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,31 @@ +# Gradle +# Build your Java project and run tests with Gradle using a Gradle wrapper script. +# Add steps that analyze code, save build artifacts, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/java + +pool: + vmImage: 'macOS 10.13' + +steps: +- task: NodeTool@0 + inputs: + versionSpec: '8.x' + +- script: | + echo Configuring Environment + npm install -g appium@beta + appium --version + node --version + java -version + /Users/vsts/Library/Android/sdk/tools/bin/sdkmanager list avd + +- task: Gradle@2 + inputs: + gradleWrapperFile: 'gradlew' + gradleOptions: '-Xmx3072m' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.8' + jdkArchitectureOption: 'x64' + publishJUnitResults: true + tasks: 'build' + options: 'xcuiTest -x test -x signArchives' diff --git a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java index a1774ef58..cea98730f 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java @@ -10,6 +10,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.DesiredCapabilities; +import java.io.File; import java.util.function.BiPredicate; import java.util.function.Supplier; @@ -34,6 +35,7 @@ protected boolean check(Supplier serverCapabilitiesSupplier BiPredicate> filter, By by, Class clazz) { AppiumServiceBuilder builder = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withCapabilities(serverCapabilitiesSupplier.get()); driver = new AppiumDriver<>(builder, clientCapabilitiesSupplier.get()); return filter.test(by, clazz); diff --git a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java index 2e5dd944b..5a3d71bfa 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java @@ -25,18 +25,24 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { - private final File testApp = new File(new File("src/test/java/io/appium/java_client"), + private static final File testApp = new File(new File("src/test/java/io/appium/java_client"), "TestApp.app.zip"); - private final File webViewApp = new File(new File("src/test/java/io/appium/java_client"), + private static final File webViewApp = new File(new File("src/test/java/io/appium/java_client"), "vodqa.zip"); + private final String PLATFORM_VERSION = System.getenv("platformVersion") != null + ? System.getenv("platformVersion") : "11.4"; + + private final String DEVICE_NAME = System.getenv("deviceName") != null + ? System.getenv("deviceName") : "iPhone X"; + private Supplier serverAppCapabilitiesSupplier = () -> { DesiredCapabilities serverCapabilities = new DesiredCapabilities(); - serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8"); + serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME); serverCapabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); //some environment is too slow - serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); return serverCapabilities; }; @@ -52,8 +58,8 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { private final Supplier serverBrowserCapabilitiesSupplier = () -> { DesiredCapabilities serverCapabilities = new DesiredCapabilities(); serverCapabilities.setCapability(MobileCapabilityType.BROWSER_NAME, MobileBrowserType.SAFARI); - serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); - serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8"); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); + serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME); //sometimes environment has performance problems serverCapabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); return serverCapabilities; @@ -112,7 +118,8 @@ public void whenIOSNativeAppIsLaunched() { public void whenIOSNativeAppIsLaunched2() { assertTrue(check(() -> { DesiredCapabilities serverCapabilities = serverAppCapabilitiesSupplier.get(); - serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); return serverCapabilities; }, appFileSupplierFunction.apply(testApp), commonPredicate, id("IntegerA"), IOSElement.class)); } @@ -120,7 +127,8 @@ public void whenIOSNativeAppIsLaunched2() { @Test public void whenIOSBrowserIsLaunched2() { assertTrue(check(() -> { DesiredCapabilities serverCapabilities = serverBrowserCapabilitiesSupplier.get(); - serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); return serverCapabilities; }, clientBrowserCapabilitiesSupplier, (by, aClass) -> { driver.get("https://www.google.com"); diff --git a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java index d8a8aa371..fad5809c1 100644 --- a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java +++ b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java @@ -21,6 +21,7 @@ import io.appium.java_client.service.local.AppiumServiceBuilder; import org.junit.AfterClass; +import java.io.File; import java.net.InetAddress; import java.net.UnknownHostException; @@ -44,7 +45,9 @@ public class BaseIOSTest { * @throws UnknownHostException when it is impossible to get ip address of a local host */ public static String startAppiumServer() throws UnknownHostException { - service = new AppiumServiceBuilder().usingPort(PORT).build(); + service = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) + .usingPort(PORT).build(); service.start(); InetAddress inetAddress = InetAddress.getLocalHost(); return inetAddress.getHostAddress(); diff --git a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java index a47270cd0..000496e98 100644 --- a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java +++ b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java @@ -39,6 +39,12 @@ public class StartingAppLocallyTest { + private static final String PLATFORM_VERSION = System.getenv("platformVersion") != null + ? System.getenv("platformVersion") : "11.4"; + + private static final String DEVICE_NAME = System.getenv("deviceName") != null + ? System.getenv("deviceName") : "iPhone X"; + @Test public void startingAndroidAppWithCapabilitiesOnlyTest() { File appDir = new File("src/test/java/io/appium/java_client"); File app = new File(appDir, "ApiDemos-debug.apk"); @@ -67,8 +73,9 @@ public class StartingAppLocallyTest { capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator"); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); - AppiumServiceBuilder builder = - new AppiumServiceBuilder().withArgument(GeneralServerFlag.SESSION_OVERRIDE) + AppiumServiceBuilder builder = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) + .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS); AndroidDriver driver = new AndroidDriver<>(builder, capabilities); @@ -98,8 +105,9 @@ public class StartingAppLocallyTest { serverCapabilities.setCapability(AndroidMobileCapabilityType.CHROMEDRIVER_EXECUTABLE, chromeManager.getBinaryPath()); - AppiumServiceBuilder builder = - new AppiumServiceBuilder().withArgument(GeneralServerFlag.SESSION_OVERRIDE) + AppiumServiceBuilder builder = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) + .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS).withCapabilities(serverCapabilities); DesiredCapabilities clientCapabilities = new DesiredCapabilities(); @@ -124,10 +132,10 @@ public class StartingAppLocallyTest { File app = new File(appDir, "UICatalog.app.zip"); DesiredCapabilities capabilities = new DesiredCapabilities(); - capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); //sometimes environment has performance problems capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); - capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8"); + capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.APPIUM); @@ -138,7 +146,7 @@ public class StartingAppLocallyTest { assertEquals(AutomationName.APPIUM, caps.getCapability(MobileCapabilityType.AUTOMATION_NAME)); assertEquals(MobilePlatform.IOS, caps.getCapability(MobileCapabilityType.PLATFORM_NAME)); assertNotEquals(null, caps.getCapability(MobileCapabilityType.DEVICE_NAME)); - assertEquals("11.3", caps.getCapability(MobileCapabilityType.PLATFORM_VERSION)); + assertEquals(PLATFORM_VERSION, caps.getCapability(MobileCapabilityType.PLATFORM_VERSION)); assertEquals(app.getAbsolutePath(), caps.getCapability(MobileCapabilityType.APP)); } finally { driver.quit(); @@ -151,15 +159,16 @@ public class StartingAppLocallyTest { File app = new File(appDir, "UICatalog.app.zip"); DesiredCapabilities capabilities = new DesiredCapabilities(); - capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8"); + capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME); capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.APPIUM); capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); - capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); //sometimes environment has performance problems capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); - AppiumServiceBuilder builder = - new AppiumServiceBuilder().withArgument(GeneralServerFlag.SESSION_OVERRIDE) + AppiumServiceBuilder builder = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) + .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS); IOSDriver driver = new IOSDriver<>(builder, capabilities); @@ -175,10 +184,10 @@ public class StartingAppLocallyTest { @Test public void startingIOSAppWithCapabilitiesAndFlagsOnServerSideTest() { DesiredCapabilities serverCapabilities = new DesiredCapabilities(); - serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8"); + serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME); serverCapabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); //some environment is too slow - serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3"); + serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION); serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS); File appDir = new File("src/test/java/io/appium/java_client"); @@ -186,8 +195,9 @@ public class StartingAppLocallyTest { DesiredCapabilities clientCapabilities = new DesiredCapabilities(); clientCapabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); - AppiumServiceBuilder builder = - new AppiumServiceBuilder().withArgument(GeneralServerFlag.SESSION_OVERRIDE) + AppiumServiceBuilder builder = new AppiumServiceBuilder() + .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) + .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS).withCapabilities(serverCapabilities); IOSDriver driver = new IOSDriver<>(builder, clientCapabilities); From a38a438086319da93aad4ed681a68bca954c180e Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 15:06:19 +0530 Subject: [PATCH 02/12] Remove android information --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f4b23df17..bbf3d37d4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,6 @@ steps: appium --version node --version java -version - /Users/vsts/Library/Android/sdk/tools/bin/sdkmanager list avd - task: Gradle@2 inputs: From f455c90a099bee8f7aa939d2ab0186997aa71d22 Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 15:27:40 +0530 Subject: [PATCH 03/12] fix checkstyle --- .../element/generation/ios/IOSElementGenerationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java index 5a3d71bfa..049661e0e 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java @@ -31,10 +31,10 @@ public class IOSElementGenerationTest extends BaseElementGenerationTest { private static final File webViewApp = new File(new File("src/test/java/io/appium/java_client"), "vodqa.zip"); - private final String PLATFORM_VERSION = System.getenv("platformVersion") != null + private static final String PLATFORM_VERSION = System.getenv("platformVersion") != null ? System.getenv("platformVersion") : "11.4"; - private final String DEVICE_NAME = System.getenv("deviceName") != null + private static final String DEVICE_NAME = System.getenv("deviceName") != null ? System.getenv("deviceName") : "iPhone X"; private Supplier serverAppCapabilitiesSupplier = () -> { From 5fc72c14cedd21e84a82f6e872697294c1529193 Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 18:22:07 +0530 Subject: [PATCH 04/12] remove hardcoded appium path --- .../appium/element/generation/BaseElementGenerationTest.java | 1 - src/test/java/io/appium/java_client/ios/BaseIOSTest.java | 1 - .../java_client/service/local/StartingAppLocallyTest.java | 4 ---- 3 files changed, 6 deletions(-) diff --git a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java index cea98730f..060ea840c 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java @@ -35,7 +35,6 @@ protected boolean check(Supplier serverCapabilitiesSupplier BiPredicate> filter, By by, Class clazz) { AppiumServiceBuilder builder = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withCapabilities(serverCapabilitiesSupplier.get()); driver = new AppiumDriver<>(builder, clientCapabilitiesSupplier.get()); return filter.test(by, clazz); diff --git a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java index fad5809c1..e3a3e171a 100644 --- a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java +++ b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java @@ -46,7 +46,6 @@ public class BaseIOSTest { */ public static String startAppiumServer() throws UnknownHostException { service = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .usingPort(PORT).build(); service.start(); InetAddress inetAddress = InetAddress.getLocalHost(); diff --git a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java index 000496e98..618fac97e 100644 --- a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java +++ b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyTest.java @@ -74,7 +74,6 @@ public class StartingAppLocallyTest { capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); AppiumServiceBuilder builder = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS); @@ -106,7 +105,6 @@ public class StartingAppLocallyTest { chromeManager.getBinaryPath()); AppiumServiceBuilder builder = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS).withCapabilities(serverCapabilities); @@ -167,7 +165,6 @@ public class StartingAppLocallyTest { capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000); AppiumServiceBuilder builder = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS); @@ -196,7 +193,6 @@ public class StartingAppLocallyTest { clientCapabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath()); AppiumServiceBuilder builder = new AppiumServiceBuilder() - .withAppiumJS(new File("/usr/local/lib/node_modules/appium/build/lib/main.js")) .withArgument(GeneralServerFlag.SESSION_OVERRIDE) .withArgument(GeneralServerFlag.STRICT_CAPS).withCapabilities(serverCapabilities); From afb16b7276302353558cbf40af789855ea21ca4a Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 18:35:28 +0530 Subject: [PATCH 05/12] fix node in azure mac host --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bbf3d37d4..54dfb04b1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,8 @@ steps: appium --version node --version java -version + npm config delete prefix + nvm alias default node - task: Gradle@2 inputs: From feda39a076b2ed868cc231fb5c1f4985acd0172c Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 18:38:58 +0530 Subject: [PATCH 06/12] fix node in azure mac host --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 54dfb04b1..71c963a18 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,6 @@ steps: node --version java -version npm config delete prefix - nvm alias default node - task: Gradle@2 inputs: From ed8429e5d10e8e85efb1d5f70b5a6a192b666916 Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Tue, 20 Nov 2018 18:51:57 +0530 Subject: [PATCH 07/12] set node 8 in path --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71c963a18..be02e41c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,6 +18,7 @@ steps: node --version java -version npm config delete prefix + npm config set prefix $NVM_DIR/versions/node/v8.12.0 - task: Gradle@2 inputs: From e30de4b964fe406490949813f47a73e56ad29df1 Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Wed, 21 Nov 2018 13:01:10 +0530 Subject: [PATCH 08/12] check node path --- azure-pipelines.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index be02e41c8..1e7bba106 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,14 +19,15 @@ steps: java -version npm config delete prefix npm config set prefix $NVM_DIR/versions/node/v8.12.0 + which node -- task: Gradle@2 - inputs: - gradleWrapperFile: 'gradlew' - gradleOptions: '-Xmx3072m' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.8' - jdkArchitectureOption: 'x64' - publishJUnitResults: true - tasks: 'build' - options: 'xcuiTest -x test -x signArchives' +#- task: Gradle@2 +# inputs: +# gradleWrapperFile: 'gradlew' +# gradleOptions: '-Xmx3072m' +# javaHomeOption: 'JDKVersion' +# jdkVersionOption: '1.8' +# jdkArchitectureOption: 'x64' +# publishJUnitResults: true +# tasks: 'build' +# options: 'xcuiTest -x test -x signArchives' From 734902a16c37998b0327f043bcde4b88a817d8ae Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Wed, 21 Nov 2018 13:04:44 +0530 Subject: [PATCH 09/12] check npm root path --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e7bba106..6f6b1ca41 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,7 @@ steps: npm config delete prefix npm config set prefix $NVM_DIR/versions/node/v8.12.0 which node + npm root -g #- task: Gradle@2 # inputs: From 398d4755303f1068607793eaf02c1bf39734709f Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Wed, 21 Nov 2018 13:17:43 +0530 Subject: [PATCH 10/12] check npm root path --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f6b1ca41..7327333eb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,12 +13,12 @@ steps: - script: | echo Configuring Environment + npm config delete prefix + npm config set prefix $NVM_DIR/versions/node/v8.12.0 npm install -g appium@beta appium --version node --version java -version - npm config delete prefix - npm config set prefix $NVM_DIR/versions/node/v8.12.0 which node npm root -g From accd075f3fcdf4f0f512d8072ac2e4f6af711d7b Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Wed, 21 Nov 2018 13:20:07 +0530 Subject: [PATCH 11/12] enable tests --- azure-pipelines.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7327333eb..17c93055e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,13 +22,13 @@ steps: which node npm root -g -#- task: Gradle@2 -# inputs: -# gradleWrapperFile: 'gradlew' -# gradleOptions: '-Xmx3072m' -# javaHomeOption: 'JDKVersion' -# jdkVersionOption: '1.8' -# jdkArchitectureOption: 'x64' -# publishJUnitResults: true -# tasks: 'build' -# options: 'xcuiTest -x test -x signArchives' +- task: Gradle@2 + inputs: + gradleWrapperFile: 'gradlew' + gradleOptions: '-Xmx3072m' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.8' + jdkArchitectureOption: 'x64' + publishJUnitResults: true + tasks: 'build' + options: 'xcuiTest -x test -x signArchives' From 1bb4bca3ca2e7cd324408b1c4d853e86967f5175 Mon Sep 17 00:00:00 2001 From: Srinivasan Sekar Date: Wed, 21 Nov 2018 13:24:18 +0530 Subject: [PATCH 12/12] make codacy happy --- .../appium/element/generation/BaseElementGenerationTest.java | 1 - src/test/java/io/appium/java_client/ios/BaseIOSTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java index 060ea840c..a1774ef58 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java @@ -10,7 +10,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.DesiredCapabilities; -import java.io.File; import java.util.function.BiPredicate; import java.util.function.Supplier; diff --git a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java index e3a3e171a..2777ce1c4 100644 --- a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java +++ b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java @@ -21,7 +21,6 @@ import io.appium.java_client.service.local.AppiumServiceBuilder; import org.junit.AfterClass; -import java.io.File; import java.net.InetAddress; import java.net.UnknownHostException;