am 4899daa0: am c54e0ce9: Merge change Ia86f2849 into eclair

Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp

* commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524':
  Fix layoutlib tests so they pas when run from Eclipse workbench.
This commit is contained in:
Brett Chabot
2009-11-03 11:44:48 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@ -41,7 +41,7 @@ public class BridgeXmlBlockParserTest extends TestCase {
parser = new BridgeXmlBlockParser(parser, null, false /* platformResourceFlag */);
InputStream input = this.getClass().getClassLoader().getResourceAsStream(
"/com/android/layoutlib/testdata/layout1.xml");
"com/android/layoutlib/testdata/layout1.xml");
parser.setInput(input, null /*encoding*/);
assertEquals(XmlPullParser.START_DOCUMENT, parser.next());

View File

@ -13,7 +13,7 @@ public class NinePatchTest extends TestCase {
@Override
protected void setUp() throws Exception {
URL url = this.getClass().getClassLoader().getResource(
"/com/android/layoutlib/testdata/button.9.png");
"com/android/layoutlib/testdata/button.9.png");
mPatch = NinePatch.load(url, false /* convert */);
}