Просмотр исходного кода

Added a test with a NULL string

Benoît Blanchon 11 лет назад
Родитель
Сommit
1c4d4bfd2d

+ 5 - 0
JsonGeneratorTests/StringBuilder.cpp

@@ -25,6 +25,11 @@ void StringBuilder::append(const char* s)
 
 void StringBuilder::appendEscaped(const char* s)
 {
+    if (!s)
+    {
+        return append("null");
+    }
+
     if (length > capacity - 2)
     {
         // not enough from for quotes

+ 9 - 0
JsonGeneratorTests/StringBuilderAppendEscapedTests.cpp

@@ -28,6 +28,12 @@ namespace JsonGeneratorTests
             assertResultIs("\"\"");
         }
 
+        TEST_METHOD(Null)
+        {
+            append(NULL);
+            assertResultIs("null");
+        }
+
         TEST_METHOD(OneString)
         {
             append("ABCD");
@@ -45,6 +51,9 @@ namespace JsonGeneratorTests
         {
             append("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
             assertResultIs("\"ABCDEFGHIJKLMNOPQ\"");
+
+            append("");
+            assertResultIs("\"ABCDEFGHIJKLMNOPQ\"");
         }
         
         TEST_METHOD(SpecialChars)