diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-06-02 18:13:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-06-02 18:13:52 +0000 |
| commit | 85497e71e1a23518f94b5242ccb61df918bdff29 (patch) | |
| tree | a3610f034526c1e644b0040de4b4903cb374cf5d | |
| parent | c1d31e9dee231ed5cb44b23f231ee98c5f89b9bf (diff) | |
| parent | c63bc4825fa517483698194dab055b4c012983c7 (diff) | |
| download | swt-85497e71e1a23518f94b5242ccb61df918bdff29.tar.gz | |
Merge "Update SdkManagerUpgradeTest to be aware of repo-11.xml" into studio-1.3-dev automerge: 3603c66android-m-preview-1
automerge: c63bc48
* commit 'c63bc4825fa517483698194dab055b4c012983c7':
Update SdkManagerUpgradeTest to be aware of repo-11.xml
| -rwxr-xr-x | sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java index be1e030..8b910b9 100755 --- a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java +++ b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java @@ -80,6 +80,7 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { "[<https://dl.google.com/android/repository/addons_list-1.xml : 1>, " + "<https://dl.google.com/android/repository/addons_list-2.xml : 1>, " + "<https://dl.google.com/android/repository/repository-10.xml : 2>, " + + "<https://dl.google.com/android/repository/repository-11.xml : 2>, " + "<https://dl.google.com/android/repository/repository-5.xml : 2>, " + "<https://dl.google.com/android/repository/repository-6.xml : 2>, " + "<https://dl.google.com/android/repository/repository-7.xml : 2>, " + @@ -119,6 +120,7 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { Arrays.toString(cache.getDirectHits())); assertEquals( "[<https://dl.google.com/android/repository/repository-10.xml : 1>, " + + "<https://dl.google.com/android/repository/repository-11.xml : 1>, " + "<https://dl.google.com/android/repository/repository-5.xml : 1>, " + "<https://dl.google.com/android/repository/repository-6.xml : 1>, " + "<https://dl.google.com/android/repository/repository-7.xml : 1>, " + @@ -159,6 +161,7 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { Arrays.toString(cache.getDirectHits())); assertEquals( "[<https://dl.google.com/android/repository/repository-10.xml : 1>, " + + "<https://dl.google.com/android/repository/repository-11.xml : 1>, " + "<https://dl.google.com/android/repository/repository-5.xml : 1>, " + "<https://dl.google.com/android/repository/repository-6.xml : 1>, " + "<https://dl.google.com/android/repository/repository-7.xml : 1>, " + @@ -199,6 +202,7 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { Arrays.toString(cache.getDirectHits())); assertEquals( "[<https://dl.google.com/android/repository/repository-10.xml : 1>, " + + "<https://dl.google.com/android/repository/repository-11.xml : 1>, " + "<https://dl.google.com/android/repository/repository-5.xml : 1>, " + "<https://dl.google.com/android/repository/repository-6.xml : 1>, " + "<https://dl.google.com/android/repository/repository-7.xml : 1>, " + |