Notifications: implemented better target checks - unit tests

chrome/content/tests/notification.js

 (function()
 {
   let testRunner = null;
   let server = null;
   let randomResult = 0.5;
 
   let originalInfo;
   let info = require("info");
 
-  module("Notification",
+  module("Notification handling",
   {
     setup: function()
     {
       testRunner = this;
 
       preparePrefs.call(this);
       setupVirtualTime.call(this, function(wrapTimer)
       {
         let NotificationModule = getModuleGlobal("notification");
         NotificationModule.downloader._timer = wrapTimer(NotificationModule.downloader._timer);
@@ skipping 78 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",
-      message: {en: "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",
-      message: {en: "Information"}
+      message: {"en-US": "Information"}
     });
     let critical = fixConstructors({
       id: 2,
       severity: "critical",
-      message: {en: "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()
   {
     let information = fixConstructors({
       id: 1,
-      message: {en: "Information"}
+      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");
   });
 
   test("Target selection", function()
@@ skipping 34 matching lines @@
     ];
 
     for each (let [propName, value, result] in targets)
     {
       let targetInfo = {};
       targetInfo[propName] = value;
 
       let information = fixConstructors({
         id: 1,
         severity: "information",
-        message: {en: "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 allPairs(array)
-    {
-      var pairs = [];

[Felix Dahlke, 2013/07/25 10:22:04]

Why not use let here and below?

[Wladimir Palant, 2013/07/25 10:58:07]

Because that's copy&paste from your code in Chrome's unit tests :)
Not really worth changing IMHO?

-      for (var i = 0; i < array.length - 1; i++)
-        for (var j = i + 1; j < array.length; j++)
-          pairs.push([array[i], array[j]]);
-      return pairs;
-    }
-    for each (let [[propName1, value1, result1], [propName2, value2, result2]] in allPairs(targets))
+    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",
-        message: {en: "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",
-        message: {en: "Information"},
+        message: {"en-US": "Information"},
         targets: [targetInfo1]
       });
       let critical = fixConstructors({
         id: 2,
         severity: "critical",
-        message: {en: "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));
     }
   });
+
+  module("Notification localization");
+
+  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");
+  });
 })();