Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4899daa0 authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am c54e0ce9: Merge change Ia86f2849 into eclair 

Merge commit 'c54e0ce9' into eclair-mr2

* commit 'c54e0ce9':
  Fix layoutlib tests so they pas when run from Eclipse workbench.
parents 97c5a993 c54e0ce9

tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/BridgeXmlBlockParserTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */);

    }