struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pligh...@apache.org
Subject svn commit: r399519 - /incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
Date Thu, 04 May 2006 02:51:45 GMT
Author: plightbo
Date: Wed May  3 19:51:43 2006
New Revision: 399519

URL: http://svn.apache.org/viewcvs?rev=399519&view=rev
Log:
line ending problem reported by brett porter

Modified:
    incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java

Modified: incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java?rev=399519&r1=399518&r2=399519&view=diff
==============================================================================
--- incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
(original)
+++ incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
Wed May  3 19:51:43 2006
@@ -17,13 +17,12 @@
  */
 package org.apache.struts.action2.sitegraph;
 
-import org.apache.struts.action2.StrutsTestCase;
-
 import com.opensymphony.util.ClassLoaderUtil;
+import org.apache.struts.action2.StrutsTestCase;
 
 import java.io.File;
-import java.io.StringWriter;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.net.URL;
 
 /**
@@ -33,10 +32,10 @@
         // use the classloader rather than relying on the
         // working directory being an assumed value when
         // running the test:  so let's get this class's parent dir 
-    	URL url = ClassLoaderUtil.getResource("org/apache/struts/action2/sitegraph/xwork.xml",
SiteGraphTest.class);
+        URL url = ClassLoaderUtil.getResource("org/apache/struts/action2/sitegraph/xwork.xml",
SiteGraphTest.class);
         File file = new File(url.toString().substring(5));
         String dir = file.getParent();
-        
+
         SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
         StringWriter writer = new StringWriter();
         siteGraph.setWriter(writer);
@@ -53,6 +52,6 @@
         }
 
         in.close();
-        assertEquals(buffer.toString(), writer.toString());
+        assertEquals(buffer.toString().replaceAll("\r\n", "\n"), writer.toString().replaceAll("\r\n",
"\n"));
     }
 }



Mime
View raw message