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
This commit is contained in:
@@ -10,4 +10,6 @@ bin.includes = META-INF/,\
|
|||||||
unittests/data/,\
|
unittests/data/,\
|
||||||
sdklib.jar,\
|
sdklib.jar,\
|
||||||
layoutlib_api.jar,\
|
layoutlib_api.jar,\
|
||||||
layoutlib.jar
|
layoutlib.jar,\
|
||||||
|
unittests/com/android/sdklib/testdata/,\
|
||||||
|
unittests/com/android/layoutlib/testdata/
|
||||||
|
|||||||
@@ -57,4 +57,5 @@ cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib
|
|||||||
DEST=$BASE/unittests/com/android/layoutlib
|
DEST=$BASE/unittests/com/android/layoutlib
|
||||||
mkdir -p $DEST
|
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/bridge
|
||||||
|
cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/testdata
|
||||||
|
|
||||||
|
|||||||
@@ -123,9 +123,9 @@ public class TestSdkRepository extends TestCase {
|
|||||||
|
|
||||||
/** Validate a valid sample using an InputStream */
|
/** Validate a valid sample using an InputStream */
|
||||||
public void testValidateLocalRepositoryFile() throws Exception {
|
public void testValidateLocalRepositoryFile() throws Exception {
|
||||||
|
|
||||||
InputStream xmlStream =
|
InputStream xmlStream =
|
||||||
TestSdkRepository.class.getResourceAsStream("repository_sample.xml");
|
TestSdkRepository.class.getResourceAsStream(
|
||||||
|
"/com/android/sdklib/testdata/repository_sample.xml");
|
||||||
Source source = new StreamSource(xmlStream);
|
Source source = new StreamSource(xmlStream);
|
||||||
|
|
||||||
CaptureErrorHandler handler = new CaptureErrorHandler();
|
CaptureErrorHandler handler = new CaptureErrorHandler();
|
||||||
|
|||||||
Reference in New Issue
Block a user