Changeset 8038

Timestamp:

04/10/07 18:18:32 (21 months ago)

Author:

peller

Message:

Port unit tests for number and currency. Refs #2719

Location:

dojo/trunk

Files:

• currency.js (modified) (1 diff)
• string.js (modified) (2 diffs)
• tests/currency.js (added)
• tests/number.js (added)
• tests/_base.js (modified) (1 diff)

dojo/trunk/currency.js

@@ -16 +16 @@
         var iso = options.currency;
         var data = dojo.cldr.monetary.getData(iso);
-        dojo.lang.mixin(data, bundle[iso] || {});
+        dojo.mixin(data, bundle[iso] || {});
 
         // Mixin with provided options
-        return dojo.lang.mixin(data, options);
+        return dojo.mixin(data, options);
 }
 

dojo/trunk/string.js

@@ -1 +1 @@
 dojo.provide("dojo.string");
 
-dojo.string.pad = function(/*String*/text, /*int*/size, /*String?*/ch, /*boolean?*/end) {
+dojo.string.pad = function(/*String*/text, /*int*/size, /*String?*/ch, /*boolean?*/end){
         // summary:
         //      Pad a string to guarantee that it is at least 'size' length by filling with the character 'c' at either the 
@@ -11 +11 @@
 
         var out = String(text);
-        if(!ch) {
+        if(!ch){
                 ch = '0';
         }
-        while(out.length < size) {
-                if(!dir) {
+        while(out.length < size){
+                if(end){
+                        out += ch;
+                }else{
                         out = ch + out;
-                } else {
-                        out += ch;
                 }
         }

dojo/trunk/tests/_base.js

@@ -122 +122 @@
         dojo.require("tests._base.Deferred");
         dojo.require("tests._base.json");
-        dojo.require("tests._base.xhr");
         // FIXME: add test includes for the rest of the Dojo Base groups here
-        dojo.require("tests.i18n"); //FIXME does not belong here in _base
-        dojo.require("tests.data"); //FIXME does not belong here in _base
         dojo.requireIf(dojo.isBrowser, "tests._base.html");
         dojo.requireIf(dojo.isBrowser, "tests._base.fx");
         dojo.requireIf(dojo.isBrowser, "tests._base.query");
         dojo.requireIf(dojo.isBrowser, "tests._base.xhr");
+
+//FIXME the following do not belong here in _base.js - create a separate module?
+        dojo.require("tests.i18n"); 
+        dojo.require("tests.data");
+        dojo.require("tests.number");
+        dojo.require("tests.currency");
 }catch(e){
         tests.debug(e);