am 08ab3b36: Merge "Wait Properly in CacheManagerTest#testCacheFile" into froyo
Merge commit '08ab3b36c5ab0beff70e718af73fda331c87bb1c' into gingerbread
* commit '08ab3b36c5ab0beff70e718af73fda331c87bb1c':
Wait Properly in CacheManagerTest#testCacheFile
diff --git a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
index bf66bad..3e9a073 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
@@ -100,14 +100,19 @@
new DelayedCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
- CacheResult result =
- CacheManager.getCacheFile(url, null);
+ CacheResult result = CacheManager.getCacheFile(url, null);
return result == null;
}
}.run();
+
loadUrl(url);
- CacheResult result = CacheManager.getCacheFile(url, null);
- assertNotNull(result);
+ new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ @Override
+ protected boolean check() {
+ CacheResult result = CacheManager.getCacheFile(url, null);
+ return result != null;
+ }
+ }.run();
// Can not test saveCacheFile(), because the output stream is null and
// saveCacheFile() will throw a NullPointerException. There is no