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

Commit 177eb38e authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Update the file filter in DumpRenderTree (and DumpRenderTree2) so that 

we run tests in .xhtml files.

Change-Id: I2af0bd29acef5bafa9dee9292aafc18d77a84080
parent 2b2fa12c

tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ public class FsUtils { 
                continue;

            }



            if ((s.toLowerCase().endsWith(".html") || s.toLowerCase().endsWith(".xml"))

            if ((s.toLowerCase().endsWith(".html")

                    || s.toLowerCase().endsWith(".xml")

                    || s.toLowerCase().endsWith(".xhtml"))

                    && !s.endsWith("TEMPLATE.html")) {

                Log.v(LOGTAG, "Recording " + s);

                bos.write(s.getBytes());

tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java

+4 −3
Original line number Diff line number Diff line
@@ -227,13 +227,14 @@ public class FileFilter { 
    }



    /**

     * Checks if the file is a test or something else.

     * Checks if the file is a test.

     * Currently we run .html and .xhtml tests.

     *

     * @param testName

     * @return

     *      if the file is a test

     */

    public static boolean isTestFile(String testName) {

        return testName.endsWith(".html");

        return testName.endsWith(".html") || testName.endsWith(".xhtml");

    }

}