diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-05 17:45:04 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-05 17:45:04 -0400 |
| commit | 56d14fb2aed4b5ff1c0f5cf8de876c60e714f10f (patch) | |
| tree | f6f3982656f0f2baa18b61856464fa4422871ae8 /eclipse | |
| parent | 6a5d0193d201204228ecbbc19d46f6ea142f34e5 (diff) | |
| parent | 8cbdfca85f5cda934c213c8098afc5a527b01b5d (diff) | |
| download | sdk-56d14fb2aed4b5ff1c0f5cf8de876c60e714f10f.zip sdk-56d14fb2aed4b5ff1c0f5cf8de876c60e714f10f.tar.gz sdk-56d14fb2aed4b5ff1c0f5cf8de876c60e714f10f.tar.bz2 | |
Merge change Ieb4e722b into eclair
* changes:
Add sdklib tests to the adt-tests Unit tests.
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/.gitignore | 1 | ||||
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java | 8 | ||||
| -rwxr-xr-x | eclipse/scripts/create_test_symlinks.sh | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/eclipse/plugins/.gitignore b/eclipse/plugins/.gitignore index 6c13a2b..42a204e 100644 --- a/eclipse/plugins/.gitignore +++ b/eclipse/plugins/.gitignore @@ -53,4 +53,5 @@ com.android.ide.eclipse.ddms/src/com/android/ddmlib com.android.ide.eclipse.ddms/src/com/android/ddmuilib com.android.ide.eclipse.tests/kxml2-2.3.0.jar com.android.ide.eclipse.tests/unittests/com/android/ddmlib +com.android.ide.eclipse.tests/unittests/com/android/sdklib diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java index 67e7cb2..6c1510c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java @@ -31,16 +31,17 @@ import junit.framework.TestSuite; * */ public class UnitTests { - private static final String TEST_PACKAGE = "com.android.ide.eclipse"; + private static final String TEST_PACKAGE = "com.android"; public static Test suite() { TestSuite suite = new TestSuite(); - + UnitTestCollector collector = new UnitTestCollector(); collector.addTestCases(suite, AndroidTestPlugin.getDefault(), TEST_PACKAGE); + return suite; } - + /** * Specialized test collector which will skip adding functional tests */ @@ -54,5 +55,4 @@ public class UnitTests { !testClass.getPackage().getName().startsWith(FuncTests.FUNC_TEST_PACKAGE); } } - } diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh index 931dce8..149a142 100755 --- a/eclipse/scripts/create_test_symlinks.sh +++ b/eclipse/scripts/create_test_symlinks.sh @@ -51,4 +51,5 @@ fi DEST=$BASE/unittests/com/android BACK=`back $DEST` cpdir $DEST development/tools/ddms/libs/ddmlib/tests/src/com/android/ddmlib +cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib |