aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2012-03-26 11:45:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-26 11:45:37 -0700
commit13d674238d8dadfed5b16e69f368f189c1633e34 (patch)
tree330cddd31967671efe1b32a709c75a5beff74446 /eclipse/plugins
parent80e2f7b82c63f9b2977129249676ae00ccf7fa87 (diff)
parentac94b5115f07d079af021cb3f113410e0ffa6541 (diff)
downloadsdk-13d674238d8dadfed5b16e69f368f189c1633e34.zip
sdk-13d674238d8dadfed5b16e69f368f189c1633e34.tar.gz
sdk-13d674238d8dadfed5b16e69f368f189c1633e34.tar.bz2
Merge "Use different names for the application and test projects."
Diffstat (limited to 'eclipse/plugins')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java
index ab34f92..5b557ac 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java
@@ -395,7 +395,10 @@ public class NewProjectCreator {
final HashMap<String, String> dictionary = new HashMap<String, String>();
dictionary.put(STRING_APP_NAME, mValues.testApplicationName);
+ // Use the same logic to determine test project location as in
+ // ApplicationInfoPage#validateTestProjectLocation
IPath path = new Path(mValues.projectLocation.getPath());
+ path = path.removeLastSegments(1).append(mValues.testProjectName);
IPath defaultLocation = Platform.getLocation();
if ((!mValues.useDefaultLocation || mValues.useExisting)
&& !path.equals(defaultLocation)) {