From 177eb38ef571e8602547dfd9ba78376822e18e01 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 9 Jul 2010 10:40:22 +0100 Subject: [PATCH] Update the file filter in DumpRenderTree (and DumpRenderTree2) so that we run tests in .xhtml files. Change-Id: I2af0bd29acef5bafa9dee9292aafc18d77a84080 --- .../src/com/android/dumprendertree/FsUtils.java | 4 +++- .../src/com/android/dumprendertree2/FileFilter.java | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java index 0883387fc5fdc..4475e925fd0cf 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java @@ -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()); diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java index 98801d35da390..64ef8a4ad49f7 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java @@ -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"); } -} \ No newline at end of file +}