Included changes mentioned in the comment.

appium-boneyard · Oct 20, 2015 · 40dfa7d · 40dfa7d
1 parent 327d333
commit 40dfa7d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/selendroid-client/settings.gradle b/selendroid-client/settings.gradle
@@ -1,5 +1,5 @@
 include ':selendroid-common'
-include ':selendroid-server-common'
+project(':selendroid-common').projectDir = file("$rootDir/../selendroid-common")
 
-project(':selendroid-common').projectDir = new File("$rootDir/../selendroid-common")
-project(':selendroid-server-common').projectDir = new File("$rootDir/../selendroid-server-common")
+include ':selendroid-server-common'
+project(':selendroid-server-common').projectDir = file("$rootDir/../selendroid-server-common")
diff --git a/selendroid-server/settings.gradle b/selendroid-server/settings.gradle
@@ -1,3 +1,2 @@
 include ':selendroid-server-common'
-
-project(':selendroid-server-common').projectDir = new File("$rootDir/../selendroid-server-common")
+project(':selendroid-server-common').projectDir = file("$rootDir/../selendroid-server-common")
diff --git a/selendroid-standalone/settings.gradle b/selendroid-standalone/settings.gradle
@@ -1,5 +1,5 @@
 include ':selendroid-common'
-include ':selendroid-server-common'
+project(':selendroid-common').projectDir = file("$rootDir/../selendroid-common")
 
-project(':selendroid-common').projectDir = new File("$rootDir/../selendroid-common")
-project(':selendroid-server-common').projectDir = new File("$rootDir/../selendroid-server-common")
+include ':selendroid-server-common'
+project(':selendroid-server-common').projectDir = file("$rootDir/../selendroid-server-common")
diff --git a/...id-standalone/src/test/java/io/selendroid/standalone/android/impl/AbstractDeviceTest.java b/...id-standalone/src/test/java/io/selendroid/standalone/android/impl/AbstractDeviceTest.java
@@ -20,6 +20,7 @@
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.junit.Test;
+import org.junit.Ignore;
 
 import java.util.regex.Pattern;
 
@@ -43,8 +44,8 @@ public void describeTo(Description description) {
       }
     };
   }
-
-
+  @Ignore("Build failure: Ignored till the fix is available.")
+  @Test
   public void testGetCrashLogContents() {
     AbstractDevice device = mock(AbstractDevice.class);
     when(device.getExternalStoragePath()).thenReturn("/storage");

diff --git a/...lone/src/test/java/io/selendroid/standalone/android/impl/DefaultAndroidEmulatorTests.java b/...lone/src/test/java/io/selendroid/standalone/android/impl/DefaultAndroidEmulatorTests.java
@@ -23,6 +23,7 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.Ignore;
 import org.openqa.selenium.Dimension;
 
 public class DefaultAndroidEmulatorTests {
@@ -32,7 +33,8 @@ public void shouldBeAbleToListAvds() throws Exception {
     Assert.assertFalse("Expecting list of avds not to be empty", avds.isEmpty());
   }
 
-
+  @Ignore("Build failure: Ignored till the fix is available.")
+  @Test
   public void testShouldBeAbleToStartEmulator() throws Exception {
     AndroidEmulator emulator =
         new DefaultAndroidEmulator("l10n", "X86", new Dimension(320, 480), "16", "Nexus 5", new File(

diff --git a/...alone/src/test/java/io/selendroid/standalone/android/impl/DefaultHardwareDeviceTests.java b/...alone/src/test/java/io/selendroid/standalone/android/impl/DefaultHardwareDeviceTests.java
@@ -30,6 +30,7 @@
 import org.apache.http.HttpResponse;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.Ignore;
 
 import java.io.File;
 
@@ -61,7 +62,8 @@ private void cleanUpDevice(AndroidDevice emulator) throws Exception {
     Assert.assertFalse(installedAPKs.contains(AUT_PACKAGE));
   }
 
-
+  @Ignore("Build failure: Ignored till the fix is available.")
+  @Test
   public void testShouldBeAbleToStartSelendroid() throws Exception {
     IDevice device = mock(IDevice.class);
     when(device.getSerialNumber()).thenReturn(serial);