Merge pull request #43 from eBay-European-Product-Development/master

[FIXED JENKINS-26338] Also use configured executable when using named emulators.
jenkinsci · Jan 21, 2015 · 53fbfdf · 53fbfdf
2 parents 9bfa98a + efcafe3
commit 53fbfdf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java b/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
@@ -46,14 +46,15 @@ class EmulatorConfig implements Serializable {
     private final String avdNameSuffix;
 
     private EmulatorConfig(String avdName, boolean wipeData, boolean showWindow,
-            boolean useSnapshots, String commandLineOptions, String androidSdkHome, String avdNameSuffix) {
+            boolean useSnapshots, String commandLineOptions, String androidSdkHome, String executable, String
+            avdNameSuffix) {
         this.avdName = avdName;
         this.wipeData = wipeData;
         this.showWindow = showWindow;
         this.useSnapshots = useSnapshots;
         this.commandLineOptions = commandLineOptions;
         this.androidSdkHome = androidSdkHome;
-        this.executable = null;
+        this.executable = executable;
         this.avdNameSuffix = avdNameSuffix;
     }
 
@@ -121,7 +122,7 @@ public static final EmulatorConfig create(String avdName, String osVersion, Stri
                     showWindow, useSnapshots, commandLineOptions, targetAbi, androidSdkHome, executable, avdNameSuffix);
         }
 
-        return new EmulatorConfig(avdName, wipeData, showWindow, useSnapshots, commandLineOptions, androidSdkHome,
+        return new EmulatorConfig(avdName, wipeData, showWindow, useSnapshots, commandLineOptions, androidSdkHome, executable,
                 avdNameSuffix);
     }
 

diff --git a/src/test/java/hudson/plugins/android_emulator/EmulatorConfigTest.java b/src/test/java/hudson/plugins/android_emulator/EmulatorConfigTest.java
@@ -0,0 +1,21 @@
+package hudson.plugins.android_emulator;
+
+import hudson.plugins.android_emulator.sdk.Tool;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EmulatorConfigTest {
+
+        //does not work
+        @Test
+        public void shouldSelectExecutor64WhenPassedAsExecutorAndAvdIsSelected(){
+            EmulatorConfig emulatorConfigWithAvdName = EmulatorConfig.create(
+                    "hudson_en-US_160_WVGA_android-21", "5.0", "160", "WVGA", "", "", false, false, false, "", "", "", "emulator64-arm", "");
+            assertEquals(Tool.EMULATOR64_ARM, emulatorConfigWithAvdName.getExecutable()); }
+        //does work
+        @Test
+        public void shouldSelectExecutor64WhenPassedAsExecutorAndAvdIsEmpty(){
+            EmulatorConfig emulatorConfigWithNoAvdName = EmulatorConfig.create("", "5.0", "160", "WVGA", "", "", false, false, false, "", "", "", "emulator64-arm", "");
+            assertEquals(Tool.EMULATOR64_ARM, emulatorConfigWithNoAvdName.getExecutable()); }
+}