Add cmd line support to create ui automator projects.

Change-Id: I34ffff7d7828c171444c40e48fc3dcf093391324

3 files changed, 94 insertions, 14 deletions

diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index c4e71b3..8f58612 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -24,17 +24,18 @@ import com.android.io.FileWrapper;
 import com.android.prefs.AndroidLocation;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.IAndroidTarget;
+import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.ISystemImage;
 import com.android.sdklib.SdkManager;
-import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.internal.avd.AvdInfo;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.HardwareProperties;
 import com.android.sdklib.internal.avd.HardwareProperties.HardwareProperty;
 import com.android.sdklib.internal.project.ProjectCreator;
-import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectCreator.OutputLevel;
+import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
+import com.android.sdklib.internal.project.ProjectPropertiesWorkingCopy;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.DownloadCache.Strategy;
 import com.android.sdklib.internal.repository.packages.PlatformToolPackage;
@@ -44,8 +45,8 @@ import com.android.sdklib.repository.SdkRepoConstants;
 import com.android.sdkuilib.internal.repository.SdkUpdaterNoWindow;
 import com.android.sdkuilib.internal.widgets.MessageBoxLog;
 import com.android.sdkuilib.repository.AvdManagerWindow;
-import com.android.sdkuilib.repository.SdkUpdaterWindow;
 import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
+import com.android.sdkuilib.repository.SdkUpdaterWindow;
 import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext;
 import com.android.utils.ILogger;
 import com.android.utils.Pair;
@@ -275,6 +276,9 @@ public class Main {
             } else if (SdkCommandLine.OBJECT_LIB_PROJECT.equals(directObject)) {
                 createProject(true /*library*/);
 
+            } else if (SdkCommandLine.OBJECT_UITEST_PROJECT.equals(directObject)) {
+                createUiTestProject();
+
             }
         } else if (SdkCommandLine.VERB_UPDATE.equals(verb)) {
             if (SdkCommandLine.OBJECT_AVD.equals(directObject)) {
@@ -691,6 +695,66 @@ public class Main {
     }
 
     /**
+     * Creates a new Android UI test project based on command-line parameters
+     */
+    private void createUiTestProject() {
+
+        String projectDir = getProjectLocation(mSdkCommandLine.getParamLocationPath());
+
+        // get the target and try to resolve it.
+        int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId());
+        IAndroidTarget[] targets = mSdkManager.getTargets();
+        if (targetId == INVALID_TARGET_ID || targetId > targets.length) {
+            errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.",
+                    SdkConstants.androidCmdName());
+        }
+        IAndroidTarget target = targets[targetId - 1];  // target id is 1-based
+
+        if (target.getVersion().getApiLevel() < 16) {
+            errorAndExit("UI test projects can only target API 16 and above");
+        }
+
+        // get the project name
+        String projectName = mSdkCommandLine.getParamName();
+        // if none, use the folder name.
+        if (projectName == null) {
+            File f = new File(projectDir);
+            projectName = f.getName();
+        }
+
+        try {
+            // create src folder
+            File srcFolder = new File(projectDir, SdkConstants.FD_SOURCES);
+            srcFolder.mkdir();
+
+            // create the local.prop file.
+            // location of the SDK goes in localProperty
+            ProjectPropertiesWorkingCopy localProperties = ProjectProperties.create(projectDir,
+                    PropertyType.LOCAL);
+            localProperties.setProperty(ProjectProperties.PROPERTY_SDK, mOsSdkFolder);
+            localProperties.save();
+
+            // target goes in project properties
+            ProjectPropertiesWorkingCopy projectProperties = ProjectProperties.create(projectDir,
+                    PropertyType.PROJECT);
+            projectProperties.setProperty(ProjectProperties.PROPERTY_TARGET, target.hashString());
+            projectProperties.save();
+
+            // copy the build file using the keywords replacement.
+            final Map<String, String> keywords = new HashMap<String, String>();
+            keywords.put(ProjectCreator.PH_PROJECT_NAME, projectName);
+
+            ProjectCreator creator = getProjectCreator();
+
+            creator.installTemplate("uibuild.template",
+                    new File(projectDir, SdkConstants.FN_BUILD_XML),
+                    keywords);
+        } catch (Exception e) {
+            mSdkLog.error(e, null);
+        }
+    }
+
+    /**
      * Updates an existing Android project based on command-line parameters
      * @param library whether the project is a library project.
      */
diff --git a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
index 68b1943..6a74c29 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
@@ -54,6 +54,7 @@ class SdkCommandLine extends CommandLineParser {
     public static final String OBJECT_TARGETS        = "targets";                   //$NON-NLS-1$
     public static final String OBJECT_PROJECT        = "project";                   //$NON-NLS-1$
     public static final String OBJECT_TEST_PROJECT   = "test-project";              //$NON-NLS-1$
+    public static final String OBJECT_UITEST_PROJECT = "uitest-project";            //$NON-NLS-1$
     public static final String OBJECT_LIB_PROJECT    = "lib-project";               //$NON-NLS-1$
     public static final String OBJECT_ADB            = "adb";                       //$NON-NLS-1$
 
@@ -150,6 +151,9 @@ class SdkCommandLine extends CommandLineParser {
             { VERB_UPDATE, OBJECT_LIB_PROJECT,
                 "Updates an Android library project (must already have an AndroidManifest.xml)." },
 
+            { VERB_CREATE, OBJECT_UITEST_PROJECT,
+                "Creates a new UI test project." },
+
             { VERB_UPDATE, OBJECT_ADB,
                 "Updates adb to support the USB devices declared in the SDK add-ons." },
 
@@ -363,6 +367,18 @@ class SdkCommandLine extends CommandLineParser {
                 "Path to directory of the app under test, relative to the test project directory.",
                 null);
 
+        // --- create uitest-project ---
+
+        define(Mode.STRING, true,
+                VERB_CREATE, OBJECT_UITEST_PROJECT, "p", KEY_PATH,                  //$NON-NLS-1$
+                "The new project's directory.", null);
+        define(Mode.STRING, false,
+                VERB_CREATE, OBJECT_UITEST_PROJECT, "n", KEY_NAME,                    //$NON-NLS-1$
+                "Project name.", null);
+        define(Mode.STRING, true,
+                VERB_CREATE, OBJECT_UITEST_PROJECT, "t", KEY_TARGET_ID,               //$NON-NLS-1$
+                "Target ID of the new project.", null);
+
         // --- create lib-project ---
 
         define(Mode.STRING, true,
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
index fee9472..8a201d2 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
@@ -77,7 +77,7 @@ public class ProjectCreator {
      * "ACTIVITY_TESTED_CLASS_NAME".*/
     private final static String PH_ACTIVITY_TESTED_CLASS_NAME = "ACTIVITY_TESTED_CLASS_NAME";
     /** Project name substitution string used in template files, i.e. "PROJECT_NAME". */
-    private final static String PH_PROJECT_NAME = "PROJECT_NAME";
+    public final static String PH_PROJECT_NAME = "PROJECT_NAME";
     /** Application icon substitution string used in the manifest template */
     private final static String PH_ICON = "ICON";
     /** Version tag name substitution string used in template files, i.e. "VERSION_TAG". */
@@ -202,25 +202,25 @@ public class ProjectCreator {
             localProperties.setProperty(ProjectProperties.PROPERTY_SDK, mSdkFolder);
             localProperties.save();
 
-            // target goes in default properties
-            ProjectPropertiesWorkingCopy defaultProperties = ProjectProperties.create(folderPath,
+            // target goes in project properties
+            ProjectPropertiesWorkingCopy projectProperties = ProjectProperties.create(folderPath,
                     PropertyType.PROJECT);
-            defaultProperties.setProperty(ProjectProperties.PROPERTY_TARGET, target.hashString());
+            projectProperties.setProperty(ProjectProperties.PROPERTY_TARGET, target.hashString());
             if (library) {
-                defaultProperties.setProperty(ProjectProperties.PROPERTY_LIBRARY, "true");
+                projectProperties.setProperty(ProjectProperties.PROPERTY_LIBRARY, "true");
             }
-            defaultProperties.save();
+            projectProperties.save();
 
-            // create a build.properties file with just the application package
-            ProjectPropertiesWorkingCopy buildProperties = ProjectProperties.create(folderPath,
+            // create a ant.properties file with just the application package
+            ProjectPropertiesWorkingCopy antProperties = ProjectProperties.create(folderPath,
                     PropertyType.ANT);
 
             if (isTestProject) {
-                buildProperties.setProperty(ProjectProperties.PROPERTY_TESTED_PROJECT,
+                antProperties.setProperty(ProjectProperties.PROPERTY_TESTED_PROJECT,
                         pathToMainProject);
             }
 
-            buildProperties.save();
+            antProperties.save();
 
             // create the map for place-holders of values to replace in the templates
             final HashMap<String, String> keywords = new HashMap<String, String>();
@@ -1095,7 +1095,7 @@ public class ProjectCreator {
      * @param placeholderMap a map of (place-holder, value) to create the file from the template.
      * @throws ProjectCreateException
      */
-    private void installTemplate(String templateName, File destFile,
+    public void installTemplate(String templateName, File destFile,
             Map<String, String> placeholderMap)
             throws ProjectCreateException {
         // query the target for its template directory