am d394355d: Delete HttpHeaderTest.testCacheControlMultipleArguments.
* commit 'd394355d75ba4526adf3509a9e5d8d63acf86a7c': Delete HttpHeaderTest.testCacheControlMultipleArguments.
This commit is contained in:
committed by
Android Git Automerger
commit
496fd28fd1
@@ -20,10 +20,6 @@ import org.apache.http.util.CharArrayBuffer;
|
|||||||
|
|
||||||
import android.net.http.Headers;
|
import android.net.http.Headers;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.webkit.CacheManager;
|
|
||||||
import android.webkit.CacheManager.CacheResult;
|
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
|
|
||||||
public class HttpHeaderTest extends AndroidTestCase {
|
public class HttpHeaderTest extends AndroidTestCase {
|
||||||
|
|
||||||
@@ -67,38 +63,4 @@ public class HttpHeaderTest extends AndroidTestCase {
|
|||||||
assertEquals("max-age=15,private", h.getCacheControl());
|
assertEquals("max-age=15,private", h.getCacheControl());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test that cache behaves correctly when receiving a compund
|
|
||||||
// cache-control statement containing no-cache and max-age argument.
|
|
||||||
//
|
|
||||||
// If a cache control header contains both a max-age arument and
|
|
||||||
// a no-cache argument the max-age argument should be ignored.
|
|
||||||
// The resource can be cached, but a validity check must be done on
|
|
||||||
// every request. Test case checks that the expiry time is 0 for
|
|
||||||
// this item, so item will be validated on subsequent requests.
|
|
||||||
public void testCacheControlMultipleArguments() throws Exception {
|
|
||||||
// get private method CacheManager.parseHeaders()
|
|
||||||
Method m = CacheManager.class.getDeclaredMethod("parseHeaders",
|
|
||||||
new Class[] {int.class, Headers.class, String.class});
|
|
||||||
m.setAccessible(true);
|
|
||||||
|
|
||||||
// create indata
|
|
||||||
Headers h = new Headers();
|
|
||||||
CharArrayBuffer buffer = new CharArrayBuffer(64);
|
|
||||||
buffer.append(CACHE_CONTROL_COMPOUND);
|
|
||||||
h.parseHeader(buffer);
|
|
||||||
|
|
||||||
CacheResult c = (CacheResult)m.invoke(null, 200, h, "text/html");
|
|
||||||
|
|
||||||
// Check that expires is set to 0, to ensure that no-cache has overridden
|
|
||||||
// the max-age argument
|
|
||||||
assertEquals(0, c.getExpires());
|
|
||||||
|
|
||||||
// check reverse order
|
|
||||||
buffer.clear();
|
|
||||||
buffer.append(CACHE_CONTROL_COMPOUND2);
|
|
||||||
h.parseHeader(buffer);
|
|
||||||
|
|
||||||
c = (CacheResult)m.invoke(null, 200, h, "text/html");
|
|
||||||
assertEquals(0, c.getExpires());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user