Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | function run_test() |
michael@0 | 2 | { |
michael@0 | 3 | do_get_profile(); |
michael@0 | 4 | |
michael@0 | 5 | if (!newCacheBackEndUsed()) { |
michael@0 | 6 | do_check_true(true, "This test doesn't run when the old cache back end is used since the behavior is different"); |
michael@0 | 7 | return; |
michael@0 | 8 | } |
michael@0 | 9 | |
michael@0 | 10 | var mc = new MultipleCallbacks(3, function() { |
michael@0 | 11 | var storage = getCacheStorage("disk"); |
michael@0 | 12 | storage.asyncEvictStorage( |
michael@0 | 13 | new EvictionCallback(true, function() { |
michael@0 | 14 | storage.asyncVisitStorage( |
michael@0 | 15 | new VisitCallback(0, 0, [], function() { |
michael@0 | 16 | var storage = getCacheStorage("memory"); |
michael@0 | 17 | storage.asyncVisitStorage( |
michael@0 | 18 | new VisitCallback(0, 0, [], function() { |
michael@0 | 19 | finish_cache2_test(); |
michael@0 | 20 | }), |
michael@0 | 21 | true |
michael@0 | 22 | ); |
michael@0 | 23 | }), |
michael@0 | 24 | true |
michael@0 | 25 | ); |
michael@0 | 26 | }) |
michael@0 | 27 | ); |
michael@0 | 28 | }, !newCacheBackEndUsed()); |
michael@0 | 29 | |
michael@0 | 30 | asyncOpenCacheEntry("http://mem1/", "memory", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 31 | new OpenCallback(NEW, "m2m", "m2d", function(entry) { |
michael@0 | 32 | asyncOpenCacheEntry("http://mem1/", "memory", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 33 | new OpenCallback(NORMAL, "m2m", "m2d", function(entry) { |
michael@0 | 34 | mc.fired(); |
michael@0 | 35 | }) |
michael@0 | 36 | ); |
michael@0 | 37 | }) |
michael@0 | 38 | ); |
michael@0 | 39 | |
michael@0 | 40 | asyncOpenCacheEntry("http://a/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 41 | new OpenCallback(NEW, "a1m", "a1d", function(entry) { |
michael@0 | 42 | asyncOpenCacheEntry("http://a/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 43 | new OpenCallback(NORMAL, "a1m", "a1d", function(entry) { |
michael@0 | 44 | mc.fired(); |
michael@0 | 45 | }) |
michael@0 | 46 | ); |
michael@0 | 47 | }) |
michael@0 | 48 | ); |
michael@0 | 49 | |
michael@0 | 50 | asyncOpenCacheEntry("http://b/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 51 | new OpenCallback(NEW, "b1m", "b1d", function(entry) { |
michael@0 | 52 | asyncOpenCacheEntry("http://b/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null, |
michael@0 | 53 | new OpenCallback(NORMAL, "b1m", "b1d", function(entry) { |
michael@0 | 54 | mc.fired(); |
michael@0 | 55 | }) |
michael@0 | 56 | ); |
michael@0 | 57 | }) |
michael@0 | 58 | ); |
michael@0 | 59 | |
michael@0 | 60 | do_test_pending(); |
michael@0 | 61 | } |