Added unit tests for URL-specific notifications

chrome/content/tests/notification.js

 (function()
 {
   let testRunner = null;
   let randomResult = 0.5;
 
   let originalInfo;
   let info = require("info");
 
   module("Notification handling",
   {
@@ skipping 77 matching lines @@
 
   test("No data", function()
   {
     equal(Notification.getNextToShow(), null, "null should be returned if there is no data");
   });
 
   test("Single notification", function()
   {
     let information = fixConstructors({
       id: 1,
-      severity: "information",
+      type: "information",
       message: {"en-US": "Information"}
     });
 
     registerHandler([information]);
     testRunner.runScheduledTasks(1);
 
     deepEqual(Notification.getNextToShow(), information, "The notification is shown");
     equal(Notification.getNextToShow(), null, "Informational notifications aren't shown more than once");
   });
 
   test("Information and critical", function()
   {
     let information = fixConstructors({
       id: 1,
-      severity: "information",
+      type: "information",
       message: {"en-US": "Information"}
     });
     let critical = fixConstructors({
       id: 2,
-      severity: "critical",
+      type: "critical",
       message: {"en-US": "Critical"}
     });
 
     registerHandler([information, critical]);
     testRunner.runScheduledTasks(1);
 
     deepEqual(Notification.getNextToShow(), critical, "The critical notification is given priority");
     deepEqual(Notification.getNextToShow(), critical, "Critical notifications can be shown multiple times");
   });
 
-  test("No severity", function()
+  test("No type", function()
   {
     let information = fixConstructors({
       id: 1,
       message: {"en-US": "Information"}
     });
 
     registerHandler([information]);
     testRunner.runScheduledTasks(1);
 
     deepEqual(Notification.getNextToShow(), information, "The notification is shown");
-    equal(Notification.getNextToShow(), null, "Notification is treated as severity information");
+    equal(Notification.getNextToShow(), null, "Notification is treated as type information");
   });
 
   test("Target selection", function()
   {
     let targets = [
       ["extension", "adblockpluschrome", true],
       ["extension", "adblockplus", false],
       ["extension", "adblockpluschrome2", false],
       ["extensionMinVersion", "1.4", true],
       ["extensionMinVersion", "1.4.1", true],
@@ skipping 26 matching lines @@
       ["platformMaxVersion", "11", false],
     ];
 
     for each (let [propName, value, result] in targets)
     {
       let targetInfo = {};
       targetInfo[propName] = value;
 
       let information = fixConstructors({
         id: 1,
-        severity: "information",
+        type: "information",
         message: {"en-US": "Information"},
         targets: [targetInfo]
       });
 
       Prefs.notificationdata = {};
       registerHandler([information]);
       testRunner.runScheduledTasks(1);
 
       let expected = (result ? information : null);
       deepEqual(Notification.getNextToShow(), expected, "Selected notification for " + JSON.stringify(information.targets));
       deepEqual(Notification.getNextToShow(), null, "No notification on second call");
     }
 
     function pairs(array)
     {
       for each (let element1 in array)
         for each (let element2 in array)
           yield [element1, element2];
     }
     for (let [[propName1, value1, result1], [propName2, value2, result2]] in pairs(targets))
     {
       let targetInfo1 = {};
       targetInfo1[propName1] = value1;
       let targetInfo2 = {};
       targetInfo2[propName2] = value2;
 
       let information = fixConstructors({
         id: 1,
-        severity: "information",
+        type: "information",
         message: {"en-US": "Information"},
         targets: [targetInfo1, targetInfo2]
       });
 
       Prefs.notificationdata = {};
       registerHandler([information]);
       testRunner.runScheduledTasks(1);
 
       let expected = (result1 || result2 ? information : null)
       deepEqual(Notification.getNextToShow(), expected, "Selected notification for " + JSON.stringify(information.targets));
       deepEqual(Notification.getNextToShow(), null, "No notification on second call");
 
       information = fixConstructors({
         id: 1,
-        severity: "information",
+        type: "information",
         message: {"en-US": "Information"},
         targets: [targetInfo1]
       });
       let critical = fixConstructors({
         id: 2,
-        severity: "critical",
+        type: "critical",
         message: {"en-US": "Critical"},
         targets: [targetInfo2]
       });
 
       Prefs.notificationdata = {};
       registerHandler([information, critical]);
       testRunner.runScheduledTasks(1);
 
       expected = (result2 ? critical : (result1 ? information : null));
       deepEqual(Notification.getNextToShow(), expected, "Selected notification for information with " + JSON.stringify(information.targets) + " and critical with " + JSON.stringify(critical.targets));
@@ skipping 62 matching lines @@
       randomResult = test.randomResult;
 
       let maxHours = Math.round(Math.max.apply(null, test.requests)) + 1;
       testRunner.runScheduledTasks(maxHours, test.skipAfter, test.skip);
 
       let skipAddendum = (typeof test.skip != "number" ? "" : " skipping " + test.skip + " hours after " + test.skipAfter + " hours");
       deepEqual(requests, test.requests, "Requests with Math.random() returning " + randomResult + skipAddendum);
     }
   });
 
+  test("Uses severity instead of type", 3, function()
+  {
+    let severityNotification = {
+      id: 1,
+      severity: "information",
+      message: {"en-US": "Information"}
+    };
+
+    function listener(name)
+    {
+      if (name !== "notificationdata")
+        return;
+
+      Prefs.removeListener(listener);
+      let notification = Prefs.notificationdata.data.notifications[0];
+      ok(!("severity" in notification), "Severity property was removed");
+      ok("type" in notification, "Type property was added");
+      equal(notification.type, severityNotification.severity, "Type property has correct value");
+    }
+    Prefs.addListener(listener);
+
+    let responseText = JSON.stringify({
+      notifications: [severityNotification]
+    });
+    Notification._onDownloadSuccess(null, responseText, function() {}, function() {});
+  });
+
+  test("URL-specific notification", function()
+  {
+    let withURLFilterFoo = fixConstructors({
+      id: 1,
+      urlFilters: ["foo.com"]
+    });
+    let withoutURLFilter = fixConstructors({
+      id: 2
+    });
+    let withURLFilterBar = fixConstructors({
+      id: 3,
+      urlFilters: ["bar.com"]
+    });
+    let subdomainURLFilter = fixConstructors({
+      id: 4,
+      urlFilters: ["||example.com"]
+    });
+
+    registerHandler([
+      withURLFilterFoo,
+      withoutURLFilter,
+      withURLFilterBar,
+      subdomainURLFilter
+    ]);
+    testRunner.runScheduledTasks(1);
+
+    deepEqual(Notification.getNextToShow(), withoutURLFilter, "URL-specific notifications are skipped");
+    deepEqual(Notification.getNextToShow("http://foo.com"), withURLFilterFoo, "URL-specific notification is retrieved");
+    deepEqual(Notification.getNextToShow("http://foo.com"), null, "URL-specific notification is not retrieved");
+    deepEqual(Notification.getNextToShow("http://www.example.com"), subdomainURLFilter, "URL-specific notification matches subdomain");
+  });
+
   module("Notification localization");
 
+  test("Message without localization", function()
+  {
+    let notification = {message: "non-localized"};
+    let texts = Notification.getLocalizedTexts(notification, "en-US");
+    equal(texts.message, "non-localized");
+  });
+
   test("Language only", function()
   {
     let notification = {message: {fr: "fr"}};
     let texts = Notification.getLocalizedTexts(notification, "fr");
     equal(texts.message, "fr");
     texts = Notification.getLocalizedTexts(notification, "fr-CA");
     equal(texts.message, "fr");
   });
 
   test("Language and country", function()
   {
     let notification = {message: {fr: "fr", "fr-CA": "fr-CA"}};
     let texts = Notification.getLocalizedTexts(notification, "fr-CA");
     equal(texts.message, "fr-CA");
     texts = Notification.getLocalizedTexts(notification, "fr");
     equal(texts.message, "fr");
   });
 
   test("Missing translation", function()
   {
     let notification = {message: {"en-US": "en-US"}};
     let texts = Notification.getLocalizedTexts(notification, "fr");
     equal(texts.message, "en-US");
   });
 })();