Changeset 1905

Timestamp:

2011-05-24 11:37:20 (12 months ago)

Author:

mpo

Message:

Fixing numeric formatter for negative values

And added some tests to verify in future.
Also modified the tests to run in chrome where thousand-separator is empty.

Location:

trunk/modules

Files:

• kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js (modified) (1 diff)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js (modified) (4 diffs)
• kauri-jquery/src/test/kauri.util/test-uritemplate.js (modified) (1 diff)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js

@@ -83 +83 @@
                     var thousandSep = $.getThousandSeparator();
                     var decimalSep = $.getDecimalSeparator();
-                    var regex = new RegExp("^([0-9]{1,3}("+thousandSep+"[0-9]{3})*(\\"+decimalSep+"[0-9]+)?|\\"+decimalSep+"[0-9]+)$");
-
+                    var regex = new RegExp("^(-\s?)?([0-9]{1,3}("+thousandSep+"[0-9]{3})*(\\"+decimalSep+"[0-9]+)?|\\"+decimalSep+"[0-9]+)$");
+                    
                     var match = regex.exec(valstr);
                     if(match && match.length > 0){

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js

@@ -48 +48 @@
 test("Numeric format test.", function() {
 
-    expect(9);
+    expect(17);
 
     var f = getFormatter("numeric");
@@ -59 +59 @@
     assertFail(f, "parse", "abc");
     
+    f.decimal = false;
+    assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", new Number(1001));
+    assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", new Number(-1001));
+    assertConvert(f, "format", new Number(1001), "1" + $.getThousandSeparator() + "001");
+    assertConvert(f, "format", new Number(-1001), "-1" + $.getThousandSeparator() + "001");
+    
+    
     // special tests for asIs mode (wire formatting)
     f.asIs = true;
@@ -65 +72 @@
     assertConvert(f, "format", new Number(9999.9), new Number(9999.9));
     assertFail(f, "format", "abc");
+    
+    assertConvert(f, "parse", "1" + $.getThousandSeparator() + "001", new Number(1001));
+    assertConvert(f, "parse", "-1" + $.getThousandSeparator() + "001", new Number(-1001));
+    assertConvert(f, "format", new Number(1001), 1001);
+    assertConvert(f, "format", new Number(-1001), -1001);
     
 });
@@ -120 +132 @@
         var res = f[unc](input);
         ok((out == undefined && res == undefined) || (res.constructor == out.constructor && res.valueOf() == out.valueOf()),
-                "Formatter: " + f['org.kauriproject.registry-name'] + " conversion " + input + "->" + res);
+                "Formatter("+unc+"): " + f['org.kauriproject.registry-name'] + " conversion " + input + "->" + res);
     } catch (e) {
-        ok(false, "Formatter: " + f['org.kauriproject.registry-name'] + " conversion failed " + input + "->" + out);
+        ok(false, "Formatter("+unc+"): " + f['org.kauriproject.registry-name'] + " conversion exception on " + input + "->" + out + " // " + e);
     }
 }

trunk/modules/kauri-jquery/src/test/kauri.util/test-uritemplate.js

@@ -298 +298 @@
         var expected = set[pattern];
 
-        equals(res, expected, "tested pattern: " + pattern);
+        equal(res, expected, "tested pattern: " + pattern);
     }
 }