From 3f71486cbd60291044fd1805c61d946bda05d73e Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 6 Oct 2009 12:02:35 -0700 Subject: [PATCH] Moved the test data to their own package. This allows us to select the whole package for binary inclusion in adt-test (which doesn't automatically take any non java file for packaging) Change-Id: Idc3d3b2f27623de1b0fccd7e01dd88948923081c --- .../plugins/com.android.ide.eclipse.tests/build.properties | 4 +++- tools/eclipse/scripts/create_test_symlinks.sh | 1 + .../com/android/sdklib/repository/TestSdkRepository.java | 4 ++-- .../sdklib/{repository => testdata}/repository_sample.xml | 0 4 files changed, 6 insertions(+), 3 deletions(-) rename tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/{repository => testdata}/repository_sample.xml (100%) diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties index 4110b98b2..290cad7e6 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties +++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties @@ -10,4 +10,6 @@ bin.includes = META-INF/,\ unittests/data/,\ sdklib.jar,\ layoutlib_api.jar,\ - layoutlib.jar + layoutlib.jar,\ + unittests/com/android/sdklib/testdata/,\ + unittests/com/android/layoutlib/testdata/ diff --git a/tools/eclipse/scripts/create_test_symlinks.sh b/tools/eclipse/scripts/create_test_symlinks.sh index 899625838..3305062ea 100755 --- a/tools/eclipse/scripts/create_test_symlinks.sh +++ b/tools/eclipse/scripts/create_test_symlinks.sh @@ -57,4 +57,5 @@ cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib DEST=$BASE/unittests/com/android/layoutlib mkdir -p $DEST cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge +cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata diff --git a/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java index b059e4157..5d639ecca 100755 --- a/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java +++ b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java @@ -123,9 +123,9 @@ public class TestSdkRepository extends TestCase { /** Validate a valid sample using an InputStream */ public void testValidateLocalRepositoryFile() throws Exception { - InputStream xmlStream = - TestSdkRepository.class.getResourceAsStream("repository_sample.xml"); + TestSdkRepository.class.getResourceAsStream( + "/com/android/sdklib/testdata/repository_sample.xml"); Source source = new StreamSource(xmlStream); CaptureErrorHandler handler = new CaptureErrorHandler(); diff --git a/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml b/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml similarity index 100% rename from tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml rename to tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml