aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2012-06-13 19:30:03 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-13 19:30:03 -0700
commitd8c3696b3a4987c9733b98ad75ddaf5b4287dd2e (patch)
treef4f8f415e917a8ccb62751befdc7df1217548dc0
parent87e0d3af028a713a7513850b1f71774b8c6170dc (diff)
parentf658e868b61ffc80aadafdcbefe12fdb2b3c88b5 (diff)
downloadsdk-d8c3696b3a4987c9733b98ad75ddaf5b4287dd2e.zip
sdk-d8c3696b3a4987c9733b98ad75ddaf5b4287dd2e.tar.gz
sdk-d8c3696b3a4987c9733b98ad75ddaf5b4287dd2e.tar.bz2
Merge "Fixed device tests to use new device api"
-rw-r--r--sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java
index 01274c7..134a5a1 100644
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/devices/DeviceParserTest.java
@@ -56,7 +56,7 @@ public class DeviceParserTest extends TestCase {
assertFalse(meta.hasFrame());
// Test Hardware information
- Hardware hw = device.getHardware();
+ Hardware hw = device.getDefaultHardware();
Screen screen = hw.getScreen();
assertEquals(screen.getSize(), ScreenSize.NORMAL);
assertEquals(4.65, screen.getDiagonalLength());
@@ -171,7 +171,7 @@ public class DeviceParserTest extends TestCase {
try {
List<Device> devices = DeviceParser.parse(stream);
assertEquals(1, devices.size());
- assertEquals(0, devices.get(0).getHardware().getNetworking().size());
+ assertEquals(0, devices.get(0).getDefaultHardware().getNetworking().size());
fail();
} catch (SAXParseException e) {
assertTrue(e.getMessage().startsWith("cvc-enumeration-valid: Value 'NFD'"));