Benoit Blanchon 11 лет назад
Родитель
Сommit
48018bd6e6

+ 1 - 1
JsonGenerator/IndentedPrint.h

@@ -19,7 +19,7 @@ namespace ArduinoJson
                 : sink(p)
             {
                 level = 0;
-                tabSize = 1;
+                tabSize = 2;
                 isNewLine = true;
             }
 

+ 13 - 13
JsonGeneratorTests/PrettyPrint_Array_Tests.cpp

@@ -31,7 +31,7 @@ namespace JsonGeneratorTests
             whenInputIs("[1]");
             outputMustBe(
                 "[\r\n"
-                " 1\r\n"
+                "  1\r\n"
                 "]");
         }
 
@@ -40,8 +40,8 @@ namespace JsonGeneratorTests
             whenInputIs("[1,2]");
             outputMustBe(
                 "[\r\n"
-                " 1,\r\n"
-                " 2\r\n"
+                "  1,\r\n"
+                "  2\r\n"
                 "]");
         }
 
@@ -50,8 +50,8 @@ namespace JsonGeneratorTests
             whenInputIs("[[],[]]");
             outputMustBe(
                 "[\r\n"
-                " [],\r\n"
-                " []\r\n"
+                "  [],\r\n"
+                "  []\r\n"
                 "]");
         }
 
@@ -60,14 +60,14 @@ namespace JsonGeneratorTests
             whenInputIs("[[1,2],[3,4]]");
             outputMustBe(
                 "[\r\n"
-                " [\r\n"
-                "  1,\r\n"
-                "  2\r\n"
-                " ],\r\n"
-                " [\r\n"
-                "  3,\r\n"
-                "  4\r\n"
-                " ]\r\n"
+                "  [\r\n"
+                "    1,\r\n"
+                "    2\r\n"
+                "  ],\r\n"
+                "  [\r\n"
+                "    3,\r\n"
+                "    4\r\n"
+                "  ]\r\n"
                 "]");
         }
 

+ 11 - 11
JsonGeneratorTests/PrettyPrint_Object_Tests.cpp

@@ -31,7 +31,7 @@ namespace JsonGeneratorTests
             whenInputIs("{\"key\":\"value\"}");
             outputMustBe(
                 "{\r\n"
-                " \"key\": \"value\"\r\n"
+                "  \"key\": \"value\"\r\n"
                 "}");
         }
 
@@ -40,8 +40,8 @@ namespace JsonGeneratorTests
             whenInputIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
             outputMustBe(
                 "{\r\n"
-                " \"key1\": \"value1\",\r\n"
-                " \"key2\": \"value2\"\r\n"
+                "  \"key1\": \"value1\",\r\n"
+                "  \"key2\": \"value2\"\r\n"
                 "}");
         }
 
@@ -50,8 +50,8 @@ namespace JsonGeneratorTests
             whenInputIs("{\"key1\":{},\"key2\":{}}");
             outputMustBe(
                 "{\r\n"
-                " \"key1\": {},\r\n"
-                " \"key2\": {}\r\n"
+                "  \"key1\": {},\r\n"
+                "  \"key2\": {}\r\n"
                 "}");
         }
 
@@ -60,12 +60,12 @@ namespace JsonGeneratorTests
             whenInputIs("{\"key1\":{\"a\":1},\"key2\":{\"b\":2}}");
             outputMustBe(
                 "{\r\n"
-                " \"key1\": {\r\n"
-                "  \"a\": 1\r\n"
-                " },\r\n"
-                " \"key2\": {\r\n"
-                "  \"b\": 2\r\n"
-                " }\r\n"
+                "  \"key1\": {\r\n"
+                "    \"a\": 1\r\n"
+                "  },\r\n"
+                "  \"key2\": {\r\n"
+                "    \"b\": 2\r\n"
+                "  }\r\n"
                 "}");
         }