Bug 416214 - Tag matches in location bar autocomplete don't decode URLs

toolkit/components/places/tests/unit/test_413784.js

@@ -63,7 +63,8 @@ function add_visit(aURI, aVisitDate, aVisitType) {
 
 // create test data
 var searchTerm = "ユニコード";
-var url = uri("http://www.foobar.com/" + searchTerm + "/");
+var decoded = "http://www.foobar.com/" + searchTerm + "/";
+var url = uri(decoded);
 add_visit(url, Date.now(), Ci.nsINavHistoryService.TRANSITION_LINK);
 
 function AutoCompleteInput(aSearches) {
@@ -138,6 +139,9 @@ function run_test() {
     // test that we found the entry we added
     do_check_eq(controller.matchCount, 1);
 
+    // Make sure the url is decoded
+    do_check_eq(controller.getValueAt(0), decoded);
+
     do_test_finished();
   };
 

toolkit/components/places/tests/unit/test_416214.js

@@ -0,0 +1,160 @@
+version(180);
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Bug 378079 unit test code.
+ *
+ * The Initial Developer of the Original Code is POTI Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Erwan Loisant <eloisant@gmail.com>
+ *   Edward Lee <edward.lee@engineering.uiuc.edu>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+
+Test autocomplete for non-English URLs that match the tag bug 416214
+
+- add a visit for a page with a non-English URL
+- add a tag for the page
+- search for the tag
+- test number of matches (should be exactly one)
+- make sure the url is decoded
+
+*/
+
+try {
+  var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
+                getService(Ci.nsINavHistoryService);
+  var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
+              getService(Ci.nsINavBookmarksService);
+  var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
+                getService(Ci.nsITaggingService);
+} catch (ex) {
+  do_throw("Could not get services\n");
+}
+
+function add_visit(aURI, aVisitDate, aVisitType) {
+  var isRedirect = aVisitType == histsvc.TRANSITION_REDIRECT_PERMANENT ||
+                   aVisitType == histsvc.TRANSITION_REDIRECT_TEMPORARY;
+  var placeID = histsvc.addVisit(aURI, aVisitDate, null,
+                                 aVisitType, isRedirect, 0);
+  do_check_true(placeID > 0);
+  return placeID;
+}
+
+// create test data
+var searchTerm = "ユニコード";
+var theTag = "superTag";
+var decoded = "http://www.foobar.com/" + searchTerm + "/";
+var url = uri(decoded);
+add_visit(url, Date.now(), Ci.nsINavHistoryService.TRANSITION_LINK);
+tagssvc.tagURI(url, [theTag]);
+
+function AutoCompleteInput(aSearches) {
+  this.searches = aSearches;
+}
+
+AutoCompleteInput.prototype = {
+  constructor: AutoCompleteInput, 
+
+  searches: null,
+
+  minResultsForPopup: 0,
+  timeout: 10,
+  searchParam: "",
+  textValue: "",
+  disableAutoComplete: false,  
+  completeDefaultIndex: false,
+
+  get searchCount() {
+    return this.searches.length;
+  },
+
+  getSearchAt: function(aIndex) {
+    return this.searches[aIndex];
+  },
+
+  onSearchComplete: function() {},
+
+  popupOpen: false,
+
+  popup: {
+    setSelectedIndex: function(aIndex) {},
+    invalidate: function() {},
+
+    // nsISupports implementation
+    QueryInterface: function(iid) {
+      if (iid.equals(Ci.nsISupports) ||
+          iid.equals(Ci.nsIAutoCompletePopup))
+        return this;
+
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+  },
+
+  // nsISupports implementation
+  QueryInterface: function(iid) {
+    if (iid.equals(Ci.nsISupports) ||
+        iid.equals(Ci.nsIAutoCompleteInput))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+function run_test() {
+  var controller = Components.classes["@mozilla.org/autocomplete/controller;1"].
+                   getService(Components.interfaces.nsIAutoCompleteController);
+
+  // Make an AutoCompleteInput that uses our searches
+  // and confirms results on search complete
+  var input = new AutoCompleteInput(["history"]);
+
+  controller.input = input;
+
+  // Search is asynchronous, so don't let the test finish immediately
+  do_test_pending();
+
+  input.onSearchComplete = function() {
+    do_check_eq(controller.searchStatus,
+                Ci.nsIAutoCompleteController.STATUS_COMPLETE_MATCH);
+
+    // test that we found the entry we added
+    do_check_eq(controller.matchCount, 1);
+
+    // Make sure the url is decoded
+    do_check_eq(controller.getValueAt(0), decoded);
+
+    do_test_finished();
+  };
+
+  controller.startSearch(theTag);
+}