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

Set line ending to CR LF, like in Arduino source code

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

+ 1 - 1
JsonGenerator/Print.cpp

@@ -34,7 +34,7 @@ size_t Print::print(long value)
 
 size_t Print::println()
 {
-    return /*write('\r') +*/ write('\n');
+    return write('\r') + write('\n');
 }
 
 #endif

+ 17 - 17
JsonGeneratorTests/PrettyPrint_Array_Tests.cpp

@@ -30,8 +30,8 @@ namespace JsonGeneratorTests
         {
             whenInputIs("[1]");
             outputMustBe(
-                "[\n"
-                " 1\n"
+                "[\r\n"
+                " 1\r\n"
                 "]");
         }
 
@@ -39,9 +39,9 @@ namespace JsonGeneratorTests
         {
             whenInputIs("[1,2]");
             outputMustBe(
-                "[\n"
-                " 1,\n"
-                " 2\n"
+                "[\r\n"
+                " 1,\r\n"
+                " 2\r\n"
                 "]");
         }
 
@@ -49,9 +49,9 @@ namespace JsonGeneratorTests
         {
             whenInputIs("[[],[]]");
             outputMustBe(
-                "[\n"
-                " [],\n"
-                " []\n"
+                "[\r\n"
+                " [],\r\n"
+                " []\r\n"
                 "]");
         }
 
@@ -59,15 +59,15 @@ namespace JsonGeneratorTests
         {
             whenInputIs("[[1,2],[3,4]]");
             outputMustBe(
-                "[\n"
-                " [\n"
-                "  1,\n"
-                "  2\n"
-                " ],\n"
-                " [\n"
-                "  3,\n"
-                "  4\n"
-                " ]\n"
+                "[\r\n"
+                " [\r\n"
+                "  1,\r\n"
+                "  2\r\n"
+                " ],\r\n"
+                " [\r\n"
+                "  3,\r\n"
+                "  4\r\n"
+                " ]\r\n"
                 "]");
         }
 

+ 15 - 15
JsonGeneratorTests/PrettyPrint_Object_Tests.cpp

@@ -30,8 +30,8 @@ namespace JsonGeneratorTests
         {
             whenInputIs("{\"key\":\"value\"}");
             outputMustBe(
-                "{\n"
-                " \"key\": \"value\"\n"
+                "{\r\n"
+                " \"key\": \"value\"\r\n"
                 "}");
         }
 
@@ -39,9 +39,9 @@ namespace JsonGeneratorTests
         {
             whenInputIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
             outputMustBe(
-                "{\n"
-                " \"key1\": \"value1\",\n"
-                " \"key2\": \"value2\"\n"
+                "{\r\n"
+                " \"key1\": \"value1\",\r\n"
+                " \"key2\": \"value2\"\r\n"
                 "}");
         }
 
@@ -49,9 +49,9 @@ namespace JsonGeneratorTests
         {
             whenInputIs("{\"key1\":{},\"key2\":{}}");
             outputMustBe(
-                "{\n"
-                " \"key1\": {},\n"
-                " \"key2\": {}\n"
+                "{\r\n"
+                " \"key1\": {},\r\n"
+                " \"key2\": {}\r\n"
                 "}");
         }
 
@@ -59,13 +59,13 @@ namespace JsonGeneratorTests
         {
             whenInputIs("{\"key1\":{\"a\":1},\"key2\":{\"b\":2}}");
             outputMustBe(
-                "{\n"
-                " \"key1\": {\n"
-                "  \"a\": 1\n"
-                " },\n"
-                " \"key2\": {\n"
-                "  \"b\": 2\n"
-                " }\n"
+                "{\r\n"
+                " \"key1\": {\r\n"
+                "  \"a\": 1\r\n"
+                " },\r\n"
+                " \"key2\": {\r\n"
+                "  \"b\": 2\r\n"
+                " }\r\n"
                 "}");
         }