aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-09-17 10:21:43 -0700
committerRaphael Moll <ralf@android.com>2012-09-17 10:21:43 -0700
commit7801fad0690017fa3388730389a6b86d9b2382e9 (patch)
tree16ff25bc8aa512173d731334f04700ea1f276404
parent6940ec16be261afff39538fec3ee7b702b92c656 (diff)
downloadsdk-7801fad0690017fa3388730389a6b86d9b2382e9.zip
sdk-7801fad0690017fa3388730389a6b86d9b2382e9.tar.gz
sdk-7801fad0690017fa3388730389a6b86d9b2382e9.tar.bz2
Fix unit test for LocalSdkParser.
Change-Id: I630cb4fc123e3d6b6efc36eea543f7556b2ccc87
-rwxr-xr-xsdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java
index 645d2bb..4989ec3 100755
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/LocalSdkParserTest.java
@@ -36,7 +36,8 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
// a legacy armeabi system image (this is not a separate system image package)
assertEquals(
- "[SDK Platform Android 0.0, API 0, revision 1, " +
+ "[Android SDK Tools, revision 0, " +
+ "SDK Platform Android 0.0, API 0, revision 1, " +
"Sources for Android SDK, API 0, revision 0]",
Arrays.toString(parser.parseSdk(sdkman.getLocation(), sdkman, monitor)));
@@ -63,7 +64,7 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
monitor)));
assertEquals(
- "[]",
+ "[Android SDK Tools, revision 0]",
Arrays.toString(parser.parseSdk(sdkman.getLocation(),
sdkman,
LocalSdkParser.PARSE_TOOLS,
@@ -82,7 +83,8 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
t = sdkman.getTargets()[0];
assertEquals(
- "[SDK Platform Android 0.0, API 0, revision 1, " +
+ "[Android SDK Tools, revision 0, " +
+ "SDK Platform Android 0.0, API 0, revision 1, " +
"Sources for Android SDK, API 0, revision 0]",
Arrays.toString(parser.parseSdk(sdkman.getLocation(), sdkman, monitor)));
@@ -98,7 +100,8 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
sdkman.reloadSdk(getLog());
assertEquals(
- "[SDK Platform Android 0.0, API 0, revision 1, " +
+ "[Android SDK Tools, revision 0, " +
+ "SDK Platform Android 0.0, API 0, revision 1, " +
"ARM EABI v7a System Image, Android API 0, revision 0, " +
"ARM EABI System Image, Android API 0, revision 0, " +
"Sources for Android SDK, API 0, revision 0]",
@@ -112,7 +115,8 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
sdkman, t, LocationType.IN_SYSTEM_IMAGE, SdkConstants.ABI_INTEL_ATOM));
assertEquals(
- "[SDK Platform Android 0.0, API 0, revision 1, " +
+ "[Android SDK Tools, revision 0, " +
+ "SDK Platform Android 0.0, API 0, revision 1, " +
"ARM EABI v7a System Image, Android API 0, revision 0, " +
"ARM EABI System Image, Android API 0, revision 0, " +
"Sources for Android SDK, API 0, revision 0, " +
@@ -120,7 +124,8 @@ public class LocalSdkParserTest extends SdkManagerTestCase {
Arrays.toString(parser.parseSdk(sdkman.getLocation(), sdkman, monitor)));
assertEquals(
- "[SDK Platform Android 0.0, API 0, revision 1, " +
+ "[Android SDK Tools, revision 0, " +
+ "SDK Platform Android 0.0, API 0, revision 1, " +
"ARM EABI v7a System Image, Android API 0, revision 0, " +
"ARM EABI System Image, Android API 0, revision 0, " +
"Sources for Android SDK, API 0, revision 0, " +