Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java

Issue 11638015: Fix 2 failing tests on windows. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java (revision 16302)
+++ editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java (working copy)
@@ -306,7 +306,7 @@
assertQueuedTasks(server);
StringWriter writer = new StringWriter(5000);
writeCache(writer);
- Assert.assertEquals(EMPTY_CACHE_CONTENT, writer.toString());
+ Assert.assertEquals(EMPTY_CACHE_CONTENT, normalizeEols(writer.toString()));
}
public void test_write_read_1() throws Exception {
@@ -518,6 +518,14 @@
listener = new Listener(server);
}
+ private Object normalizeEols(String str) {
+ if (str == null) {
+ return null;
+ } else {
+ return str.replaceAll("\r\n", "\n");
+ }
+ }
+
private void readCache(Reader reeader) throws Exception {
// server.readCache(cacheFile)
Method method = server.getClass().getDeclaredMethod("readCache", Reader.class);

Powered by Google App Engine
This is Rietveld 408576698