refactor: Put test files into test resources (appium#1333)

Author: mykola-mokhnach

src/test/java/io/appium/java_client/TestResources.java

@@ -0,0 +1,31 @@
+package io.appium.java_client;
+
+import java.nio.file.Path;
+
+import static io.appium.java_client.TestUtils.resourcePathToLocalPath;
+
+public class TestResources {
+ public static Path apiDemosApk() {
+ return resourcePathToLocalPath("apps/ApiDemos-debug.apk");
+ }
+
+ public static Path testAppZip() {
+ return resourcePathToLocalPath("apps/TestApp.app.zip");
+ }
+
+ public static Path uiCatalogAppZip() {
+ return resourcePathToLocalPath("apps/UICatalog.app.zip");
+ }
+
+ public static Path vodQaAppZip() {
+ return resourcePathToLocalPath("apps/vodqa.zip");
+ }
+
+ public static Path intentExampleApk() {
+ return resourcePathToLocalPath("apps/IntentExample.apk");
+ }
+
+ public static Path helloAppiumHtml() {
+ return resourcePathToLocalPath("html/hello appium - saved page.htm");
+ }
+}

src/test/java/io/appium/java_client/TestUtils.java

@@ -1,9 +1,14 @@
 package io.appium.java_client;
 
+import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.SocketException;
+import java.net.URL;
 import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class TestUtils {
  public static String getLocalIp4Address() throws SocketException, UnknownHostException {
@@ -13,4 +18,20 @@ public static String getLocalIp4Address() throws SocketException, UnknownHostExc
  return socket.getLocalAddress().getHostAddress();
  }
  }
+
+ public static Path resourcePathToLocalPath(String resourcePath) {
+ URL url = ClassLoader.getSystemResource(resourcePath);
+ if (url == null) {
+ throw new IllegalArgumentException(String.format("Cannot find the '%s' resource", resourcePath));
+ }
+ return Paths.get(url.getPath());
+ }
+
+ public static String resourceAsString(String resourcePath) {
+ try {
+ return new String(Files.readAllBytes(resourcePathToLocalPath(resourcePath)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
 }

src/test/java/io/appium/java_client/WebViewApp.app.zip

@@ -26,7 +26,7 @@
 
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import java.io.File;
+import static io.appium.java_client.TestResources.apiDemosApk;
 
 public class BaseAndroidTest {
  public static final String APP_ID = "io.appium.android.apis";
@@ -45,12 +45,10 @@ public class BaseAndroidTest {
  "An appium server node is not started!");
  }
 
- File appDir = new File("src/test/java/io/appium/java_client");
- File app = new File(appDir, "ApiDemos-debug.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.ANDROID_UIAUTOMATOR2);
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
- capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ capabilities.setCapability(MobileCapabilityType.APP, apiDemosApk().toAbsolutePath().toString());
  capabilities.setCapability("eventTimings", true);
  driver = new AndroidDriver<>(service.getUrl(), capabilities);
  }

src/test/java/io/appium/java_client/android/BaseAndroidTest.java

@@ -24,7 +24,7 @@
 import org.junit.BeforeClass;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import java.io.File;
+import static io.appium.java_client.TestResources.apiDemosApk;
 
 public class BaseEspressoTest {
 
@@ -43,12 +43,10 @@ public class BaseEspressoTest {
  "An appium server node is not started!");
  }
 
- File appDir = new File("src/test/java/io/appium/java_client");
- File app = new File(appDir, "ApiDemos-debug.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.ESPRESSO);
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
- capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ capabilities.setCapability(MobileCapabilityType.APP, apiDemosApk().toAbsolutePath().toString());
  capabilities.setCapability("eventTimings", true);
  driver = new AndroidDriver<>(service.getUrl(), capabilities);
  }

src/test/java/io/appium/java_client/android/BaseEspressoTest.java

@@ -1,5 +1,6 @@
 package io.appium.java_client.android;
 
+import static io.appium.java_client.TestResources.intentExampleApk;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -10,7 +11,6 @@
 import org.junit.Test;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import java.io.File;
 import java.util.function.Predicate;
 
 public class IntentTest {
@@ -28,11 +28,9 @@ public class IntentTest {
  throw new RuntimeException("An appium server node is not started!");
  }
 
- File appDir = new File("src/test/java/io/appium/java_client");
- File app = new File(appDir, "IntentExample.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
- capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ capabilities.setCapability(MobileCapabilityType.APP, intentExampleApk().toAbsolutePath().toString());
  driver = new AndroidDriver<>(service.getUrl(), capabilities);
  }
 

src/test/java/io/appium/java_client/android/IntentTest.java

@@ -1,5 +1,6 @@
 package io.appium.java_client.appium;
 
+import static io.appium.java_client.TestResources.apiDemosApk;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -22,7 +23,6 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.Response;
 
-import java.io.File;
 import java.util.Map;
 
 public class AndroidTest {
@@ -44,12 +44,10 @@ public static void beforeClass() {
  "An appium server node is not started!");
  }
 
- File appDir = new File("src/test/java/io/appium/java_client");
- File app = new File(appDir, "ApiDemos-debug.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
- capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ capabilities.setCapability(MobileCapabilityType.APP, apiDemosApk().toAbsolutePath().toString());
  driver = new AppiumDriver<>(service.getUrl(), capabilities);
  }
 

src/test/java/io/appium/java_client/appium/AndroidTest.java

@@ -1,6 +1,7 @@
 package io.appium.java_client.appium.element.generation.android;
 
 import static io.appium.java_client.MobileBy.AndroidUIAutomator;
+import static io.appium.java_client.TestResources.apiDemosApk;
 import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.By.name;
 import static org.openqa.selenium.By.tagName;
@@ -19,19 +20,16 @@
 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;
 
 public class AndroidElementGeneratingTest extends BaseElementGenerationTest {
 
- private final File app = new File(new File("src/test/java/io/appium/java_client"),
- "ApiDemos-debug.apk");
  private final Supplier<DesiredCapabilities> commonCapabilitiesSupplier = () -> {
  DesiredCapabilities serverCapabilities = new DesiredCapabilities();
  serverCapabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
  serverCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
- serverCapabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ serverCapabilities.setCapability(MobileCapabilityType.APP, apiDemosApk().toAbsolutePath().toString());
  return serverCapabilities;
  };
 

src/test/java/io/appium/java_client/appium/element/generation/android/AndroidElementGeneratingTest.java

@@ -1,6 +1,8 @@
 package io.appium.java_client.appium.element.generation.ios;
 
 import static io.appium.java_client.MobileBy.AccessibilityId;
+import static io.appium.java_client.TestResources.testAppZip;
+import static io.appium.java_client.TestResources.vodQaAppZip;
 import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.By.id;
 import static org.openqa.selenium.By.name;
@@ -32,12 +34,9 @@
 
 public class IOSElementGenerationTest extends BaseElementGenerationTest {
 
- private static final File testApp = new File(new File("src/test/java/io/appium/java_client"),
- "TestApp.app.zip");
-
- private static final File webViewApp = new File(new File("src/test/java/io/appium/java_client"),
- "vodqa.zip");
+ private static final File testApp = testAppZip().toFile();
 
+ private static final File webViewApp = vodQaAppZip().toFile();
 
  private Supplier<DesiredCapabilities> commonAppCapabilitiesSupplier = () -> {
  DesiredCapabilities serverCapabilities = new DesiredCapabilities();

src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java

@@ -8,9 +8,10 @@
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import java.io.File;
 import java.net.URL;
 
+import static io.appium.java_client.TestResources.testAppZip;
+
 public class AppIOSTest extends BaseIOSTest {
 
  public static final String BUNDLE_ID = "io.appium.TestApp";
@@ -23,16 +24,14 @@ public static void beforeClass() throws Exception {
  throw new AppiumServerHasNotBeenStartedLocallyException("An appium server node is not started!");
  }
 
- File appDir = new File("src/test/java/io/appium/java_client");
- File app = new File(appDir, "TestApp.app.zip");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION);
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME);
  capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.IOS_XCUI_TEST);
  //sometimes environment has performance problems
  capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000);
  capabilities.setCapability("commandTimeouts", "120000");
- capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
+ capabilities.setCapability(MobileCapabilityType.APP, testAppZip().toAbsolutePath().toString());
  try {
  driver = new IOSDriver<>(new URL("http://" + ip + ":" + PORT + "/wd/hub"), capabilities);
  } catch (SessionNotCreatedException e) {