b=421005, r=gavin, a=damons. FUEL Preference.type uses undefined variables

browser/fuel/src/fuelApplication.js

@@ -302,7 +302,7 @@ Preference.prototype = {
 
   get type() {
     var value = "";
-    var type = this._prefs.getPrefType(name);
+    var type = this.branch._prefs.getPrefType(this._name);
 
     switch (type) {
       case Ci.nsIPrefBranch2.PREF_STRING:

browser/fuel/test/browser_ApplicationPrefs.js

@@ -11,9 +11,9 @@ function test() {
   // test getting non-existing values
   var itemValue = Application.prefs.getValue(testdata.missing, "default");
   is(itemValue, "default", "Check 'Application.prefs.getValue' for non-existing item");
-  
+
   is(Application.prefs.get(testdata.missing), null, "Check 'Application.prefs.get' for non-existing item");
-  
+
   // test setting and getting a value
   Application.prefs.setValue(testdata.dummy, "dummy");
   itemValue = Application.prefs.getValue(testdata.dummy, "default");
@@ -23,7 +23,7 @@ function test() {
   Application.prefs.setValue(testdata.dummy, "smarty");
   itemValue = Application.prefs.getValue(testdata.dummy, "default");
   is(itemValue, "smarty", "Check 'Application.prefs.getValue' for overwritten item");
-  
+
   // test setting and getting a value
   Application.prefs.get(testdata.dummy).value = "dummy2";
   itemValue = Application.prefs.get(testdata.dummy).value;
@@ -31,44 +31,48 @@ function test() {
 
   // test resetting a pref [since there is no default value, the pref should disappear]
   Application.prefs.get(testdata.dummy).reset();
-  var itemValue = Application.prefs.getValue(testdata.dummy, "default");
+  itemValue = Application.prefs.getValue(testdata.dummy, "default");
   is(itemValue, "default", "Check 'Application.prefs.getValue' for reset pref");
-  
+
   // test to see if a non-existant property exists
   ok(!Application.prefs.has(testdata.dummy), "Check non-existant property for existance");
-  
+
   // PREF: string browser.active_color == #EE0000
-  
+
   // test to see if an existing string property exists
   ok(Application.prefs.has(testdata.string), "Check existing string property for existance");
-  
+
   // test accessing a non-existant string property
   var val = Application.prefs.getValue(testdata.dummy, "default");
   is(val, "default", "Check non-existant string property for expected value");
-  
+
   // test accessing an existing string property
   var val = Application.prefs.getValue(testdata.string, "default");
   is(val, "#EE0000", "Check existing string property for expected value");
-  
+
   // test manipulating an existing string property
   Application.prefs.setValue(testdata.string, "#EF0000");
   var val = Application.prefs.getValue(testdata.string, "default");
   is(val, "#EF0000", "Set existing string property");
-  
+
+  // test getting the type of an existing string property
+  var type = Application.prefs.get(testdata.string).type;
+  is(type, "String", "Check 'Application.prefs.get().type' for string pref");
+
   // test resetting an existing string property
   Application.prefs.get(testdata.string).reset();
   var val = Application.prefs.getValue(testdata.string, "default");
   is(val, "#EE0000", "Reset existing string property");
-  
+
   // PREF: integer permissions.default.image == 1
-  
+
   // test to see if an existing integer property exists
   ok(Application.prefs.has(testdata.integer), "Check existing integer property for existance");
-  
+
   // test accessing a non-existant integer property
   var val = Application.prefs.getValue(testdata.dummy, 0);
   is(val, 0, "Check non-existant integer property for expected value");
-  
+
   // test accessing an existing integer property
   var val = Application.prefs.getValue(testdata.integer, 0);
   is(val, 1, "Check existing integer property for expected value");
@@ -77,35 +81,43 @@ function test() {
   Application.prefs.setValue(testdata.integer, 0);
   var val = Application.prefs.getValue(testdata.integer, 1);
   is(val, 0, "Set existing integer property");
-  
+
+  // test getting the type of an existing integer property
+  var type = Application.prefs.get(testdata.integer).type;
+  is(type, "Number", "Check 'Application.prefs.get().type' for integer pref");
+
   // test resetting an existing integer property
   Application.prefs.get(testdata.integer).reset();
   var val = Application.prefs.getValue(testdata.integer, 0);
   is(val, 1, "Reset existing integer property");
 
   // PREF: boolean browser.blink_allowed == true
-  
+
   // test to see if an existing boolean property exists
   ok(Application.prefs.has(testdata.boolean), "Check existing boolean property for existance");
-  
+
   // test accessing a non-existant boolean property
   var val = Application.prefs.getValue(testdata.dummy, true);
   ok(val, "Check non-existant boolean property for expected value");
-  
+
   // test accessing an existing boolean property
   var val = Application.prefs.getValue(testdata.boolean, false);
   ok(val, "Check existing boolean property for expected value");
-  
+
   // test manipulating an existing boolean property
   Application.prefs.setValue(testdata.boolean, false);
   var val = Application.prefs.getValue(testdata.boolean, true);
   ok(!val, "Set existing boolean property");
-  
+
+  // test getting the type of an existing boolean property
+  var type = Application.prefs.get(testdata.boolean).type;
+  is(type, "Boolean", "Check 'Application.prefs.get().type' for boolean pref");
+
   // test resetting an existing boolean property
   Application.prefs.get(testdata.boolean).reset();
   var val = Application.prefs.getValue(testdata.boolean, false);
   ok(val, "Reset existing string property for expected value");
-  
+
   // test getting all preferences
   var allPrefs = Application.prefs.all;
   ok(allPrefs.length >= 800, "Check 'Application.prefs.all' for the right number of preferences");
@@ -113,29 +125,29 @@ function test() {
 
   // test the value of the preference root
   is(Application.prefs.root, "", "Check the Application preference root");
-  
+
   // test for user changed preferences
   ok(Application.prefs.get("browser.shell.checkDefaultBrowser").modified, "A single preference is marked as modified.");
   ok(!Application.prefs.get(testdata.string).modified, "A single preference is marked as not modified.");
-  
+
   // test for a locked preference
   var pref = Application.prefs.get(testdata.string);
   ok(!pref.locked, "A single preference should not be locked.");
-  
+
   pref.locked = true;
   ok(pref.locked, "A single preference should be locked.");
-  
+
   try {
     prev.value = "test value";
-    
+
     ok(false, "A locked preference should not be able to be modified.");
   } catch(e){
     ok(true, "A locked preference should not be able to be modified.");
   }
-  
+
   pref.locked = false;
   ok(!pref.locked, "A single preference should not be locked.");
-  
+
   // check for change event when setting a value
   waitForExplicitFinish();
   Application.prefs.events.addListener("change", onPrefChange);
@@ -153,6 +165,6 @@ function onPrefChange(evt) {
 function onPrefChange2(evt) {
   is(evt.data, testdata.dummy, "Check 'Application.prefs.set' fired a change event for a single preference");
   Application.prefs.events.removeListener("change", onPrefChange2);
-  
+
   finish();
 }