| commit | 5cc2e5398e1d5878e8895cb779c4e37cbf7984e4 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Thu Jan 14 15:17:50 2010 -0800 |
| committer | Raphael <raphael@google.com> | Thu Jan 14 15:17:50 2010 -0800 |
| tree | f4a106f8d605c0cbfd39f2079d94a0ee536bddb0 | |
| parent | 902280200956f077a0ef571435091b4b9a9e5306 [diff] |
AD Tests: fix missing LayoutDevices sample xml. Change-Id: I879dd9fd3465491b0e8143a81d3a696e50212b99
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/groovytests/config_sample.xml b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/sdk/config_sample.xml similarity index 100% rename from eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/groovytests/config_sample.xml rename to eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/sdk/config_sample.xml
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/SdkTestCase.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/SdkTestCase.java index 7f2eef6..d3210eb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/SdkTestCase.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/SdkTestCase.java
@@ -53,6 +53,13 @@ */ private Sdk loadSdk() { AdtPlugin adt = AdtPlugin.getDefault(); + + // We'll never get an AdtPlugin object when running this with the + // non-Eclipse jUnit test runner. + if (adt == null) { + return null; + } + Object sdkLock = adt.getSdkLockObject(); LoadStatus loadStatus = LoadStatus.LOADING; // wait for ADT to load the SDK on a separate thread