Merge pull request #76 from hdgarrood/fix-show-number-again

Fix show number again

Author: garyb

.travis.yml

@@ -12,7 +12,7 @@ install:
   - npm install -g bower
   - npm install
 script:
-  - npm run build
+  - npm run build && npm test
 after_success:
 - >-
   test $TRAVIS_TAG &&

package.json

@@ -3,7 +3,8 @@
   "scripts": {
     "postinstall": "pulp dep install",
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && pulp build"
+    "build": "jshint src && jscs src && pulp build",
+    "test": "pulp test"
   },
   "devDependencies": {
     "jscs": "^2.8.0",

src/Data/Show.js

@@ -8,9 +8,7 @@ exports.showIntImpl = function (n) {
 
 exports.showNumberImpl = function (n) {
   var str = n.toString();
-  return str.indexOf("e") === -1 && str.indexOf(".") === -1 ?
-            str + ".0" :
-            str;
+  return isNaN(str + ".0") ? str : str + ".0";
 };
 
 exports.showCharImpl = function (c) {

test/Test/Main.js

@@ -0,0 +1,47 @@
+"use strict";
+
+// module Test.Main
+
+exports.mainImpl = function(showNumber) {
+  return function() {
+    function testAll(cases) {
+      cases.forEach(function(c) {
+        var expected = c[1];
+        var actual = showNumber(c[0]);
+        if (expected !== actual) {
+          throw new Error(
+            "For " + c[0] +
+            ", expected " + expected +
+            ", got: " + actual + ".");
+        }
+      });
+    }
+
+    testAll([
+        // Within Int range
+        [0.0, "0.0"],
+        [1.0, "1.0"],
+        [-1.0, "-1.0"],
+        [500.0, "500.0"],
+
+        // Outside Int range
+        [1e10, "10000000000.0"],
+        [1e10 + 0.5, "10000000000.5"],
+        [-1e10, "-10000000000.0"],
+        [-1e10 - 0.5, "-10000000000.5"],
+
+        // With exponent
+        [1e21, "1e+21"],
+        [1e-21, "1e-21"],
+
+        // With decimal and exponent
+        [1.5e21, "1.5e+21"],
+        [1.5e-10, "1.5e-10"],
+
+        [NaN, "NaN"],
+        [Infinity, "Infinity"],
+        [-Infinity, "-Infinity"],
+      ]);
+  };
+};
+

test/Test/Main.purs

@@ -0,0 +1,10 @@
+module Test.Main where
+
+import Prelude
+
+type AlmostEff = Unit -> Unit
+
+main :: AlmostEff
+main = mainImpl show
+
+foreign import mainImpl :: (Number -> String) -> AlmostEff