You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by db...@apache.org on 2010/10/15 22:23:06 UTC

svn commit: r1023097 - /openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java

Author: dblevins
Date: Fri Oct 15 20:23:06 2010
New Revision: 1023097

URL: http://svn.apache.org/viewvc?rev=1023097&view=rev
Log:
Little dos2unix style magic to hopefully eliminate line ending differences

Modified:
    openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java

Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java?rev=1023097&r1=1023096&r2=1023097&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/OpenEjb2ConversionTest.java Fri Oct 15 20:23:06 2010
@@ -99,9 +99,9 @@ public class OpenEjb2ConversionTest exte
 
     private  void assertJaxb(String expectedFile, Object object, Class<?> type) throws IOException, JAXBException, SAXException {
         assertSame(type, object.getClass());
-        String expected = read(expectedFile);
+        String expected = read(expectedFile).replaceAll("\r\n", "\n");
 
-        String actual = toString(object, type);
+        String actual = toString(object, type).replaceAll("\r\n", "\n");
 
 //        System.out.println("expected = " + expected);
 //        System.out.println("actual = " + actual);