From 2a20c5a25c556b047ab2bd8a830c18987e778b11 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Tue, 24 Jun 2014 21:24:38 +0200
Subject: [PATCH] Added a tests that adds a 'null' to an array

---
 JsonGeneratorTests/JsonArray.h        | 11 ++++++++---
 JsonGeneratorTests/JsonArrayTests.cpp |  7 +++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/JsonGeneratorTests/JsonArray.h b/JsonGeneratorTests/JsonArray.h
index 9b86d980..06ba5040 100644
--- a/JsonGeneratorTests/JsonArray.h
+++ b/JsonGeneratorTests/JsonArray.h
@@ -76,18 +76,23 @@ public:
             if (i>0)
                 append(buffer, bufferSize, ",");
 
+            JsonObjectValue value = items[i].value;
+
             switch (items[i].type)
             {
             case JSON_STRING:
-                append(buffer, bufferSize, "'%s'", items[i].value.string);
+                if (value.string)
+                    append(buffer, bufferSize, "'%s'", value.string);
+                else
+                    append(buffer, bufferSize, "null");
                 break;
 
             case JSON_NUMBER:
-                append(buffer, bufferSize, "%lg", items[i].value.number);
+                append(buffer, bufferSize, "%lg", value.number);
                 break;
 
             case JSON_BOOLEAN:
-                append(buffer, bufferSize, items[i].value.boolean ? "true" : "false");
+                append(buffer, bufferSize, value.boolean ? "true" : "false");
                 break;
             }
         }
diff --git a/JsonGeneratorTests/JsonArrayTests.cpp b/JsonGeneratorTests/JsonArrayTests.cpp
index 58c366dd..2cb8f553 100644
--- a/JsonGeneratorTests/JsonArrayTests.cpp
+++ b/JsonGeneratorTests/JsonArrayTests.cpp
@@ -16,6 +16,13 @@ namespace JsonGeneratorTests
             AssertJsonIs("[]");
         }
 
+        TEST_METHOD(AddNull)
+        {
+            arr.add((char*)0);
+
+            AssertJsonIs("[null]");
+        }
+
         TEST_METHOD(AddOneString)
         {
             arr.add("hello");