Windows friendly

http://codereview.appspot.com/6245074/
renovate-bot · May 31, 2012 · 0ffc1a8 · 0ffc1a8
1 parent 2c515bc
commit 0ffc1a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -34,7 +34,9 @@ page at http://checkstyle.sourceforge.net/config.html -->
     -->
   </module>
 
-  <module name="NewlineAtEndOfFile"/>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
 
   <module name="RegexpSingleline">
     <!-- Checks that FIXME is not used in comments.  TODO is preferred.

diff --git a/google-http-client/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java b/google-http-client/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java
@@ -16,7 +16,6 @@
 
 import com.google.api.client.json.AbstractJsonFactoryTest;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.util.StringUtils;
 
 import java.util.ArrayList;
 
@@ -27,13 +26,15 @@
  */
 public class GsonFactoryTest extends AbstractJsonFactoryTest {
 
+  private static final String GSON_LINE_SEPARATOR = "\n";
+
   private static final String JSON_ENTRY_PRETTY =
-      "{" + StringUtils.LINE_SEPARATOR + "  \"title\": \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
-  private static final String JSON_FEED_PRETTY = "{" + StringUtils.LINE_SEPARATOR + "  \"entries\": ["
-      + StringUtils.LINE_SEPARATOR + "    {" + StringUtils.LINE_SEPARATOR + "      \"title\": \"foo\""
-      + StringUtils.LINE_SEPARATOR + "    }," + StringUtils.LINE_SEPARATOR + "    {"
-      + StringUtils.LINE_SEPARATOR + "      \"title\": \"bar\"" + StringUtils.LINE_SEPARATOR + "    }"
-      + StringUtils.LINE_SEPARATOR + "  ]" + StringUtils.LINE_SEPARATOR + "}";
+      "{" + GSON_LINE_SEPARATOR + "  \"title\": \"foo\"" + GSON_LINE_SEPARATOR + "}";
+  private static final String JSON_FEED_PRETTY = "{" + GSON_LINE_SEPARATOR + "  \"entries\": ["
+      + GSON_LINE_SEPARATOR + "    {" + GSON_LINE_SEPARATOR + "      \"title\": \"foo\""
+      + GSON_LINE_SEPARATOR + "    }," + GSON_LINE_SEPARATOR + "    {"
+      + GSON_LINE_SEPARATOR + "      \"title\": \"bar\"" + GSON_LINE_SEPARATOR + "    }"
+      + GSON_LINE_SEPARATOR + "  ]" + GSON_LINE_SEPARATOR + "}";
 
   public GsonFactoryTest(String name) {
     super(name);