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

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index 4110b98..290cad7 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/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/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh
index 8996258..3305062 100755 (executable)
--- a/eclipse/scripts/create_test_symlinks.sh
+++ b/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/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
index b059e41..5d639ec 100755 (executable)
--- a/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
+++ b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
@@ -123,9 +123,9 @@ public class TestSdkRepository extends TestCase {
 \r
     /** Validate a valid sample using an InputStream */\r
     public void testValidateLocalRepositoryFile() throws Exception {\r
-\r
         InputStream xmlStream =\r
-            TestSdkRepository.class.getResourceAsStream("repository_sample.xml");\r
+            TestSdkRepository.class.getResourceAsStream(\r
+                    "/com/android/sdklib/testdata/repository_sample.xml");\r
         Source source = new StreamSource(xmlStream);\r
 \r
         CaptureErrorHandler handler = new CaptureErrorHandler();\r

diff --git a/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml b/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml
similarity index 100%
rename from sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml
rename to sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml