From 3b18222fdd48b87ed75f6ab3ef9ab0f8bb8fd597 Mon Sep 17 00:00:00 2001 From: Gavin Sharp Date: Sat, 2 Jun 2012 16:37:12 -0700 Subject: [PATCH] Also back out the test changes from bug 720081 that depended on the autocomplete controller changes, a=backout --- .../places/tests/inline/test_casing.js | 6 +- .../places/tests/inline/test_trimming.js | 134 ------------------ .../places/tests/inline/xpcshell.ini | 1 - 3 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 toolkit/components/places/tests/inline/test_trimming.js diff --git a/toolkit/components/places/tests/inline/test_casing.js b/toolkit/components/places/tests/inline/test_casing.js index 86a68b91b24..cd255b64241 100644 --- a/toolkit/components/places/tests/inline/test_casing.js +++ b/toolkit/components/places/tests/inline/test_casing.js @@ -23,7 +23,7 @@ add_autocomplete_test([ add_autocomplete_test([ "Searching for cased entry 3", "mozilla.org/T", - { autoFilled: "mozilla.org/Test/", completed: "http://mozilla.org/Test/" }, + { autoFilled: "mozilla.org/Test/", completed: "mozilla.org/Test/" }, function () { addBookmark({ url: "http://mozilla.org/Test/" }); } @@ -41,7 +41,7 @@ add_autocomplete_test([ add_autocomplete_test([ "Searching for cased entry 5", "mOzilla.org/T", - { autoFilled: "mOzilla.org/Test/", completed: "http://mozilla.org/Test/" }, + { autoFilled: "mOzilla.org/Test/", completed: "mozilla.org/Test/" }, function () { addBookmark({ url: "http://mozilla.org/Test/" }); }, @@ -59,7 +59,7 @@ add_autocomplete_test([ add_autocomplete_test([ "Searching for untrimmed cased entry with www", "http://www.mOz", - { autoFilled: "http://www.mOzilla.org/", completed: "www.mozilla.org/" }, + { autoFilled: "http://www.mOzilla.org/", completed: "http://www.mozilla.org/" }, function () { addBookmark({ url: "http://www.mozilla.org/Test/" }); }, diff --git a/toolkit/components/places/tests/inline/test_trimming.js b/toolkit/components/places/tests/inline/test_trimming.js deleted file mode 100644 index 93c67e4957a..00000000000 --- a/toolkit/components/places/tests/inline/test_trimming.js +++ /dev/null @@ -1,134 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -add_autocomplete_test([ - "Searching for untrimmed https://www entry", - "mo", - { autoFilled: "mozilla.org/", completed: "https://www.mozilla.org/" }, - function () { - addBookmark({ url: "https://www.mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed https://www entry with path", - "mozilla.org/t", - { autoFilled: "mozilla.org/test/", completed: "https://www.mozilla.org/test/" }, - function () { - addBookmark({ url: "https://www.mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed https:// entry", - "mo", - { autoFilled: "mozilla.org/", completed: "https://mozilla.org/" }, - function () { - addBookmark({ url: "https://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed https:// entry with path", - "mozilla.org/t", - { autoFilled: "mozilla.org/test/", completed: "https://mozilla.org/test/" }, - function () { - addBookmark({ url: "https://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed http://www entry", - "mo", - { autoFilled: "mozilla.org/", completed: "www.mozilla.org/" }, - function () { - addBookmark({ url: "http://www.mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed http://www entry with path", - "mozilla.org/t", - { autoFilled: "mozilla.org/test/", completed: "http://www.mozilla.org/test/" }, - function () { - addBookmark({ url: "http://www.mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed ftp:// entry", - "mo", - { autoFilled: "mozilla.org/", completed: "ftp://mozilla.org/" }, - function () { - addBookmark({ url: "ftp://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Searching for untrimmed ftp:// entry with path", - "mozilla.org/t", - { autoFilled: "mozilla.org/test/", completed: "ftp://mozilla.org/test/" }, - function () { - addBookmark({ url: "ftp://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Ensuring correct priority 1", - "mo", - { autoFilled: "mozilla.org/", completed: "https://www.mozilla.org/" }, - function () { - addBookmark({ url: "https://www.mozilla.org/test/" }); - addBookmark({ url: "https://mozilla.org/test/" }); - addBookmark({ url: "ftp://mozilla.org/test/" }); - addBookmark({ url: "http://www.mozilla.org/test/" }); - addBookmark({ url: "http://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Ensuring correct priority 2", - "mo", - { autoFilled: "mozilla.org/", completed: "https://mozilla.org/" }, - function () { - addBookmark({ url: "https://mozilla.org/test/" }); - addBookmark({ url: "ftp://mozilla.org/test/" }); - addBookmark({ url: "http://www.mozilla.org/test/" }); - addBookmark({ url: "http://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Ensuring correct priority 3", - "mo", - { autoFilled: "mozilla.org/", completed: "ftp://mozilla.org/" }, - function () { - addBookmark({ url: "ftp://mozilla.org/test/" }); - addBookmark({ url: "http://www.mozilla.org/test/" }); - addBookmark({ url: "http://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Ensuring correct priority 4", - "mo", - { autoFilled: "mozilla.org/", completed: "www.mozilla.org/" }, - function () { - addBookmark({ url: "http://www.mozilla.org/test/" }); - addBookmark({ url: "http://mozilla.org/test/" }); - }, -]); - -add_autocomplete_test([ - "Ensuring longer domain can't match", - "mo", - { autoFilled: "mozilla.co/", completed: "mozilla.co/" }, - function () { - // The .co should be preferred, but should not get the https from the .com. - // The .co domain must be added later to activate the trigger bug. - addBookmark({ url: "https://mozilla.com/" }); - addBookmark({ url: "http://mozilla.co/" }); - addBookmark({ url: "http://mozilla.co/" }); - }, -]); diff --git a/toolkit/components/places/tests/inline/xpcshell.ini b/toolkit/components/places/tests/inline/xpcshell.ini index 14c2f7d572d..249f7fc26ef 100644 --- a/toolkit/components/places/tests/inline/xpcshell.ini +++ b/toolkit/components/places/tests/inline/xpcshell.ini @@ -6,6 +6,5 @@ tail = [test_casing.js] [test_do_not_trim.js] [test_keywords.js] -[test_trimming.js] [test_typed.js] [test_zero_frecency.js]