diff options
author | Raphael Moll <ralf@android.com> | 2014-02-20 18:57:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-20 18:57:04 +0000 |
commit | 10ec51f2a6a5cccad02f5251221c965a56a4f364 (patch) | |
tree | b3f92a9d1f7f9250ac8acba1ba6d35618babf6f8 | |
parent | ea4d17d1fe2d12e917fc9406255cc7b3826ad95e (diff) | |
parent | 26b24be1741592972831b4ef16fc423434dcab16 (diff) | |
download | sdk-10ec51f2a6a5cccad02f5251221c965a56a4f364.zip sdk-10ec51f2a6a5cccad02f5251221c965a56a4f364.tar.gz sdk-10ec51f2a6a5cccad02f5251221c965a56a4f364.tar.bz2 |
Merge "Update ADT to match DeviceManager API change." into idea133
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java index d4062ab..2e02509 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java @@ -27,6 +27,7 @@ import com.android.sdklib.devices.Screen; import com.android.utils.StdLogger; import java.lang.reflect.Constructor; +import java.util.EnumSet; import java.util.List; import junit.framework.TestCase; @@ -52,7 +53,7 @@ public class ConfigurationTest extends TestCase { DeviceManager deviceManager = DeviceManager.createInstance( null /*osSdkPath*/, new StdLogger(StdLogger.Level.VERBOSE)); - List<Device> devices = deviceManager.getDevices(DeviceManager.DEFAULT_DEVICES); + List<Device> devices = deviceManager.getDevices(DeviceManager.DeviceFilter.DEFAULT); assertNotNull(devices); assertTrue(devices.size() > 0); configuration.setDevice(devices.get(0), false); @@ -112,7 +113,7 @@ public class ConfigurationTest extends TestCase { DeviceManager deviceManager = DeviceManager.createInstance( null /*osSdkPath*/, new StdLogger(StdLogger.Level.VERBOSE)); - List<Device> devices = deviceManager.getDevices(DeviceManager.DEFAULT_DEVICES); + List<Device> devices = deviceManager.getDevices(DeviceManager.DeviceFilter.DEFAULT); assertNotNull(devices); assertTrue(devices.size() > 0); configuration.setDevice(devices.get(0), false); |