Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* vim:set ts=2 sw=2 sts=2 et: */ |
michael@0 | 3 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 6 | |
michael@0 | 7 | // Tests the interaction of includeHidden and searchTerms search options. |
michael@0 | 8 | |
michael@0 | 9 | let timeInMicroseconds = Date.now() * 1000; |
michael@0 | 10 | |
michael@0 | 11 | const VISITS = [ |
michael@0 | 12 | { isVisit: true, |
michael@0 | 13 | transType: TRANSITION_TYPED, |
michael@0 | 14 | uri: "http://redirect.example.com/", |
michael@0 | 15 | title: "example", |
michael@0 | 16 | isRedirect: true, |
michael@0 | 17 | lastVisit: timeInMicroseconds-- |
michael@0 | 18 | }, |
michael@0 | 19 | { isVisit: true, |
michael@0 | 20 | transType: TRANSITION_TYPED, |
michael@0 | 21 | uri: "http://target.example.com/", |
michael@0 | 22 | title: "example", |
michael@0 | 23 | lastVisit: timeInMicroseconds-- |
michael@0 | 24 | } |
michael@0 | 25 | ]; |
michael@0 | 26 | |
michael@0 | 27 | const HIDDEN_VISITS = [ |
michael@0 | 28 | { isVisit: true, |
michael@0 | 29 | transType: TRANSITION_FRAMED_LINK, |
michael@0 | 30 | uri: "http://hidden.example.com/", |
michael@0 | 31 | title: "red", |
michael@0 | 32 | lastVisit: timeInMicroseconds-- |
michael@0 | 33 | }, |
michael@0 | 34 | ]; |
michael@0 | 35 | |
michael@0 | 36 | const TEST_DATA = [ |
michael@0 | 37 | { searchTerms: "example", |
michael@0 | 38 | includeHidden: true, |
michael@0 | 39 | expectedResults: 2 |
michael@0 | 40 | }, |
michael@0 | 41 | { searchTerms: "example", |
michael@0 | 42 | includeHidden: false, |
michael@0 | 43 | expectedResults: 1 |
michael@0 | 44 | }, |
michael@0 | 45 | { searchTerms: "red", |
michael@0 | 46 | includeHidden: true, |
michael@0 | 47 | expectedResults: 1 |
michael@0 | 48 | } |
michael@0 | 49 | ]; |
michael@0 | 50 | |
michael@0 | 51 | function run_test() |
michael@0 | 52 | { |
michael@0 | 53 | run_next_test(); |
michael@0 | 54 | } |
michael@0 | 55 | |
michael@0 | 56 | add_task(function test_initalize() |
michael@0 | 57 | { |
michael@0 | 58 | yield task_populateDB(VISITS); |
michael@0 | 59 | }); |
michael@0 | 60 | |
michael@0 | 61 | add_task(function test_searchTerms_includeHidden() |
michael@0 | 62 | { |
michael@0 | 63 | for (let data of TEST_DATA) { |
michael@0 | 64 | let query = PlacesUtils.history.getNewQuery(); |
michael@0 | 65 | query.searchTerms = data.searchTerms; |
michael@0 | 66 | let options = PlacesUtils.history.getNewQueryOptions(); |
michael@0 | 67 | options.includeHidden = data.includeHidden; |
michael@0 | 68 | |
michael@0 | 69 | let root = PlacesUtils.history.executeQuery(query, options).root; |
michael@0 | 70 | root.containerOpen = true; |
michael@0 | 71 | |
michael@0 | 72 | let cc = root.childCount; |
michael@0 | 73 | // Live update with hidden visits. |
michael@0 | 74 | yield task_populateDB(HIDDEN_VISITS); |
michael@0 | 75 | let cc_update = root.childCount; |
michael@0 | 76 | |
michael@0 | 77 | root.containerOpen = false; |
michael@0 | 78 | |
michael@0 | 79 | do_check_eq(cc, data.expectedResults); |
michael@0 | 80 | do_check_eq(cc_update, data.expectedResults + (data.includeHidden ? 1 : 0)); |
michael@0 | 81 | |
michael@0 | 82 | PlacesUtils.bhistory.removePage(uri("http://hidden.example.com/")); |
michael@0 | 83 | } |
michael@0 | 84 | }); |