From 33508e3fe046f63ac9420262087c1f5d5467b183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Blanchon?= <benoit.blanchon@gmail.com>
Date: Thu, 26 Jun 2014 13:18:28 +0200
Subject: [PATCH] Minor simplifications

---
 JsonGeneratorTests/JsonArrayTests.cpp | 14 --------------
 JsonGeneratorTests/JsonObjectBase.cpp |  5 +----
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/JsonGeneratorTests/JsonArrayTests.cpp b/JsonGeneratorTests/JsonArrayTests.cpp
index 0199939e..8b25593a 100644
--- a/JsonGeneratorTests/JsonArrayTests.cpp
+++ b/JsonGeneratorTests/JsonArrayTests.cpp
@@ -30,20 +30,6 @@ namespace JsonGeneratorTests
             AssertJsonIs("[\"hello\"]");
         }
 
-        TEST_METHOD(AddOneStringContainingDoubleQuote)
-        {
-            arr.add("\"");
-
-            AssertJsonIs("[\"\\\"\"]");
-        }
-
-        TEST_METHOD(AddOneStringContainingBackslash)
-        {
-            arr.add("\\");
-
-            AssertJsonIs("[\"\\\\\"]");
-        }
-
         TEST_METHOD(AddTwoStrings)
         {
             arr.add("hello");
diff --git a/JsonGeneratorTests/JsonObjectBase.cpp b/JsonGeneratorTests/JsonObjectBase.cpp
index 7387a496..a1805c48 100644
--- a/JsonGeneratorTests/JsonObjectBase.cpp
+++ b/JsonGeneratorTests/JsonObjectBase.cpp
@@ -5,10 +5,7 @@ void JsonObjectBase::writeObjectTo(ObjectContainer& obj, StringBuilder& sb)
     switch (obj.type)
     {
     case JSON_STRING:
-        if (obj.value.string)
-            sb.appendEscaped(obj.value.string);
-        else
-            sb.append("null");
+        sb.appendEscaped(obj.value.string);
         break;
 
     case JSON_NUMBER: