Merge pull request s9tpepper#1 from newtriks/null_fixes

Null fixes

Author: s9tpepper

.gitignore

@@ -1,4 +1,35 @@
-.project
+#OS X
 .DS_Store
-.settings
+Icon?
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+#Flex/Flash
+
+# Build Dir
+bin/
+bin-release/
+bin-debug/
+out/
+
+# Project property files
+.actionScriptProperties
+.flexProperties
+.settings/
+.project
+
+#IntelliJ IDEA
+*.iml
+*.ipr
+*.iws
+.idea/
 
+#TextMate
+*.tmproj
+*.tmproject
+tmtags

src/ab/fl/utils/json/JSON.as

@@ -382,7 +382,7 @@ package ab.fl.utils.json
 			for each (key in sourceKeys)
 			{
 				value = source[key];
-				if (!value)
+				if (value==null)
 				{
 					target[key] = null;
 					continue;
@@ -393,15 +393,15 @@ package ab.fl.utils.json
 				switch (true)
 				{
 					case (value is String):
-						target[key] =  value;
+                        target[key] = (value.length) ? value : "";
 						break;
 					case (value is Boolean):
-						target[key] = (value !== null) ? value : null;
+                        target[key] = (value !== null) ? value : false;
 						break;
 					case (value is Number):
 					case (value is int):
 					case (value is uint):
-						target[key] = (value) ? value : null;
+                        target[key] = (value !== null) ? value : null;
 						break;
 
 					case (className == "Object"):

src_test/EncodeToTypedTest.as

@@ -0,0 +1,109 @@
+package {
+
+import ab.fl.utils.json.JSON;
+
+import helpers.vo.TypedVO;
+
+import org.flexunit.Assert;
+
+public class EncodeToTypedTest {
+
+    private var strongTypedVO:TypedVO;
+
+    [Before]
+    public function setup():void {
+        strongTypedVO = typedVO;
+        ab.fl.utils.json.JSON.registerClass("TypedVO", TypedVO);
+    }
+
+    [After]
+    public function tearDown():void {
+        strongTypedVO = null;
+    }
+
+    [Test]
+    public function int_value_of_1_should_encode_to_1():void {
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aInt/i) + 6;
+        Assert.assertEquals(1, json.substr(index, 1));
+    }
+
+    [Test]
+    public function int_value_of_0_should_encode_to_0():void {
+        strongTypedVO.aInt = 0;
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aInt/i) + 6;
+        Assert.assertEquals(0, json.substr(index, 1));
+    }
+
+    [Test]
+    public function uint_value_of_1_should_encode_to_1():void {
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aUint/i) + 7;
+        Assert.assertEquals(1, json.substr(index, 1));
+    }
+
+    [Test]
+    public function uint_value_of_0_should_encode_to_0():void {
+        strongTypedVO.aUint = 0;
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aUint/i) + 7;
+        Assert.assertEquals(0, json.substr(index, 1));
+    }
+
+    [Test]
+    public function number_value_of_1_should_encode_to_1():void {
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aNumber/i) + 9;
+        Assert.assertEquals(1, json.substr(index, 1));
+    }
+
+    [Test]
+    public function number_value_of_0_should_encode_to_0():void {
+        strongTypedVO.aNumber = 0;
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aNumber/i) + 9;
+        Assert.assertEquals(0, json.substr(index, 1));
+    }
+
+    [Test]
+    public function string_value_of_a_should_encode_to_a():void {
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aString/i) + 10;
+        Assert.assertEquals("a", json.substr(index, 1));
+    }
+
+    [Test]
+    public function empty_string_value_should_encode_to_empty_string():void {
+        strongTypedVO.aString = "";
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aString/i) + 10;
+        Assert.assertEquals('"', json.substr(index, 1));
+    }
+
+    [Test]
+    public function boolean_value_of_true_should_encode_to_true():void {
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aBoolean/i) + 10;
+        Assert.assertEquals("true", json.substr(index, 4));
+    }
+
+    [Test]
+    public function boolean_value_of_false_should_encode_to_false():void {
+        strongTypedVO.aBoolean = false;
+        var json:String = ab.fl.utils.json.JSON.encodeToTyped(strongTypedVO);
+        var index:int = json.search(/aBoolean/i) + 10;
+        Assert.assertEquals("false", json.substr(index, 5));
+    }
+
+    private function get typedVO():TypedVO {
+        var _typedVO:TypedVO = new TypedVO();
+        _typedVO.aInt = 1;
+        _typedVO.aUint = 1;
+        _typedVO.aNumber = 1;
+        _typedVO.aString = "a";
+        _typedVO.aBoolean = true;
+        return _typedVO;
+    }
+}
+}

src_test/FlexTestSuite.as

@@ -0,0 +1,10 @@
+package
+{
+    [Suite]
+    [RunWith("org.flexunit.runners.Suite")]
+    public class FlexTestSuite
+    {
+        public var simpleTest:SimpleTest;
+        public var encodeToTypedIntTest:EncodeToTypedTest;
+    }
+}

src_test/FlexUnitRunner.as

@@ -28,7 +28,7 @@ package {
 			//You can also pass a Request Object, which allows you to sort, filter and subselect.
 			//var request:Request = Request.methods( someClass, ["method1", "method2", "method3"] ).sortWith( someSorter ).filterWith( someFilter );
 			//core.run( request );
-			core.run(SimpleTest);
+			core.run(FlexTestSuite);
 		}
 	}
 }

src_test/SimpleTest.as

@@ -5,7 +5,7 @@ package {
 
 		[Test]
 		public function testMe() : void {
-			Assert.assertTrue("Was not true", false);
+			Assert.assertTrue("Was not true", true);
 		}
 	}
 }

src_test/helpers/vo/TypedVO.as

@@ -0,0 +1,13 @@
+package helpers.vo
+{
+	[RemoteClass(alias="TypedVO")]
+	public class TypedVO
+	{
+		public var aInt:int;
+		public var aUint:uint;
+		public var aNumber:Number;
+		public var aString:String;
+		public var aBoolean:Boolean;
+		public var _explicitType:String;
+	}
+}