merged from tag

evenisse · evenisse · commit 869770c6e783 · 2006-05-22T13:01:12.000Z
diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java
@@ -61,6 +61,6 @@ public void testCreateArchiveWithIndexedJars()
         byte buf[] = new byte[1024];
         int i = bis.read(buf);
         String res = new String(buf,0,i);
-        assertEquals("JarIndex-Version: 1.0\n\narchive2.jar\ntwo.txt\n\narchive1.jar\none.txt\n\n", res);
+        assertEquals("JarIndex-Version: 1.0\n\narchive2.jar\ntwo.txt\n\narchive1.jar\none.txt\n\n", res.replaceAll("\r\n", "\n"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ public void testCreateArchiveWithIndexedJars()`
`61`	`61`	`byte buf[] = new byte[1024];`
`62`	`62`	`int i = bis.read(buf);`
`63`	`63`	`String res = new String(buf,0,i);`
`64`		`- assertEquals("JarIndex-Version: 1.0\n\narchive2.jar\ntwo.txt\n\narchive1.jar\none.txt\n\n", res);`
	`64`	`+ assertEquals("JarIndex-Version: 1.0\n\narchive2.jar\ntwo.txt\n\narchive1.jar\none.txt\n\n", res.replaceAll("\r\n", "\n"));`
`65`	`65`	`}`
`66`	`66`	`}`