From 6812b5ed7a56f7e27b44508b2e52cf97a27b3255 Mon Sep 17 00:00:00 2001
From: "edward.lee@engineering.uiuc.edu" <none@none>
Date: Wed, 12 Mar 2008 16:39:52 -0700
Subject: [PATCH] Bug 417441 - Bookmark cannot handle %2B ('+' sign) when
 accessed by its tag. b-ff3=beltzner

---
 toolkit/components/places/tests/unit/test_416214.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/places/tests/unit/test_416214.js b/toolkit/components/places/tests/unit/test_416214.js
index d1f4767a977..8d2706cab0c 100644
--- a/toolkit/components/places/tests/unit/test_416214.js
+++ b/toolkit/components/places/tests/unit/test_416214.js
@@ -1,4 +1,3 @@
-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 *****
@@ -41,6 +40,8 @@ version(180);
 /*
 
 Test autocomplete for non-English URLs that match the tag bug 416214
+Also test bug 417441 by making sure escaped ascii characters like "+" remain
+escaped.
 
 - add a visit for a page with a non-English URL
 - add a tag for the page
@@ -73,7 +74,7 @@ function add_visit(aURI, aVisitDate, aVisitType) {
 // create test data
 var searchTerm = "ユニコード";
 var theTag = "superTag";
-var decoded = "http://www.foobar.com/" + searchTerm + "/";
+var decoded = "http://www.foobar.com/" + searchTerm + "/blocking-firefox3%2B";
 var url = uri(decoded);
 add_visit(url, Date.now(), Ci.nsINavHistoryService.TRANSITION_LINK);
 tagssvc.tagURI(url, [theTag]);
@@ -158,8 +159,8 @@ 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);
+    // Make sure the url is the one with the decoded search string
+    do_check_eq(controller.getValueAt(0), url.spec);
 
     do_test_finished();
   };