summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java2
-rw-r--r--tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java
index 17e19d0..f42dc86 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java
@@ -267,7 +267,7 @@ public class ManagerService extends Service {
bytes = FsUtils.readDataFromUrl(FileFilter.getUrl(relativePath));
}
- mLastExpectedResultPathFetched = relativePath;
+ mLastExpectedResultPathFetched = bytes == null ? null : relativePath;
return bytes;
}
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
index 25c5ad5..8d01a53 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
@@ -539,7 +539,11 @@ public class Summarizer {
String textSource = result.getExpectedTextResultPath();
String imageSource = result.getExpectedImageResultPath();
- if (textSource != null) {
+ if (textSource == null) {
+ // Show if a text result is missing. We may want to revisit this decision when we add
+ // support for image results.
+ html.append("<span class=\"source\">Expected textual result missing</span>");
+ } else {
html.append("<span class=\"source\">Expected textual result from: ");
html.append("<a href=\"" + ForwarderManager.getHostSchemePort(false) + "LayoutTests/" +
textSource + "\"");